Skip to content

Auth: Obtain auth again after consent #3328

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

Merged
mar-v-in merged 2 commits into from
Mar 30, 2026
Merged

Auth: Obtain auth again after consent #3328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4dfdcd
Auth: Obtain auth again after consent
DaVinci9196 Mar 11, 2026
a1f2057
Return data to complete accessToken
DaVinci9196 Mar 20, 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
8 changes: 4 additions & 4 deletions play-services-core/src/main/kotlin/org/microg/gms/auth/signin/AuthSignInActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,15 +179,15 @@ class AuthSignInActivity : AppCompatActivity() {
}

private suspend fun signIn(account: Account) {
val (_, googleSignInAccount) = performSignIn(this, config?.packageName!!, config?.options, account, true, idNonce)
val (accessToken, googleSignInAccount) = performSignIn(this, config?.packageName!!, config?.options, account, true, idNonce)
if (googleSignInAccount != null) {
finishResult(CommonStatusCodes.SUCCESS, account = account, googleSignInAccount = googleSignInAccount)
finishResult(CommonStatusCodes.SUCCESS, account = account, googleSignInAccount = googleSignInAccount, accessToken = accessToken)
} else {
finishResult(CommonStatusCodes.INTERNAL_ERROR, "Sign in failed")
}
}

private fun finishResult(statusCode: Int, message: String? = null, account: Account? = null, googleSignInAccount: GoogleSignInAccount? = null) {
private fun finishResult(statusCode: Int, message: String? = null, account: Account? = null, googleSignInAccount: GoogleSignInAccount? = null, accessToken: String? = null) {
val data = Intent()
if (statusCode != CommonStatusCodes.SUCCESS) data.putExtra(AuthConstants.ERROR_CODE, statusCode)
data.putExtra(AuthConstants.GOOGLE_SIGN_IN_STATUS, Status(statusCode, message))
Expand All @@ -196,7 +196,7 @@ class AuthSignInActivity : AppCompatActivity() {
if (googleSignInAccount != null) {
val authorizationResult = AuthorizationResult(
googleSignInAccount.serverAuthCode,
googleSignInAccount.idToken,
accessToken,
googleSignInAccount.idToken,
googleSignInAccount.grantedScopes.map { it.scopeUri },
googleSignInAccount,
Expand Down
9 changes: 6 additions & 3 deletions play-services-core/src/main/kotlin/org/microg/gms/auth/signin/extensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ suspend fun checkAccountAuthStatus(context: Context, packageName: String, scopeL

suspend fun performSignIn(context: Context, packageName: String, options: GoogleSignInOptions?, account: Account, permitted: Boolean = false, idNonce: String? = null): Pair<String?, GoogleSignInAccount?> {
val authManager = getOAuthManager(context, packageName, options, account)
val authResponse = withContext(Dispatchers.IO) {
var authResponse = withContext(Dispatchers.IO) {
if (options?.includeUnacceptableScope == true || !permitted) {
authManager.setTokenRequestOptions(consentRequestOptions)
}
Expand All @@ -120,9 +120,12 @@ suspend fun performSignIn(context: Context, packageName: String, options: Google
if ("remote_consent" == authResponse.issueAdvice && authResponse.resolutionDataBase64 != null){
consentResult = performConsentView(context, packageName, account, authResponse.resolutionDataBase64)
if (consentResult == null) return Pair(null, null)
} else {
if (authResponse.auth == null) return Pair(null, null)
authResponse = authManager.let {
it.putDynamicFiled(CONSENT_RESULT, consentResult)
withContext(Dispatchers.IO) { it.requestAuth(true) }
}
}
if (authResponse.auth == null) return Pair(null, null)
Log.d(TAG, "id token requested: ${options?.isIdTokenRequested == true}, serverClientId = ${options?.serverClientId}, permitted = ${authManager.isPermitted}")
val idTokenResponse = getIdTokenManager(context, packageName, options, account)?.let {
if (idNonce != null) {
Expand Down