Skip to content
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

Handling error code coming in fragment from intent #264

Closed
wants to merge 1 commit into from
Closed

Handling error code coming in fragment from intent #264

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
29 changes: 13 additions & 16 deletions authentication/src/main/kotlin/com/uber/sdk2/auth/internal/AuthActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,32 +85,29 @@ class AuthActivity : AppCompatActivity() {
startAuth()
return
}
// otherwise finish the auth flow with error
finishAuthWithError()
// otherwise finish the auth flow with "Canceled" error
finishAuthWithError(CANCELED)
}
}

private fun handleResponse(uri: Uri) {
// This happens when user has authenticated using custom tabs
val authCode =
if (uri.getQueryParameter(KEY_AUTHENTICATION_CODE).isNullOrEmpty() == false) {
uri.getQueryParameter(KEY_AUTHENTICATION_CODE)
} else if (uri.fragment?.isNotEmpty() == true) {
// This happens when user has authenticated using 1p app
Uri.Builder().encodedQuery(uri.fragment).build().getQueryParameter(KEY_AUTHENTICATION_CODE)
} else {
""
}
if (!authCode.isNullOrEmpty()) {
val authCode = uri.getQueryParameter(KEY_AUTHENTICATION_CODE)
?: uri.fragment?.takeIf { it.isNotEmpty() }
?.let { Uri.Builder().encodedQuery(it).build().getQueryParameter(KEY_AUTHENTICATION_CODE) }
?: ""

if (authCode.isNotEmpty()) {
authProvider?.handleAuthCode(authCode)
} else {
// If the intent does not have the auth code, then the user denied the authentication
val error = uri.getQueryParameter(KEY_ERROR) ?: CANCELED
val error = uri.getQueryParameter(KEY_ERROR)
?: uri.fragment?.takeIf { it.isNotEmpty() }
?.let { Uri.Builder().encodedQuery(it).build().getQueryParameter(KEY_ERROR) }
?: CANCELED
finishAuthWithError(error)
}
}

private fun finishAuthWithError(error: String = CANCELED) {
private fun finishAuthWithError(error: String) {
// If the intent does not have the auth code, then the user has cancelled the authentication
intent.putExtra("EXTRA_ERROR", error)
setResult(RESULT_CANCELED, intent)
Expand Down
Loading