fix: remove composite login from the public API

The profile login still has open bugs, so apps should not be able to call it yet. login(externalId) is unchanged.

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

Author: AR Abdul Azeez

OneSignalSDK/onesignal/core/api/core.api

@@ -58,7 +58,6 @@ public abstract interface class com/onesignal/IOneSignal {
 	public abstract fun initWithContextSuspend (Landroid/content/Context;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun isInitialized ()Z
 	public abstract fun login (Ljava/lang/String;)V
-	public abstract fun login (Ljava/lang/String;Lcom/onesignal/OneSignalUserProfile;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun login (Ljava/lang/String;Ljava/lang/String;)V
 	public abstract fun loginSuspend (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun logout ()V
@@ -77,7 +76,6 @@ public abstract interface class com/onesignal/IOneSignal {
 public final class com/onesignal/IOneSignal$DefaultImpls {
 	public static synthetic fun initWithContextSuspend$default (Lcom/onesignal/IOneSignal;Landroid/content/Context;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 	public static fun login (Lcom/onesignal/IOneSignal;Ljava/lang/String;)V
-	public static synthetic fun login$default (Lcom/onesignal/IOneSignal;Ljava/lang/String;Lcom/onesignal/OneSignalUserProfile;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 	public static synthetic fun login$default (Lcom/onesignal/IOneSignal;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)V
 	public static synthetic fun loginSuspend$default (Lcom/onesignal/IOneSignal;Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
@@ -133,10 +131,7 @@ public final class com/onesignal/OneSignal {
 	public static synthetic fun initWithContextSuspend$default (Landroid/content/Context;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 	public static final fun isInitialized ()Z
 	public static final fun login (Ljava/lang/String;)V
-	public static final fun login (Ljava/lang/String;Lcom/onesignal/OneSignalUserProfile;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static final fun login (Ljava/lang/String;Lcom/onesignal/OneSignalUserProfile;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static final fun login (Ljava/lang/String;Ljava/lang/String;)V
-	public static synthetic fun login$default (Ljava/lang/String;Lcom/onesignal/OneSignalUserProfile;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 	public static synthetic fun login$default (Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)V
 	public static final fun loginSuspend (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static synthetic fun loginSuspend$default (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/IOneSignal.kt

@@ -250,16 +250,6 @@ interface IOneSignal {
         jwtBearerToken: String? = null,
     )
 
-    /**
-     * Login with [externalId] plus [profile] as one Create User upsert (anonymous is not merged). Email/SMS create or transfer; a foreign alias fails it.
-     * Same id is a no-op once a backend ID exists. Backend failure leaves this identity local; INVALID_ARGUMENT and NOT_INITIALIZED change nothing.
-     */
-    suspend fun login(
-        externalId: String?,
-        profile: OneSignalUserProfile,
-        jwtBearerToken: String? = null,
-    ): OneSignalResult<LoginData>
-
     /**
      * Logout the current user (suspend version).
      */

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/OneSignal.kt

@@ -424,18 +424,6 @@ object OneSignal {
         oneSignal.loginSuspend(externalId, jwtBearerToken)
     }
 
-    /**
-     * Login with [externalId] plus [profile] as one Create User upsert (anonymous is not merged). Email/SMS create or transfer; a foreign alias fails it.
-     * Same id is a no-op once a backend ID exists. Backend failure leaves this identity local; INVALID_ARGUMENT and NOT_INITIALIZED change nothing.
-     */
-    @JvmStatic
-    @JvmOverloads
-    suspend fun login(
-        externalId: String?,
-        profile: OneSignalUserProfile,
-        jwtBearerToken: String? = null,
-    ): OneSignalResult<LoginData> = oneSignal.login(externalId, profile, jwtBearerToken)
-
     /**
      * Logout the current user without blocking the calling thread.
      * Suspends until the SDK is initialized if initialization is in progress.

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/OneSignalResult.kt

@@ -23,8 +23,7 @@ import org.json.JSONObject
  *
  * From Kotlin, inside a coroutine:
  * ```kotlin
- * val result = OneSignal.login("user-123", OneSignalUserProfile.builder().setEmail("a@b.co").build())
- * if (result.isSuccess) println(result.data?.onesignalId) else println(result.error?.first?.code)
+ * if (result.isSuccess) println(result.data) else println(result.error?.first?.code)
  * ```
  *
  * From Java the generated accessors read naturally:

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

@@ -851,10 +851,10 @@ internal class OneSignalImp : IOneSignal,
         loginHelper.enqueueLogin(context)
     }
 
-    override suspend fun login(
+    suspend fun login(
         externalId: String?,
         profile: OneSignalUserProfile,
-        jwtBearerToken: String?,
+        jwtBearerToken: String? = null,
     ): OneSignalResult<LoginData> =
         withContext(ioDispatcher) {
             Logging.log(LogLevel.DEBUG, "login(externalId: $externalId, profile: $profile, jwtBearerToken: ...${jwtBearerToken?.takeLast(8)})")

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/OneSignalSuspendMethodsExistTest.kt

@@ -157,7 +157,7 @@ class OneSignalSuspendMethodsExistTest : FunSpec({
         assert(blocking.any { it.parameters.size == 3 }) { "login(externalId, jwtBearerToken) is missing" }
     }
 
-    test("suspend login with profile exists and returns OneSignalResult") {
+    test("suspend login with a profile is not on the public object") {
         val kFunction =
             OneSignal::class.memberFunctions
                 .firstOrNull { fn ->
@@ -166,10 +166,7 @@ class OneSignalSuspendMethodsExistTest : FunSpec({
                         fn.parameters.any { it.type.classifier == OneSignalUserProfile::class }
                 }
 
-        assert(kFunction != null) { "suspend login(externalId, profile) not found" }
-        assert(kFunction!!.returnType.classifier == OneSignalResult::class) {
-            "suspend login(externalId, profile) should return OneSignalResult"
-        }
+        assert(kFunction == null) { "suspend login(externalId, profile) is still public" }
     }
 
     test("logoutSuspend exists with no parameters") {

examples/demo/app/src/main/java/com/onesignal/example/data/model/CompositeLoginExample.java

@@ -1,7 +1,6 @@
 package com.onesignal.example.data.repository
 
 import com.onesignal.OneSignal
-import com.onesignal.example.data.model.CompositeLoginExample
 import com.onesignal.example.data.model.NotificationType
 import com.onesignal.example.data.network.OneSignalService
 import com.onesignal.example.data.network.UserData
@@ -22,19 +21,6 @@ class OneSignalRepository {
         DemoLog.d("Logged in user with onesignalId: ${OneSignal.User.onesignalId}")
     }
 
-    suspend fun loginUserWithProfile(
-        externalUserId: String,
-        email: String?,
-        sms: String?,
-        jwtToken: String? = null,
-    ) = withContext(Dispatchers.IO) {
-        DemoLog.d("Composite login externalUserId: $externalUserId email=$email sms=$sms")
-        val profile = CompositeLoginExample.profile(email, sms)
-        val result = OneSignal.login(externalUserId, profile, jwtToken)
-        DemoLog.d("Composite login result: $result")
-        result
-    }
-
     suspend fun updateUserJwt(externalUserId: String, jwtToken: String) = withContext(Dispatchers.IO) {
         DemoLog.d("Updating JWT for externalUserId: $externalUserId")
         OneSignal.updateUserJwt(externalUserId, jwtToken)

examples/demo/app/src/main/java/com/onesignal/example/data/repository/OneSignalRepository.kt

@@ -465,102 +465,6 @@ fun LoginDialog(
     )
 }
 
-@Composable
-fun CompositeLoginDialog(
-    onDismiss: () -> Unit,
-    onConfirm: (externalId: String, email: String?, sms: String?, jwt: String?) -> Unit,
-) {
-    var externalId by remember { mutableStateOf("") }
-    var email by remember { mutableStateOf("") }
-    var sms by remember { mutableStateOf("") }
-    var jwtToken by remember { mutableStateOf("") }
-
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        modifier = Modifier.fillMaxWidth().padding(horizontal = DemoLayout.pagePadding).exposeTestTagsAsResourceId(),
-        properties = DialogProperties(usePlatformDefaultWidth = false),
-        title = {
-            DialogTitle("Login With Profile")
-        },
-        text = {
-            Column {
-                OutlinedTextField(
-                    value = externalId,
-                    onValueChange = { externalId = it },
-                    label = { Text("External User Id") },
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .testTag("composite_login_user_id_input"),
-                    singleLine = true,
-                    shape = TextFieldShape,
-                    colors = dialogTextFieldColors()
-                )
-                Spacer(modifier = Modifier.height(12.dp))
-                OutlinedTextField(
-                    value = email,
-                    onValueChange = { email = it },
-                    label = { Text("Email (optional)") },
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .testTag("composite_login_email_input"),
-                    singleLine = true,
-                    keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email),
-                    shape = TextFieldShape,
-                    colors = dialogTextFieldColors()
-                )
-                Spacer(modifier = Modifier.height(12.dp))
-                OutlinedTextField(
-                    value = sms,
-                    onValueChange = { sms = it },
-                    label = { Text("SMS (optional)") },
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .testTag("composite_login_sms_input"),
-                    singleLine = true,
-                    keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Phone),
-                    shape = TextFieldShape,
-                    colors = dialogTextFieldColors()
-                )
-                Spacer(modifier = Modifier.height(12.dp))
-                OutlinedTextField(
-                    value = jwtToken,
-                    onValueChange = { jwtToken = it },
-                    label = { Text("JWT Token (optional)") },
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .testTag("composite_login_jwt_input"),
-                    singleLine = true,
-                    shape = TextFieldShape,
-                    colors = dialogTextFieldColors()
-                )
-            }
-        },
-        confirmButton = {
-            TextButton(
-                onClick = {
-                    onConfirm(
-                        externalId,
-                        email.ifBlank { null },
-                        sms.ifBlank { null },
-                        jwtToken.ifBlank { null },
-                    )
-                },
-                enabled = externalId.isNotBlank(),
-                modifier = Modifier.testTag("composite_login_confirm_button"),
-                colors = dialogTextButtonColors(),
-            ) {
-                DialogActionLabel("Login")
-            }
-        },
-        dismissButton = {
-            TextButton(onClick = onDismiss, colors = dialogTextButtonColors()) {
-                DialogActionLabel("Cancel")
-            }
-        },
-        shape = DialogShape
-    )
-}
-
 /**
  * Dialog for outcome selection and input.
  */

examples/demo/app/src/main/java/com/onesignal/example/ui/components/Dialogs.kt

@@ -151,9 +151,6 @@ fun MainScreen(viewModel: MainViewModel) {
                         onUseIdentityVerificationChange = { viewModel.setUseIdentityVerification(it) },
                         onLanguageChange = { viewModel.setLanguage(it) },
                         onLogin = { userId, jwt -> viewModel.loginUser(userId, jwt) },
-                        onLoginWithProfile = { userId, email, sms, jwt ->
-                            viewModel.loginUserWithProfile(userId, email, sms, jwt)
-                        },
                         onLogout = { viewModel.logoutUser() },
                         onUpdateJwt = { externalId, token -> viewModel.updateUserJwt(externalId, token) },
                         isLoading = isLoading