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

Auth: Fix incomplete silent sign in for games #2582

Merged
merged 7 commits into from
Dec 18, 2024
Merged

Auth: Fix incomplete silent sign in for games #2582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4d795e4
Fixed the issue that Limbo game cannot be logged in
DaVinci9196 Oct 15, 2024
b22b13c
Added FRAG <com.ohbibi.fps> Unable to log in fix
DaVinci9196 Nov 11, 2024
d2c8357
Merge branch 'microg:master' into fix_silentSignIn_error
DaVinci9196 Dec 11, 2024
cddf7a4
Uncheck the default permission
DaVinci9196 Dec 11, 2024
2eff0d1
Switch to UI thread
DaVinci9196 Dec 11, 2024
784cbaf
Merge branch 'master' into fix_silentSignIn_error
mar-v-in Dec 18, 2024
1d77f2d
Nit: Reduce diff by not reordering process line
mar-v-in Dec 18, 2024
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
1 change: 1 addition & 0 deletions play-services-core/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,7 @@
android:name="org.microg.gms.auth.consent.ConsentSignInActivity"
android:process=":ui"
mar-v-in marked this conversation as resolved.
Show resolved Hide resolved
android:exported="false"
android:excludeFromRecents="true"
android:configChanges="keyboardHidden|keyboard|orientation|screenSize"
android:theme="@style/Theme.AppCompat.DayNight.Dialog"/>

Expand Down
6 changes: 3 additions & 3 deletions play-services-core/src/main/kotlin/org/microg/gms/auth/consent/ConsentSignInActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import android.webkit.JavascriptInterface
import android.webkit.WebView
import android.webkit.WebViewClient
import android.widget.ProgressBar
import androidx.core.os.bundleOf
import com.google.android.gms.R
import org.microg.gms.profile.Build.generateWebViewUserAgentString
import org.microg.gms.profile.ProfileManager
Expand Down Expand Up @@ -119,12 +120,11 @@ class ConsentSignInActivity : Activity() {
try {
Log.d(TAG, "sendReplay result -> $result")
val obtain = Message.obtain()
obtain.what = 1
obtain.obj = result
obtain.data = bundleOf(Pair(CONSENT_RESULT, result))
messenger?.send(obtain)
sendSuccessResult = true
} catch (e: Exception) {
Log.d(TAG, "sendReplay Exception -> " + e.message)
Log.w(TAG, "sendReplay Exception -> ", e)
}
}

Expand Down
10 changes: 8 additions & 2 deletions play-services-core/src/main/kotlin/org/microg/gms/auth/signin/AuthSignInService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package org.microg.gms.auth.signin

import android.accounts.Account
import android.accounts.AccountManager
import android.content.Context
import android.os.Bundle
import android.os.Parcel
Expand All @@ -37,6 +38,7 @@ import com.google.android.gms.common.internal.ConnectionInfo
import com.google.android.gms.common.internal.GetServiceRequest
import com.google.android.gms.common.internal.IGmsCallbacks
import org.microg.gms.BaseService
import org.microg.gms.auth.AuthConstants
import org.microg.gms.auth.AuthPrefs
import org.microg.gms.common.GmsService
import org.microg.gms.common.PackageUtils
Expand Down Expand Up @@ -77,8 +79,12 @@ class AuthSignInServiceImpl(
}
lifecycleScope.launchWhenStarted {
try {
val account = account ?: options?.account ?: SignInConfigurationService.getDefaultAccount(context, packageName)
if (account != null && options?.isForceCodeForRefreshToken != true && options?.includeUnacceptableScope != true) {
val account = account
?: options?.account
?: SignInConfigurationService.getDefaultAccount(context, packageName)
?: AccountManager.get(context).getAccountsByType(AuthConstants.DEFAULT_ACCOUNT_TYPE).firstOrNull()
Log.d(TAG, "silentSignIn: account -> ${account?.name}")
if (account != null && options?.isForceCodeForRefreshToken != true) {
if (getOAuthManager(context, packageName, options, account).isPermitted || AuthPrefs.isTrustGooglePermitted(context)) {
val googleSignInAccount = performSignIn(context, packageName, options, account)
if (googleSignInAccount != null) {
Expand Down
12 changes: 7 additions & 5 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 @@ -104,7 +104,7 @@ suspend fun checkAccountAuthStatus(context: Context, packageName: String, scopeL
suspend fun performSignIn(context: Context, packageName: String, options: GoogleSignInOptions?, account: Account, permitted: Boolean = false): GoogleSignInAccount? {
val authManager = getOAuthManager(context, packageName, options, account)
val authResponse = withContext(Dispatchers.IO) {
if (options?.includeUnacceptableScope == true) {
if (options?.includeUnacceptableScope == true || !permitted) {
authManager.setTokenRequestOptions(consentRequestOptions)
}
if (permitted) authManager.isPermitted = true
Expand Down Expand Up @@ -134,7 +134,8 @@ suspend fun performSignIn(context: Context, packageName: String, options: Google
val serverAuthCode: String? = if (options?.isServerAuthCodeRequested == true) serverAuthTokenResponse?.auth else null
val expirationTime = min(authResponse.expiry.orMaxIfNegative(), idTokenResponse?.expiry.orMaxIfNegative())
val obfuscatedIdentifier: String = MessageDigest.getInstance("MD5").digest("$googleUserId:$packageName".encodeToByteArray()).toHexString().uppercase()
val grantedScopes = authResponse.grantedScopes?.split(" ").orEmpty().map { Scope(it) }.toSet()
val grantedScopeList = authResponse.grantedScopes ?: idTokenResponse?.grantedScopes ?: serverAuthTokenResponse?.grantedScopes
val grantedScopes = grantedScopeList?.split(" ").orEmpty().map { Scope(it) }.toSet()
val (givenName, familyName, displayName, photoUrl) = if (options?.includeProfile == true) {
val databaseHelper = DatabaseHelper(context)
val cursor = databaseHelper.getOwner(account.name)
Expand Down Expand Up @@ -184,12 +185,13 @@ suspend fun performConsentView(context: Context, packageName: String, account: A
return withContext(Dispatchers.IO) {
val deferred = CompletableDeferred<String?>()
val intent = Intent(context, ConsentSignInActivity::class.java).apply {
flags = Intent.FLAG_ACTIVITY_NEW_TASK
putExtra(CONSENT_URL, consentResponse.consentUrl)
putExtra(CONSENT_MESSENGER, Messenger(object : Handler(Looper.getMainLooper()) {
override fun handleMessage(msg: Message) {
val content = msg.obj
Log.d(TAG, "performConsentView: ConsentSignInActivity deferred ")
deferred.complete(content?.toString())
val content = msg.data.getString(CONSENT_RESULT)
Log.d(TAG, "performConsentView: ConsentSignInActivity deferred content: $content")
deferred.complete(content)
}
}))
cookies.forEachIndexed { index, cookie ->
Expand Down
Loading