fix: [SDK-5606] omit subscription status on composite login email and SMS

Create User applies enabled/notification_types to an existing address,
which would re-subscribe a user who unsubscribed. Device fields are still sent.

Also moves the test assertions out of withArg so they don't call a mocked
AndroidUtils during verification, and suppresses TooManyFunctions.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: AR Abdul Azeez

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

@@ -44,9 +44,9 @@ import com.onesignal.user.internal.properties.PropertiesModel
 import com.onesignal.user.internal.properties.PropertiesModelStore
 import com.onesignal.user.internal.subscriptions.SubscriptionModel
 import com.onesignal.user.internal.subscriptions.SubscriptionModelStore
-import com.onesignal.user.internal.subscriptions.SubscriptionStatus
 import com.onesignal.user.internal.subscriptions.SubscriptionType
 
+@Suppress("TooManyFunctions")
 internal class LoginUserOperationExecutor(
     private val _identityOperationExecutor: IdentityOperationExecutor,
     private val _application: IApplicationService,
@@ -209,9 +209,11 @@ internal class LoginUserOperationExecutor(
                 else -> throw Exception("Unrecognized operation: $operation")
             }
         }
+        // No enabled/notification_types: Create User applies them to an address that already
+        // exists, which would re-subscribe a user who unsubscribed.
         subscriptions =
             LoginProfileApplier.addSubscriptions(createUserOperation, subscriptions) { type, token ->
-                subscriptionWithDevice(type, token, enabled = true, notificationTypes = SubscriptionStatus.SUBSCRIBED.value)
+                subscriptionWithDevice(type, token)
             }
 
         try {
@@ -387,8 +389,8 @@ internal class LoginUserOperationExecutor(
     private fun subscriptionWithDevice(
         type: SubscriptionObjectType,
         token: String,
-        enabled: Boolean,
-        notificationTypes: Int,
+        enabled: Boolean? = null,
+        notificationTypes: Int? = null,
         id: String? = null,
     ) = SubscriptionObject(
         id = id,

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

@@ -39,11 +39,13 @@ import com.onesignal.user.internal.subscriptions.SubscriptionType
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.collections.shouldBeOneOf
 import io.kotest.matchers.shouldBe
+import io.kotest.matchers.shouldNotBe
 import io.kotest.matchers.types.shouldBeInstanceOf
 import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.every
 import io.mockk.mockk
+import io.mockk.slot
 
 @RobolectricTest
 class LoginUserOperationExecutorTests : FunSpec({
@@ -1088,14 +1090,21 @@ class LoginUserOperationExecutorTests : FunSpec({
     ) {
         val context = ApplicationProvider.getApplicationContext<android.content.Context>()
         sub.token shouldBe token
-        sub.enabled shouldBe true
-        sub.notificationTypes shouldBe SubscriptionStatus.SUBSCRIBED.value
+        sub.enabled shouldBe null
+        sub.notificationTypes shouldBe null
+        sub.sdk shouldNotBe null
         sub.sdk shouldBe OneSignalUtils.sdkVersion
+        sub.deviceModel shouldNotBe null
         sub.deviceModel shouldBe Build.MODEL
+        sub.deviceOS shouldNotBe null
         sub.deviceOS shouldBe Build.VERSION.RELEASE
+        sub.rooted shouldNotBe null
         sub.rooted shouldBe RootToolsInternalMethods.isRooted
+        sub.netType shouldNotBe null
         sub.netType shouldBe DeviceUtils.getNetType(context)
+        // Robolectric has no carrier, so only equality is checked.
         sub.carrier shouldBe DeviceUtils.getCarrierName(context)
+        sub.appVersion shouldNotBe null
         sub.appVersion shouldBe AndroidUtils.getAppVersion(context)
     }
 
@@ -1227,17 +1236,12 @@ class LoginUserOperationExecutorTests : FunSpec({
 
         response.result shouldBe ExecutionResult.SUCCESS
         response.metadata shouldBe LoginWaitMetadata(remoteOneSignalId, "email-sub")
+        val subs = slot<List<SubscriptionObject>>()
         coVerify(exactly = 1) {
-            mockUserBackendService.createUser(
-                appId,
-                mapOf(IdentityConstants.EXTERNAL_ID to "externalId"),
-                withArg { subs ->
-                    assertProfileSubscription(subs.single { it.type == SubscriptionObjectType.EMAIL }, "a@b.com")
-                    subs.none { it.type == SubscriptionObjectType.SMS } shouldBe true
-                },
-                any(),
-            )
+            mockUserBackendService.createUser(appId, mapOf(IdentityConstants.EXTERNAL_ID to "externalId"), capture(subs), any())
         }
+        assertProfileSubscription(subs.captured.single { it.type == SubscriptionObjectType.EMAIL }, "a@b.com")
+        subs.captured.none { it.type == SubscriptionObjectType.SMS } shouldBe true
     }
 
     test("composite login with phone only sends an SMS subscription") {
@@ -1255,17 +1259,12 @@ class LoginUserOperationExecutorTests : FunSpec({
             )
 
         response.result shouldBe ExecutionResult.SUCCESS
+        val subs = slot<List<SubscriptionObject>>()
         coVerify(exactly = 1) {
-            mockUserBackendService.createUser(
-                appId,
-                mapOf(IdentityConstants.EXTERNAL_ID to "externalId"),
-                withArg { subs ->
-                    assertProfileSubscription(subs.single { it.type == SubscriptionObjectType.SMS }, "+15555550100")
-                    subs.none { it.type == SubscriptionObjectType.EMAIL } shouldBe true
-                },
-                any(),
-            )
+            mockUserBackendService.createUser(appId, mapOf(IdentityConstants.EXTERNAL_ID to "externalId"), capture(subs), any())
         }
+        assertProfileSubscription(subs.captured.single { it.type == SubscriptionObjectType.SMS }, "+15555550100")
+        subs.captured.none { it.type == SubscriptionObjectType.EMAIL } shouldBe true
     }
 
     test("composite login with tags only forwards them on createUser") {