Encapsulate JWT invalidation listener management in UserManager

Add addJwtInvalidatedListener, removeJwtInvalidatedListener, and
fireJwtInvalidated methods to UserManager. Callers no longer need
to cast IUserManager to UserManager to access the notifier directly.
Register UserManager as a concrete DI service so
IdentityVerificationService can depend on it directly.

Made-with: Cursor

Author: nan-li

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/config/impl/IdentityVerificationService.kt

@@ -1,6 +1,5 @@
 package com.onesignal.core.internal.config.impl
 
-import com.onesignal.UserJwtInvalidatedEvent
 import com.onesignal.common.modeling.ISingletonModelStoreChangeHandler
 import com.onesignal.common.modeling.ModelChangeTags
 import com.onesignal.common.modeling.ModelChangedArgs
@@ -9,7 +8,6 @@ import com.onesignal.core.internal.config.ConfigModelStore
 import com.onesignal.core.internal.operations.IOperationRepo
 import com.onesignal.core.internal.startup.IStartableService
 import com.onesignal.debug.internal.logging.Logging
-import com.onesignal.user.IUserManager
 import com.onesignal.user.internal.UserManager
 import com.onesignal.user.internal.identity.IdentityModelStore
 import com.onesignal.user.internal.identity.JwtTokenStore
@@ -27,7 +25,7 @@ internal class IdentityVerificationService(
     private val _operationRepo: IOperationRepo,
     private val _identityModelStore: IdentityModelStore,
     private val _jwtTokenStore: JwtTokenStore,
-    private val _userManager: IUserManager,
+    private val _userManager: UserManager,
 ) : IStartableService, ISingletonModelStoreChangeHandler<ConfigModel> {
     override fun start() {
         _configModelStore.subscribe(this)
@@ -48,9 +46,7 @@ internal class IdentityVerificationService(
             val externalId = _identityModelStore.model.externalId
             if (externalId != null && _jwtTokenStore.getJwt(externalId) == null) {
                 Logging.debug("IdentityVerificationService: IV enabled but no JWT for $externalId, firing invalidated event")
-                (_userManager as UserManager).jwtInvalidatedNotifier.fireOnMain {
-                    it.onUserJwtInvalidated(UserJwtInvalidatedEvent(externalId))
-                }
+                _userManager.fireJwtInvalidated(externalId)
             }
         }
 

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/internal/OneSignalImp.kt

@@ -425,11 +425,11 @@ internal class OneSignalImp(
     }
 
     override fun addUserJwtInvalidatedListener(listener: IUserJwtInvalidatedListener) {
-        (services.getService<IUserManager>() as UserManager).jwtInvalidatedNotifier.subscribe(listener)
+        services.getService<UserManager>().addJwtInvalidatedListener(listener)
     }
 
     override fun removeUserJwtInvalidatedListener(listener: IUserJwtInvalidatedListener) {
-        (services.getService<IUserManager>() as UserManager).jwtInvalidatedNotifier.unsubscribe(listener)
+        services.getService<UserManager>().removeJwtInvalidatedListener(listener)
     }
 
     override fun <T> hasService(c: Class<T>): Boolean = services.hasService(c)

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserModule.kt

@@ -75,7 +75,7 @@ internal class UserModule : IModule {
         builder.register<LoginUserOperationExecutor>().provides<IOperationExecutor>()
         builder.register<LoginUserFromSubscriptionOperationExecutor>().provides<IOperationExecutor>()
         builder.register<RefreshUserOperationExecutor>().provides<IOperationExecutor>()
-        builder.register<UserManager>().provides<IUserManager>()
+        builder.register<UserManager>().provides<IUserManager>().provides<UserManager>()
         builder.register<CustomEventController>().provides<ICustomEventController>()
         builder.register<CustomEventOperationExecutor>().provides<IOperationExecutor>()
         builder.register<CustomEventBackendService>().provides<ICustomEventBackendService>()

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt

@@ -4,6 +4,7 @@ import com.onesignal.common.IDManager
 import com.onesignal.common.JSONUtils
 import com.onesignal.common.OneSignalUtils
 import com.onesignal.IUserJwtInvalidatedListener
+import com.onesignal.UserJwtInvalidatedEvent
 import com.onesignal.common.events.EventProducer
 import com.onesignal.common.modeling.ISingletonModelStoreChangeHandler
 import com.onesignal.common.modeling.ModelChangedArgs
@@ -44,7 +45,21 @@ internal open class UserManager(
         get() = _subscriptionManager.subscriptions
 
     val changeHandlersNotifier = EventProducer<IUserStateObserver>()
-    val jwtInvalidatedNotifier = EventProducer<IUserJwtInvalidatedListener>()
+    private val jwtInvalidatedNotifier = EventProducer<IUserJwtInvalidatedListener>()
+
+    fun addJwtInvalidatedListener(listener: IUserJwtInvalidatedListener) {
+        jwtInvalidatedNotifier.subscribe(listener)
+    }
+
+    fun removeJwtInvalidatedListener(listener: IUserJwtInvalidatedListener) {
+        jwtInvalidatedNotifier.unsubscribe(listener)
+    }
+
+    fun fireJwtInvalidated(externalId: String) {
+        jwtInvalidatedNotifier.fireOnMain {
+            it.onUserJwtInvalidated(UserJwtInvalidatedEvent(externalId))
+        }
+    }
 
     override val pushSubscription: IPushSubscription
         get() = _subscriptionManager.subscriptions.push