wip

Author: nan-li

iOS_SDK/OneSignalSDK/OneSignalCoreMocks/OneSignalCoreMocks.h

@@ -28,5 +28,5 @@ FOUNDATION_EXPORT double OneSignalCoreMocksVersionNumber;
 FOUNDATION_EXPORT const unsigned char OneSignalCoreMocksVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <OneSignalCoreMocks/PublicHeader.h>
-
+#import "NSBundleOverrider.h"
 

iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSUserExecutor.swift

@@ -124,7 +124,7 @@ class OSUserExecutor {
                 createUser(userInstance)
             }
         }
-    }
+    } // TODO: 🟡 check sharedInstance.user above createUser(userInstance)
 
     private func getIdentityModel(_ modelId: String) -> OSIdentityModel? {
         return OneSignalUserManagerImpl.sharedInstance.getIdentityModel(modelId)
@@ -405,6 +405,8 @@ extension OSUserExecutor {
                     // This will hydrate the OneSignal ID for any pending requests
                     self.createUser(aliasLabel: request.aliasLabel, aliasId: request.aliasId, identityModel: request.identityModelToUpdate)
                 }
+                // TODO: 🟡 check sharedInstance.user userInstance
+
             } else if responseType == .invalid || responseType == .unauthorized {
                 // Failed, no retry
                 self.removeFromQueue(request)
@@ -548,6 +550,7 @@ extension OSUserExecutor {
         if let propertiesObject = parsePropertiesObjectResponse(response) {
             OneSignalUserManagerImpl.sharedInstance._user?.propertiesModel.hydrate(propertiesObject)
         }
+        // TODO: 🟡 check sharedInstance.user using _user instead
 
         // Now parse email and sms subscriptions
         if let subscriptionObject = parseSubscriptionObjectResponse(response) {

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertiesModelStoreListener.swift

@@ -58,5 +58,7 @@ class OSPropertiesModelStoreListener: OSModelStoreListener {
             property: args.property,
             value: args.newValue
         )
+        // TODO: 🟡 check sharedInstance.user userInstance
+
     }
 }

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSSubscriptionModelStoreListener.swift

@@ -48,6 +48,7 @@ class OSSubscriptionModelStoreListener: OSModelStoreListener {
             property: model.type.rawValue, // push, email, sms
             value: model.address ?? ""
         )
+        // TODO: 🟡 check sharedInstance.user userInstance
     }
 
     /**
@@ -65,6 +66,7 @@ class OSSubscriptionModelStoreListener: OSModelStoreListener {
             property: model.type.rawValue, // push, email, sms
             value: model.address ?? ""
         )
+        // TODO: 🟡 check sharedInstance.user userInstance
     }
 
     func getUpdateModelDelta(_ args: OSModelChangedArgs) -> OSDelta? {
@@ -82,13 +84,13 @@ class OSSubscriptionModelStoreListener: OSModelStoreListener {
             let condition = OSIamFetchReadyCondition.sharedInstance(withId: onesignalId)
             condition.setSubscriptionUpdatePending(value: true)
         }
-
         return OSDelta(
             name: OS_UPDATE_SUBSCRIPTION_DELTA,
             identityModelId: userInstance.identityModel.modelId,
             model: args.model,
             property: args.property,
             value: args.newValue
         )
+        // TODO: 🟡 check sharedInstance.user
     }
 }

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OneSignalUserManagerImpl.swift

@@ -203,22 +203,28 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
                 return
             }
 
-            OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OneSignalUserManager calling start")
+            OneSignalLog.onesignalLog(.LL_VERBOSE, message: "💛 OneSignalUserManager calling start")
 
             OSNotificationsManager.delegate = self
 
             var hasCachedUser = false
 
             // Path 1. Load user from cache, if any
             // Corrupted state if any of these models exist without the others
+            
+            let i = identityModelStore.getModels()[OS_IDENTITY_MODEL_KEY]
+            let p = propertiesModelStore.getModels()[OS_PROPERTIES_MODEL_KEY]
+            let s = pushSubscriptionModelStore.getModels()[OS_PUSH_SUBSCRIPTION_MODEL_KEY]
+            
             if let identityModel = identityModelStore.getModels()[OS_IDENTITY_MODEL_KEY],
                let propertiesModel = propertiesModelStore.getModels()[OS_PROPERTIES_MODEL_KEY],
                let pushSubscription = pushSubscriptionModelStore.getModels()[OS_PUSH_SUBSCRIPTION_MODEL_KEY] {
                 hasCachedUser = true
                 _user = OSUserInternalImpl(identityModel: identityModel, propertiesModel: propertiesModel, pushSubscriptionModel: pushSubscription)
                 addIdentityModelToRepo(identityModel)
-                OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OneSignalUserManager.start called, loaded the user from cache.")
+                OneSignalLog.onesignalLog(.LL_VERBOSE, message: "💛 OneSignalUserManager.start called, loaded the user from cache.")
             }
+            OneSignalLog.onesignalLog(.LL_VERBOSE, message: "💛 OneSignalUserManager after uncache user")
 
             // TODO: Update the push sub model with any new state from NotificationsManager
 

iOS_SDK/OneSignalSDK/OneSignalUserMocks/OneSignalUserMocks.swift

@@ -26,6 +26,7 @@
  */
 
 import Foundation
