Skip to content

fix: login with the same externalId fails to update the subscription #2406

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
wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −8
Open

fix: login with the same externalId fails to update the subscription #2406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/LoginHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,7 @@ class LoginHelper(
currentIdentityExternalId = identityModelStore.model.externalId
currentIdentityOneSignalId = identityModelStore.model.onesignalId

if (currentIdentityExternalId == externalId) {
Copy link
Contributor

@abdulraqeeb33 abdulraqeeb33 Nov 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This same behaviour exists in iOS, so we need to figure out what is it thats different we are doing.

is it possible that the login method is called so quickly and identityModelStore is not setup yet?

return
}

// always create a user on login in case of externalId being removed in backend
// TODO: Set JWT Token for all future requests.
userSwitcher.createAndSwitchToNewUser { identityModel, _ ->
identityModel.externalId = externalId
Expand Down
10 changes: 6 additions & 4 deletions OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/LoginHelperTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ class LoginHelperTests : FunSpec({
Logging.logLevel = LogLevel.NONE
}

test("login with same external id returns early without creating user") {
// in the event of externalId being removed in the backend, SDK needs to send a CreateUser request
// to restore the externalId for the subscription
test("login with same external id still creates a user") {
// Given
val mockIdentityModelStore =
MockHelper.identityModelStore { model ->
Expand All @@ -64,9 +66,9 @@ class LoginHelperTests : FunSpec({
loginHelper.login(currentExternalId)
}

// Then - should return early without any operations
verify(exactly = 0) { mockUserSwitcher.createAndSwitchToNewUser(suppressBackendOperation = any(), modify = any()) }
coVerify(exactly = 0) { mockOperationRepo.enqueueAndWait(any()) }
// Then - should create a user and send a request
verify(exactly = 1) { mockUserSwitcher.createAndSwitchToNewUser(suppressBackendOperation = any(), modify = any()) }
coVerify(exactly = 1) { mockOperationRepo.enqueueAndWait(any()) }
}

test("login with different external id creates and switches to new user") {
Expand Down