|
@@ -252,16 +252,17 @@ class PushNotificationManager {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
let encryptedDataString = try messenger.encrypt(payload)
|
|
let encryptedDataString = try messenger.encrypt(payload)
|
|
|
- let finalMessage = EncryptedPushMessage(encryptedData: encryptedDataString)
|
|
|
|
|
|
|
+ let finalMessage = EncryptedPushMessage(encryptedData: encryptedDataString, commandType: payload.commandType)
|
|
|
|
|
|
|
|
var request = URLRequest(url: url)
|
|
var request = URLRequest(url: url)
|
|
|
request.httpMethod = "POST"
|
|
request.httpMethod = "POST"
|
|
|
request.setValue("bearer \(jwt)", forHTTPHeaderField: "authorization")
|
|
request.setValue("bearer \(jwt)", forHTTPHeaderField: "authorization")
|
|
|
request.setValue("application/json", forHTTPHeaderField: "content-type")
|
|
request.setValue("application/json", forHTTPHeaderField: "content-type")
|
|
|
request.setValue("10", forHTTPHeaderField: "apns-priority")
|
|
request.setValue("10", forHTTPHeaderField: "apns-priority")
|
|
|
- request.setValue("0", forHTTPHeaderField: "apns-expiration")
|
|
|
|
|
|
|
+ request.setValue("600", forHTTPHeaderField: "apns-expiration")
|
|
|
request.setValue(bundleId, forHTTPHeaderField: "apns-topic")
|
|
request.setValue(bundleId, forHTTPHeaderField: "apns-topic")
|
|
|
- request.setValue("background", forHTTPHeaderField: "apns-push-type")
|
|
|
|
|
|
|
+ request.setValue("alert", forHTTPHeaderField: "apns-push-type")
|
|
|
|
|
+ request.setValue(payload.commandType.rawValue, forHTTPHeaderField: "apns-collapse-id")
|
|
|
|
|
|
|
|
request.httpBody = try JSONEncoder().encode(finalMessage)
|
|
request.httpBody = try JSONEncoder().encode(finalMessage)
|
|
|
|
|
|