Suppress anonymous ops at enqueue and add LogoutHelper IV test coverage

- Move anonymous operation suppression from individual model store
  listeners into OperationRepo.enqueue/enqueueAndWait so all enqueue
  sites (SessionListener, TrackGooglePurchase, CustomEventController,
  etc.) are covered. LoginUserOperation is exempt.
- Remove redundant shouldSuppressForAnonymousUser() from
  IdentityModelStoreListener, PropertiesModelStoreListener, and
  SubscriptionModelStoreListener.
- Add LogoutHelper tests for IV=true and IV=null (pre-HYDRATE) branches.

Author: nan-li

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/impl/OperationRepo.kt

@@ -128,6 +128,8 @@ internal class OperationRepo(
         operation: Operation,
         flush: Boolean,
     ) {
+        if (shouldSuppressAnonymousOp(operation)) return
+
         Logging.log(LogLevel.DEBUG, "OperationRepo.enqueue(operation: $operation, flush: $flush)")
 
         operation.id = UUID.randomUUID().toString()
@@ -140,6 +142,8 @@ internal class OperationRepo(
         operation: Operation,
         flush: Boolean,
     ): Boolean {
+        if (shouldSuppressAnonymousOp(operation)) return false
+
         Logging.log(LogLevel.DEBUG, "OperationRepo.enqueueAndWait(operation: $operation, force: $flush)")
 
         operation.id = UUID.randomUUID().toString()
@@ -437,6 +441,16 @@ internal class OperationRepo(
         }
     }
 
+    /**
+     * Drop anonymous operations at enqueue time when IV is enabled.
+     * LoginUserOperation is exempt — it's enqueued intentionally during logout
+     * and purged later by [removeOperationsWithoutExternalId] if needed.
+     */
+    private fun shouldSuppressAnonymousOp(op: Operation): Boolean {
+        if (op is LoginUserOperation) return false
+        return _configModelStore.model.useIdentityVerification == true && op.externalId == null
+    }
+
     /**
      * Determines whether [op] is allowed to execute given the current identity
      * verification (IV) state. Used by [getNextOps] to skip operations that

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/listeners/IdentityModelStoreListener.kt

@@ -14,10 +14,6 @@ internal class IdentityModelStoreListener(
     opRepo: IOperationRepo,
     private val _configModelStore: ConfigModelStore,
 ) : SingletonModelStoreListener<IdentityModel>(_identityModelStore, opRepo) {
-    private fun shouldSuppressForAnonymousUser(): Boolean =
-        _configModelStore.model.useIdentityVerification == true &&
-            _identityModelStore.model.externalId == null
-
     override fun getReplaceOperation(model: IdentityModel): Operation? {
         // when the identity model is replaced, nothing to do on the backend. Already handled via login process.
         return null
@@ -30,8 +26,6 @@ internal class IdentityModelStoreListener(
         oldValue: Any?,
         newValue: Any?,
     ): Operation? {
-        if (shouldSuppressForAnonymousUser()) return null
-
         return if (newValue != null && newValue is String) {
             SetAliasOperation(_configModelStore.model.appId, model.onesignalId, model.externalId, property, newValue)
         } else {

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/listeners/PropertiesModelStoreListener.kt

@@ -17,10 +17,6 @@ internal class PropertiesModelStoreListener(
     private val _configModelStore: ConfigModelStore,
     private val _identityModelStore: IdentityModelStore,
 ) : SingletonModelStoreListener<PropertiesModel>(store, opRepo) {
-    private fun shouldSuppressForAnonymousUser(): Boolean =
-        _configModelStore.model.useIdentityVerification == true &&
-            _identityModelStore.model.externalId == null
-
     override fun getReplaceOperation(model: PropertiesModel): Operation? {
         // when the property model is replaced, nothing to do on the backend. Already handled via login process.
         return null
@@ -33,8 +29,6 @@ internal class PropertiesModelStoreListener(
         oldValue: Any?,
         newValue: Any?,
     ): Operation? {
-        if (shouldSuppressForAnonymousUser()) return null
-
         // for any of the property changes, we do not need to fire an operation.
         if (path.startsWith(PropertiesModel::locationTimestamp.name) ||
             path.startsWith(PropertiesModel::locationBackground.name) ||

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/listeners/SubscriptionModelStoreListener.kt

@@ -18,13 +18,7 @@ internal class SubscriptionModelStoreListener(
     private val _identityModelStore: IdentityModelStore,
     private val _configModelStore: ConfigModelStore,
 ) : ModelStoreListener<SubscriptionModel>(store, opRepo) {
-    private fun shouldSuppressForAnonymousUser(): Boolean =
-        _configModelStore.model.useIdentityVerification == true &&
-            _identityModelStore.model.externalId == null
-
     override fun getAddOperation(model: SubscriptionModel): Operation? {
-        if (shouldSuppressForAnonymousUser()) return null
-
         val enabledAndStatus = getSubscriptionEnabledAndStatus(model)
         return CreateSubscriptionOperation(
             _configModelStore.model.appId,
@@ -39,8 +33,6 @@ internal class SubscriptionModelStoreListener(
     }
 
     override fun getRemoveOperation(model: SubscriptionModel): Operation? {
-        if (shouldSuppressForAnonymousUser()) return null
-
         return DeleteSubscriptionOperation(_configModelStore.model.appId, _identityModelStore.model.onesignalId, _identityModelStore.model.externalId, model.id)
     }
 
@@ -51,8 +43,6 @@ internal class SubscriptionModelStoreListener(
         oldValue: Any?,
         newValue: Any?,
     ): Operation? {
-        if (shouldSuppressForAnonymousUser()) return null
-
         val enabledAndStatus = getSubscriptionEnabledAndStatus(model)
         return UpdateSubscriptionOperation(
             _configModelStore.model.appId,

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/LogoutHelperTests.kt

@@ -6,6 +6,7 @@ import com.onesignal.debug.LogLevel
 import com.onesignal.debug.internal.logging.Logging
 import com.onesignal.mocks.MockHelper
 import com.onesignal.user.internal.operations.LoginUserOperation
+import com.onesignal.user.internal.subscriptions.SubscriptionModel
 import com.onesignal.user.internal.subscriptions.SubscriptionModelStore
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.shouldBe
@@ -177,4 +178,85 @@ class LogoutHelperTests : FunSpec({
         verify(atLeast = 1) { mockUserSwitcher.createAndSwitchToNewUser() }
         verify(atLeast = 1) { mockOperationRepo.enqueue(any()) }
     }
+
+    test("logout with IV=true disables push and suppresses backend operation") {
+        // Given - identified user with IV enabled
+        val pushSubId = "push-sub-id"
+        val mockSubscriptionModel = mockk<SubscriptionModel>(relaxed = true)
+        val mockIdentityModelStore =
+            MockHelper.identityModelStore { model ->
+                model.externalId = externalId
+                model.onesignalId = onesignalId
+            }
+        val mockUserSwitcher = mockk<UserSwitcher>(relaxed = true)
+        val mockOperationRepo = mockk<IOperationRepo>(relaxed = true)
+        val mockConfigModel = mockk<ConfigModel>()
+        every { mockConfigModel.appId } returns appId
+        every { mockConfigModel.useIdentityVerification } returns true
+        every { mockConfigModel.pushSubscriptionId } returns pushSubId
+        val mockSubscriptionModelStore = mockk<SubscriptionModelStore>(relaxed = true)
+        every { mockSubscriptionModelStore.get(pushSubId) } returns mockSubscriptionModel
+
+        val logoutHelper =
+            LogoutHelper(
+                identityModelStore = mockIdentityModelStore,
+                userSwitcher = mockUserSwitcher,
+                operationRepo = mockOperationRepo,
+                configModel = mockConfigModel,
+                subscriptionModelStore = mockSubscriptionModelStore,
+                lock = Any(),
+            )
+
+        // When
+        logoutHelper.logout()
+
+        // Then
+        verify { mockSubscriptionModel.isDisabledInternally = true }
+        verify { mockUserSwitcher.createAndSwitchToNewUser(suppressBackendOperation = true) }
+        verify(exactly = 0) { mockOperationRepo.enqueue(any()) }
+    }
+
+    test("logout with IV=null (pre-HYDRATE) disables push and enqueues anonymous user") {
+        // Given - identified user, IV state unknown
+        val pushSubId = "push-sub-id"
+        val mockSubscriptionModel = mockk<SubscriptionModel>(relaxed = true)
+        val mockIdentityModelStore =
+            MockHelper.identityModelStore { model ->
+                model.externalId = externalId
+                model.onesignalId = onesignalId
+            }
+        val mockUserSwitcher = mockk<UserSwitcher>(relaxed = true)
+        val mockOperationRepo = mockk<IOperationRepo>(relaxed = true)
+        val mockConfigModel = mockk<ConfigModel>()
+        every { mockConfigModel.appId } returns appId
+        every { mockConfigModel.useIdentityVerification } returns null
+        every { mockConfigModel.pushSubscriptionId } returns pushSubId
+        val mockSubscriptionModelStore = mockk<SubscriptionModelStore>(relaxed = true)
+        every { mockSubscriptionModelStore.get(pushSubId) } returns mockSubscriptionModel
+
+        val logoutHelper =
+            LogoutHelper(
+                identityModelStore = mockIdentityModelStore,
+                userSwitcher = mockUserSwitcher,
+                operationRepo = mockOperationRepo,
+                configModel = mockConfigModel,
+                subscriptionModelStore = mockSubscriptionModelStore,
+                lock = Any(),
+            )
+
+        // When
+        logoutHelper.logout()
+
+        // Then - push disabled, no suppression, anonymous LoginUserOperation enqueued
+        verify { mockSubscriptionModel.isDisabledInternally = true }
+        verify { mockUserSwitcher.createAndSwitchToNewUser() }
+        verify {
+            mockOperationRepo.enqueue(
+                withArg<LoginUserOperation> { operation ->
+                    operation.appId shouldBe appId
+                    operation.externalId shouldBe null
+                },
+            )
+        }
+    }
 })