Merge pull request #1841 from OneSignal/user_model/add_login_409_logs

[5.0.0] Differentiate login errors and add logs
OneSignal · Jan 31, 2024 · a193567 · a193567
2 parents 7a11f23 + a54fac2
commit a193567
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/...onesignal/core/src/main/java/com/onesignal/core/internal/operations/IOperationExecutor.kt b/...onesignal/core/src/main/java/com/onesignal/core/internal/operations/IOperationExecutor.kt
@@ -68,4 +68,10 @@ enum class ExecutionResult {
      * retried if authorization can be achieved.
      */
     FAIL_UNAUTHORIZED,
+
+    /**
+     * Used in special login case.
+     * The operation failed due to a conflict and can be handled.
+     */
+    FAIL_CONFLICT,
 }
diff --git a/...onesignal/core/src/main/java/com/onesignal/core/internal/operations/impl/OperationRepo.kt b/...onesignal/core/src/main/java/com/onesignal/core/internal/operations/impl/OperationRepo.kt
@@ -167,6 +167,7 @@ internal class OperationRepo(
                 }
                 ExecutionResult.FAIL_UNAUTHORIZED, // TODO: Need to provide callback for app to reset JWT. For now, fail with no retry.
                 ExecutionResult.FAIL_NORETRY,
+                ExecutionResult.FAIL_CONFLICT,
                 -> {
                     Logging.error("Operation execution failed without retry: $operations")
                     // on failure we remove the operation from the store and wake any waiters

diff --git a/...n/java/com/onesignal/user/internal/operations/impl/executors/IdentityOperationExecutor.kt b/...n/java/com/onesignal/user/internal/operations/impl/executors/IdentityOperationExecutor.kt
@@ -51,10 +51,10 @@ internal class IdentityOperationExecutor(
                 return when (responseType) {
                     NetworkUtils.ResponseStatusType.RETRYABLE ->
                         ExecutionResponse(ExecutionResult.FAIL_RETRY)
-                    NetworkUtils.ResponseStatusType.INVALID,
-                    NetworkUtils.ResponseStatusType.CONFLICT,
-                    ->
+                    NetworkUtils.ResponseStatusType.INVALID ->
                         ExecutionResponse(ExecutionResult.FAIL_NORETRY)
+                    NetworkUtils.ResponseStatusType.CONFLICT ->
+                        ExecutionResponse(ExecutionResult.FAIL_CONFLICT)
                     NetworkUtils.ResponseStatusType.UNAUTHORIZED ->
                         ExecutionResponse(ExecutionResult.FAIL_UNAUTHORIZED)
                     NetworkUtils.ResponseStatusType.MISSING -> {

diff --git a/.../java/com/onesignal/user/internal/operations/impl/executors/LoginUserOperationExecutor.kt b/.../java/com/onesignal/user/internal/operations/impl/executors/LoginUserOperationExecutor.kt
@@ -86,9 +86,16 @@ internal class LoginUserOperationExecutor(
 
                     ExecutionResponse(ExecutionResult.SUCCESS_STARTING_ONLY, mapOf(loginUserOp.onesignalId to backendOneSignalId))
                 }
+                ExecutionResult.FAIL_CONFLICT -> {
+                    // When the SetAliasOperation fails with conflict that *most likely* means the externalId provided
+                    // is already associated to a user.  This *expected* condition means we must create a user.
+                    // We hardcode the response of "user-2" in the log to provide information to the SDK consumer
+                    Logging.debug("LoginUserOperationExecutor now handling 409 response with \"code\": \"user-2\" by switching to user with \"external_id\": \"${loginUserOp.externalId}\"")
+                    createUser(loginUserOp, operations)
+                }
                 ExecutionResult.FAIL_NORETRY -> {
-                    // When the SetAliasOperation fails without retry that *most likely* means the externalId provided
-                    // is already associated to a user.  This expected condition means we must create a user.
+                    // Some other failure occurred, still try to recover by creating the user
+                    Logging.error("LoginUserOperationExecutor encountered error. Attempt to recover by switching to user with \"external_id\": \"${loginUserOp.externalId}\"")
                     createUser(loginUserOp, operations)
                 }
                 else -> ExecutionResponse(result.result)