Make NewRecordsState method non-optional

* The canAccess method should really check a non-optional string * Adjust the use of this method at the calling site
OneSignal · Aug 16, 2024 · c6db876 · c6db876
1 parent dee1bcf
commit c6db876
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSNewRecordsState.swift b/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSNewRecordsState.swift
@@ -54,11 +54,9 @@ public class OSNewRecordsState {
         }
     }
 
-    public func canAccess(_ key: String?) -> Bool {
+    public func canAccess(_ key: String) -> Bool {
         lock.withLock {
-            guard let key = key,
-                  let timeLastMovedOrCreated = records[key]
-            else {
+            guard let timeLastMovedOrCreated = records[key] else {
                 return true
             }
 

diff --git a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/Requests/OSRequestCreateUser.swift b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/Requests/OSRequestCreateUser.swift
@@ -47,16 +47,21 @@ class OSRequestCreateUser: OneSignalRequest, OSUserRequest {
 
     /// Checks if the subscription ID can be accessed, if a subscription is being included in the request
     func prepareForExecution(newRecordsState: OSNewRecordsState) -> Bool {
-        guard let appId = OneSignalConfigManager.getAppId(),
-              newRecordsState.canAccess(pushSubscriptionModel?.subscriptionId)
-        else {
+        guard let appId = OneSignalConfigManager.getAppId() else {
+            OneSignalLog.onesignalLog(.LL_ERROR, message: "Cannot generate the create user request due to null app ID.")
+            return false
+        }
+
+        if let subscriptionId = pushSubscriptionModel?.subscriptionId,
+           !newRecordsState.canAccess(subscriptionId)
+        {
             OneSignalLog.onesignalLog(.LL_DEBUG, message: "Cannot generate the create user request yet.")
             return false
         }
+
         _ = self.addPushSubscriptionIdToAdditionalHeaders()
         self.addJWTHeader(identityModel: identityModel)
         self.path = "apps/\(appId)/users"
-        // The pushSub doesn't need to have a token.
         return true
     }