Skip to content

Commit aa0a4cb

Browse files
committed
Add OneSignal-Subscription-Id to Create User requests
- This was an ask of the SDK to support improved `last_active` tracking subscriptions that were actually active - Moved the helper method to add this header out of User Update so it can be accessed also by Create User
1 parent 8f47b6f commit aa0a4cb

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

iOS_SDK/OneSignalSDK/OneSignalUser/Source/Requests/OSRequestCreateUser.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ class OSRequestCreateUser: OneSignalRequest, OSUserRequest {
4848
OneSignalLog.onesignalLog(.LL_DEBUG, message: "Cannot generate the create user request due to null app ID.")
4949
return false
5050
}
51+
let _ = self.addPushSubscriptionIdToAdditionalHeaders()
5152
self.addJWTHeader(identityModel: identityModel)
5253
self.path = "apps/\(appId)/users"
5354
// The pushSub doesn't need to have a token.

iOS_SDK/OneSignalSDK/OneSignalUser/Source/Requests/OSRequestUpdateProperties.swift

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,6 @@ class OSRequestUpdateProperties: OneSignalRequest, OSUserRequest {
5555
}
5656
}
5757

58-
func addPushSubscriptionIdToAdditionalHeaders() -> Bool {
59-
if let pushSubscriptionId = OneSignalUserManagerImpl.sharedInstance.pushSubscriptionId {
60-
var additionalHeaders = self.additionalHeaders ?? [String: String]()
61-
additionalHeaders["OneSignal-Subscription-Id"] = pushSubscriptionId
62-
self.additionalHeaders = additionalHeaders
63-
return true
64-
} else {
65-
return false
66-
}
67-
}
68-
6958
init(properties: [String: Any], deltas: [String: Any]?, refreshDeviceMetadata: Bool?, modelToUpdate: OSPropertiesModel, identityModel: OSIdentityModel) {
7059
self.modelToUpdate = modelToUpdate
7160
self.identityModel = identityModel

iOS_SDK/OneSignalSDK/OneSignalUser/Source/Requests/OSUserRequest.swift

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,16 @@ internal extension OneSignalRequest {
4141
// additionalHeaders["Authorization"] = "Bearer \(token)"
4242
// self.additionalHeaders = additionalHeaders
4343
}
44+
45+
/** Returns if the `OneSignal-Subscription-Id` header was added successfully. */
46+
func addPushSubscriptionIdToAdditionalHeaders() -> Bool {
47+
if let pushSubscriptionId = OneSignalUserManagerImpl.sharedInstance.pushSubscriptionId {
48+
var additionalHeaders = self.additionalHeaders ?? [String: String]()
49+
additionalHeaders["OneSignal-Subscription-Id"] = pushSubscriptionId
50+
self.additionalHeaders = additionalHeaders
51+
return true
52+
} else {
53+
return false
54+
}
55+
}
4456
}

0 commit comments

Comments
 (0)