Fix: bug that causes onesignalId to be local when setting alias while identity verification is off

Author: jinliu9508

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

@@ -471,7 +471,7 @@ internal class OneSignalImp : IOneSignal, IServiceProvider {
             modify(identityModel, propertiesModel)
         }
 
-        if (identityModel.jwtToken != null) {
+        if (!useIdentityVerification || identityModel.jwtToken != null) {
             setupNewSubscription(identityModel, propertiesModel, suppressBackendOperation, sdkId)
         }
 

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/IdentityOperationExecutor.kt

@@ -3,6 +3,7 @@ package com.onesignal.user.internal.operations.impl.executors
 import com.onesignal.common.NetworkUtils
 import com.onesignal.common.exceptions.BackendException
 import com.onesignal.common.modeling.ModelChangeTags
+import com.onesignal.core.internal.config.ConfigModelStore
 import com.onesignal.core.internal.operations.ExecutionResponse
 import com.onesignal.core.internal.operations.ExecutionResult
 import com.onesignal.core.internal.operations.IOperationExecutor
@@ -19,6 +20,7 @@ import com.onesignal.user.internal.operations.impl.states.NewRecordsState
 internal class IdentityOperationExecutor(
     private val _identityBackend: IIdentityBackendService,
     private val _identityModelStore: IdentityModelStore,
+    private val _configModelStore: ConfigModelStore,
     private val _buildUserService: IRebuildUserService,
     private val _newRecordState: NewRecordsState,
 ) : IOperationExecutor {
@@ -45,7 +47,13 @@ internal class IdentityOperationExecutor(
 
         if (lastOperation is SetAliasOperation) {
             try {
-                val identityAlias = _identityModelStore.getIdentityAlias()
+                var identityAlias: Pair<String, String>
+                // use onesignalId from the operation if identity verification is turned off
+                if (_configModelStore.model.useIdentityVerification) {
+                    identityAlias = _identityModelStore.getIdentityAlias()
+                } else {
+                    identityAlias = Pair(IdentityConstants.ONESIGNAL_ID, lastOperation.onesignalId)
+                }
                 _identityBackend.setAlias(
                     lastOperation.appId,
                     identityAlias.first,