+import OneSignalCore
 import OneSignalOSCore
 import OneSignalOSCoreMocks
 @testable import OneSignalUser
@@ -39,6 +40,36 @@ public class OneSignalUserMocks: NSObject {
         OSCoreMocks.resetOperationRepo()
         OneSignalUserManagerImpl.sharedInstance.reset()
     }
+    
+    @objc
+    public static func cacheUser() {
+        let identityModel = OSIdentityModel(aliases: nil, changeNotifier: OSEventProducer())
+        let propertiesModel = OSPropertiesModel(changeNotifier: OSEventProducer())
+        let subscriptionModel = OneSignalUserManagerImpl.sharedInstance.createDefaultPushSubscription(subscriptionId: nil)
+        // models[id] = model
+        OneSignalUserDefaults.initShared().saveCodeableData(
+            forKey: OS_IDENTITY_MODEL_STORE_KEY,
+            withValue: [OS_IDENTITY_MODEL_KEY: identityModel]
+        )
+        OneSignalUserDefaults.initShared().saveCodeableData(
+            forKey: OS_PROPERTIES_MODEL_STORE_KEY,
+            withValue: [OS_PROPERTIES_MODEL_KEY: propertiesModel]
+        )
+        OneSignalUserDefaults.initShared().saveCodeableData(
+            forKey: OS_PUSH_SUBSCRIPTION_MODEL_STORE_KEY,
+            withValue: [OS_PUSH_SUBSCRIPTION_MODEL_KEY: subscriptionModel]
+        )
+    }
+    
+    @objc
+    public static func setUser() {
+        let identityModel = OSIdentityModel(aliases: nil, changeNotifier: OSEventProducer())
+        let propertiesModel = OSPropertiesModel(changeNotifier: OSEventProducer())
+        let subscriptionModel = OneSignalUserManagerImpl.sharedInstance.createDefaultPushSubscription(subscriptionId: nil)
+        OneSignalUserManagerImpl.sharedInstance.identityModelStore.add(id: OS_IDENTITY_MODEL_KEY, model: identityModel, hydrating: false)
+        OneSignalUserManagerImpl.sharedInstance.propertiesModelStore.add(id: OS_PROPERTIES_MODEL_KEY, model: propertiesModel, hydrating: false)
+        OneSignalUserManagerImpl.sharedInstance.pushSubscriptionModelStore.add(id: OS_PUSH_SUBSCRIPTION_MODEL_KEY, model: subscriptionModel, hydrating: false)
+    }
 }
 
 extension OSIdentityModelRepo {

iOS_SDK/OneSignalSDK/OneSignalUserTests/OneSignalUserTests.swift

@@ -152,4 +152,13 @@ final class OneSignalUserTests: XCTestCase {
             contains: expectedPayload)
         )
     }
+    
+    func testUserManagerStart_doesNotDeadlock() throws {
+        // Cache a user via Property, Identity, Subscription model in stores
+        OneSignalUserMocks.setUser()
+        //appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String
+        NSBundleOverrider
+        OneSignalUserManagerImpl.sharedInstance.start()
+
+    }
 }