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

Jump to bottom

Games: Improve login auth scope logic #2273

Merged
merged 2 commits into from
May 1, 2024
Merged

Games: Improve login auth scope logic #2273

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
684922a
Games: Improve login auth scope logic
DaVinci9196 Mar 29, 2024
86ce999
Address feedback
mar-v-in May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions play-services-basement/src/main/aidl/com/google/android/gms/common/api/Scope.aidl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/*
* SPDX-FileCopyrightText: 2023 microG Project Team
* SPDX-License-Identifier: Apache-2.0
*/

package com.google.android.gms.common.api;

parcelable Scope;
3 changes: 3 additions & 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 @@ -478,6 +478,7 @@
android:name="org.microg.gms.auth.signin.AuthSignInActivity"
android:theme="@style/Theme.App.DayNight.Dialog.Alert.NoActionBar"
android:process=":ui"
android:configChanges="keyboardHidden|keyboard|orientation|screenSize"
android:exported="true">
<intent-filter>
<action android:name="com.google.android.gms.auth.GOOGLE_SIGN_IN" />
Expand Down Expand Up @@ -513,6 +514,7 @@
android:name="org.microg.gms.auth.consent.ConsentSignInActivity"
android:process=":ui"
android:exported="false"
android:configChanges="keyboardHidden|keyboard|orientation|screenSize"
android:theme="@style/Theme.AppCompat.DayNight.Dialog"/>

<!-- Games -->
Expand All @@ -522,6 +524,7 @@
android:enabled="true"
android:exported="false"
android:process=":ui"
android:configChanges="keyboardHidden|keyboard|orientation|screenSize"
android:theme="@style/Theme.App.Translucent"/>

<activity
Expand Down
21 changes: 14 additions & 7 deletions play-services-core/src/main/kotlin/org/microg/gms/games/GamesSignInActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ import android.os.Bundle
import android.util.Log
import android.view.Gravity
import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.IntentCompat
import androidx.lifecycle.lifecycleScope
import com.google.android.gms.auth.api.signin.GoogleSignInAccount
import com.google.android.gms.auth.api.signin.GoogleSignInOptions
import com.google.android.gms.auth.api.signin.internal.SignInConfiguration
import com.google.android.gms.common.api.Scope
import com.google.android.gms.common.api.Status
import org.microg.gms.auth.AuthConstants
import org.microg.gms.auth.signin.AuthSignInActivity
import org.microg.gms.common.Constants

private const val TAG = "GamesSignIn"

Expand All @@ -28,9 +29,11 @@ class GamesSignInActivity : AppCompatActivity() {
val gamePackageName: String?
get() = intent?.getStringExtra(EXTRA_GAME_PACKAGE_NAME)
val account: Account?
get() = intent?.getParcelableExtra(EXTRA_ACCOUNT)
get() = IntentCompat.getParcelableExtra(intent, EXTRA_ACCOUNT, Account::class.java)
val popupGravity: Int
get() = intent?.getIntExtra(EXTRA_POPUP_GRAVITY, Gravity.TOP or Gravity.CENTER_HORIZONTAL) ?: (Gravity.TOP or Gravity.CENTER_HORIZONTAL)
val scopes: List<Scope>
get() = IntentCompat.getParcelableArrayExtra(intent, EXTRA_SCOPES, Scope::class.java)?.filterIsInstance<Scope>().orEmpty().realScopes

private val Int.px: Int get() = (this * resources.displayMetrics.density).toInt()

Expand All @@ -41,19 +44,23 @@ class GamesSignInActivity : AppCompatActivity() {

window.setGravity(popupGravity)
startActivityForResult(Intent(this, AuthSignInActivity::class.java).apply {
Log.d(TAG, "Sign in for $gamePackageName account:${account?.name} scopes:$scopes")
putExtra("config", SignInConfiguration().apply {
packageName = gamePackageName
options = account?.name?.takeIf { it != AuthConstants.DEFAULT_ACCOUNT }?.let {
GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_GAMES_SIGN_IN).setAccountName(it).build()
} ?: GoogleSignInOptions.DEFAULT_GAMES_SIGN_IN
options = GoogleSignInOptions.Builder().apply {
for (scope in scopes) {
requestScopes(scope)
}
account?.name?.takeIf { it != AuthConstants.DEFAULT_ACCOUNT }?.let { setAccountName(it) }
}.build()
})
Log.d(TAG, "Redirect to GOOGLE_SIGN_IN using $this")
}, REQUEST_CODE_GOOGLE_SIGN_IN)
}

private suspend fun signIn(account: Account) {
Log.d(TAG, "Sign in as $account")
if (performGamesSignIn(this, gamePackageName!!, account, permitted = true)) {
Log.d(TAG, "Sign in as ${account.name}")
if (performGamesSignIn(this, gamePackageName!!, account, permitted = true, scopes = scopes)) {
GamesConfigurationService.setDefaultAccount(this, gamePackageName, account)
}
setResult(RESULT_OK, Intent().apply {
Expand Down