Skip to content

Fix auto login #3773

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
FikriMilano wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix auto login #3773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6793d41
Auto login if token is active
FikriMilano Aug 24, 2025
d4bb0c2
Prevents NPE on first time login
FikriMilano Aug 24, 2025
131b3ba
Delete login credentials on logout
FikriMilano Aug 24, 2025
0a893be
Merge branch 'main' into 3772-fix-auto-login
Rkareko Aug 25, 2025
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: 5 additions & 1 deletion .../src/main/java/org/smartregister/fhircore/engine/data/remote/shared/TokenAuthenticator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,10 @@ constructor(
}
}

fun isCurrentRefreshTokenActive() = isTokenActive(accountManager.getPassword(findAccount()))
fun isCurrentRefreshTokenActive(): Boolean {
val account = findAccount() ?: return false
return isTokenActive(accountManager.getPassword(account))
}

private fun buildOAuthPayload(grantType: String) =
mutableMapOf(
Expand Down Expand Up @@ -188,6 +191,7 @@ constructor(
account.type,
accountManager.peekAuthToken(account, AUTH_TOKEN_TYPE),
)
secureSharedPreference.deleteCredentials()
Copy link
Contributor

@Rkareko Rkareko Aug 25, 2025

Choose a reason for hiding this comment

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

Could you explain what was happening before this line was added.

Copy link
Member Author

@FikriMilano FikriMilano Aug 25, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Without this 1 line change, and while the other new changes are implemented:

When user logs out, app navigates to login page but then immiediately goes back to the hope page, because all this time, the user credentials stays even after log out where it should have been deleted.

Result.success(true)
} else {
Result.success(false)
Expand Down
2 changes: 2 additions & 0 deletions android/quest/src/main/java/org/smartregister/fhircore/quest/ui/login/LoginActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ open class LoginActivity : BaseMultiLanguageActivity() {
) {
navigateToPinLogin(launchSetup = false)
}
} else {
if (loginActivity.isRefreshTokenActive()) updateNavigateHome(true)
}
viewModelScope.launch { contentCache.invalidate() }
navigateToHome.observe(loginActivity) { launchHomeScreen ->
Expand Down
Loading