Skip to content

fix: SDK stuck in bad state when calling login with restricted external IDs #2523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jinliu9508 wants to merge 6 commits into
base: main
Choose a base branch
from
Open

fix: SDK stuck in bad state when calling login with restricted external IDs #2523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
405e232
fix: SDK stuck when login with restricted external ID
jinliu9508 Jan 20, 2026
d26af10
Update test with backend error 400
jinliu9508 Jan 20, 2026
0c2afc5
fix: add new execution result for invalid login
jinliu9508 Jan 29, 2026
3bf4540
add a comment
jinliu9508 Jan 30, 2026
ec1ef03
fix: remove set FAIL_PAUSE_OPERPO
jinliu9508 Feb 2, 2026
04d2153
test: replace FAIL_PAUSE_OPERPO with FAIL_INVLIAD_LOGIN
jinliu9508 Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...onesignal/core/src/main/java/com/onesignal/core/internal/operations/IOperationExecutor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ enum class ExecutionResult {

/**
* Used in special create user case.
* The operation failed due to a non-retryable error. Pause the operation repo
* and retry on a new session, giving the SDK a chance to recover from the failed user create.
* The operation failed due to invalid arguments (eg. restricted external ID is used.)
* We should not retry the operation as the external ID should not be used again.
*/
FAIL_PAUSE_OPREPO,
FAIL_INVALID_LOGIN,
}
17 changes: 1 addition & 16 deletions ...onesignal/core/src/main/java/com/onesignal/core/internal/operations/impl/OperationRepo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ internal class OperationRepo(
internal val queue = mutableListOf<OperationQueueItem>()
private val waiter = WaiterWithValue<LoopWaiterMessage>()
private val retryWaiter = WaiterWithValue<LoopWaiterMessage>()
private var paused = false
private val initialized = CompletableDeferred<Unit>()

override suspend fun awaitInitialized() {
Expand Down Expand Up @@ -101,7 +100,6 @@ internal class OperationRepo(
}

override fun start() {
paused = false
scope.launch {
// load saved operations first then start processing the queue to ensure correct operation order
loadSavedOperations()
Expand Down Expand Up @@ -182,11 +180,6 @@ internal class OperationRepo(
waitForNewOperationAndExecutionInterval()
enqueueIntoBucket++
while (true) {
if (paused) {
Logging.debug("OperationRepo is paused")
return
}

val ops = getNextOps(executeBucket)
Logging.debug("processQueueForever:ops:\n$ops")

Expand Down Expand Up @@ -270,6 +263,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_INVALID_LOGIN,
ExecutionResult.FAIL_CONFLICT,
-> {
Logging.error("Operation execution failed without retry: $operations")
Expand Down Expand Up @@ -298,15 +292,6 @@ internal class OperationRepo(
}
}
}
ExecutionResult.FAIL_PAUSE_OPREPO -> {
Logging.error("Operation execution failed with eventual retry, pausing the operation repo: $operations")
// keep the failed operation and pause the operation repo from executing
paused = true
// add back all operations to the front of the queue to be re-executed.
synchronized(queue) {
ops.reversed().forEach { queue.add(0, it) }
}
}
}

// if there are operations provided on the result, we need to enqueue them at the
Expand Down
4 changes: 3 additions & 1 deletion .../java/com/onesignal/user/internal/operations/impl/executors/LoginUserOperationExecutor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@ internal class LoginUserOperationExecutor(
)
createUser(loginUserOp, operations)
}
// For all other errors, the request will be dropped and will not create the user
// e.g. ExecutionResult.FAIL_INVALID_LOGIN
else -> ExecutionResponse(result.result)
}
}
Expand Down Expand Up @@ -238,7 +240,7 @@ internal class LoginUserOperationExecutor(
NetworkUtils.ResponseStatusType.UNAUTHORIZED ->
ExecutionResponse(ExecutionResult.FAIL_UNAUTHORIZED, retryAfterSeconds = ex.retryAfterSeconds)
else ->
ExecutionResponse(ExecutionResult.FAIL_PAUSE_OPREPO)
ExecutionResponse(ExecutionResult.FAIL_INVALID_LOGIN)
}
}
}
Expand Down
31 changes: 29 additions & 2 deletions ...e/src/test/java/com/onesignal/user/internal/operations/LoginUserOperationExecutorTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ class LoginUserOperationExecutorTests : FunSpec({
coVerify(exactly = 1) { mockUserBackendService.createUser(appId, mapOf(), any(), any()) }
}

test("login anonymous user fails with no retry when backend error condition exists") {
test("login anonymous user fails with no retry when hit with backend error 404") {
// Given
val mockUserBackendService = mockk<IUserBackendService>()
coEvery { mockUserBackendService.createUser(any(), any(), any(), any()) } throws BackendException(404, "NOT FOUND")
Expand All @@ -159,7 +159,34 @@ class LoginUserOperationExecutorTests : FunSpec({
val response = loginUserOperationExecutor.execute(operations)

// Then
response.result shouldBe ExecutionResult.FAIL_PAUSE_OPREPO
response.result shouldBe ExecutionResult.FAIL_INVALID_LOGIN
coVerify(exactly = 1) { mockUserBackendService.createUser(appId, mapOf(), any(), any()) }
}

test("login anonymous user fails with LOGIN_INVALID when hit with backend error 400") {
// Given
val mockUserBackendService = mockk<IUserBackendService>()
coEvery { mockUserBackendService.createUser(any(), any(), any(), any()) } throws BackendException(400, "INVALID")

val mockIdentityOperationExecutor = mockk<IdentityOperationExecutor>()

val mockIdentityModelStore = MockHelper.identityModelStore()
val mockPropertiesModelStore = MockHelper.propertiesModelStore()
val mockSubscriptionsModelStore = mockk<SubscriptionModelStore>()

val loginUserOperationExecutor =
LoginUserOperationExecutor(mockIdentityOperationExecutor, AndroidMockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore, MockHelper.configModelStore(), MockHelper.languageContext())
val operations =
listOf<Operation>(
LoginUserOperation(appId, localOneSignalId, null, null),
createSubscriptionOperation,
)

// When
val response = loginUserOperationExecutor.execute(operations)

// Then
response.result shouldBe ExecutionResult.FAIL_INVALID_LOGIN
coVerify(exactly = 1) { mockUserBackendService.createUser(appId, mapOf(), any(), any()) }
}

Expand Down
Loading