Skip to content

Testing auth updates #1644

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Testing auth updates #1644

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ kotlin {
api(libs.androidx.datastore.preferences)
api(libs.multiplatform.settings.datastore)
implementation(libs.googleid)
implementation(libs.androidx.credentials)
}
}

Expand Down
15 changes: 8 additions & 7 deletions shared/src/androidMain/kotlin/dev/johnoreilly/confetti/account/SignInProcess.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import androidx.credentials.ClearCredentialStateRequest
import androidx.credentials.CredentialManager
import androidx.credentials.CustomCredential
import androidx.credentials.GetCredentialRequest
import androidx.credentials.exceptions.ClearCredentialException
import androidx.credentials.exceptions.GetCredentialCancellationException
import androidx.credentials.exceptions.GetCredentialException
import androidx.credentials.exceptions.NoCredentialException
Expand Down Expand Up @@ -34,13 +35,9 @@ class SignInProcess(
*/
suspend fun signIn(activityContext: Context) {
val googleAuthOption = if (useSignInWithGoogle) {
GetSignInWithGoogleOption.Builder(webClientId)
.build()
GetSignInWithGoogleOption(serverClientId = webClientId)
} else {
GetGoogleIdOption.Builder()
.setFilterByAuthorizedAccounts(true)
.setServerClientId(webClientId)
.build()
GetGoogleIdOption(serverClientId = webClientId, filterByAuthorizedAccounts = true)
}

val request: GetCredentialRequest = GetCredentialRequest.Builder()
Expand Down Expand Up @@ -89,7 +86,11 @@ class SignInProcess(
* 2. Signs the user out via [Authentication].
*/
suspend fun signOut() {
credentialManager.clearCredentialState(ClearCredentialStateRequest())
try {
credentialManager.clearCredentialState(ClearCredentialStateRequest())
} catch (e: ClearCredentialException) {
println(e)
}

authentication.signOut()
}
Expand Down
Loading