Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add OneSignal-Subscription-Id to Create User request #1372

Merged
merged 2 commits into from
Mar 4, 2024
Merged

Add OneSignal-Subscription-Id to Create User request #1372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa0a4cb
Add `OneSignal-Subscription-Id` to Create User requests
nan-li Feb 15, 2024
3b767e0
Don't block user update if missing subscription header
nan-li Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions iOS_SDK/OneSignalSDK/OneSignalUser/Source/Requests/OSRequestCreateUser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ class OSRequestCreateUser: OneSignalRequest, OSUserRequest {
OneSignalLog.onesignalLog(.LL_DEBUG, message: "Cannot generate the create user request due to null app ID.")
return false
}
let _ = self.addPushSubscriptionIdToAdditionalHeaders()
self.addJWTHeader(identityModel: identityModel)
self.path = "apps/\(appId)/users"
// The pushSub doesn't need to have a token.
Expand Down
15 changes: 2 additions & 13 deletions iOS_SDK/OneSignalSDK/OneSignalUser/Source/Requests/OSRequestUpdateProperties.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ class OSRequestUpdateProperties: OneSignalRequest, OSUserRequest {
// Note Android adds it to requests, if the push sub ID exists
func prepareForExecution() -> Bool {
if let onesignalId = identityModel.onesignalId,
let appId = OneSignalConfigManager.getAppId(),
addPushSubscriptionIdToAdditionalHeaders() {
let appId = OneSignalConfigManager.getAppId() {
let _ = self.addPushSubscriptionIdToAdditionalHeaders()
self.addJWTHeader(identityModel: identityModel)
self.path = "apps/\(appId)/users/by/\(OS_ONESIGNAL_ID)/\(onesignalId)"
return true
Expand All @@ -55,17 +55,6 @@ class OSRequestUpdateProperties: OneSignalRequest, OSUserRequest {
}
}

func addPushSubscriptionIdToAdditionalHeaders() -> Bool {
if let pushSubscriptionId = OneSignalUserManagerImpl.sharedInstance.pushSubscriptionId {
var additionalHeaders = self.additionalHeaders ?? [String: String]()
additionalHeaders["OneSignal-Subscription-Id"] = pushSubscriptionId
self.additionalHeaders = additionalHeaders
return true
} else {
return false
}
}

init(properties: [String: Any], deltas: [String: Any]?, refreshDeviceMetadata: Bool?, modelToUpdate: OSPropertiesModel, identityModel: OSIdentityModel) {
self.modelToUpdate = modelToUpdate
self.identityModel = identityModel
Expand Down
12 changes: 12 additions & 0 deletions iOS_SDK/OneSignalSDK/OneSignalUser/Source/Requests/OSUserRequest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,16 @@ internal extension OneSignalRequest {
// additionalHeaders["Authorization"] = "Bearer \(token)"
// self.additionalHeaders = additionalHeaders
}

/** Returns if the `OneSignal-Subscription-Id` header was added successfully. */
func addPushSubscriptionIdToAdditionalHeaders() -> Bool {
if let pushSubscriptionId = OneSignalUserManagerImpl.sharedInstance.pushSubscriptionId {
var additionalHeaders = self.additionalHeaders ?? [String: String]()
additionalHeaders["OneSignal-Subscription-Id"] = pushSubscriptionId
self.additionalHeaders = additionalHeaders
return true
} else {
return false
}
}
}
Loading