Adding filterByAuthorizedAccounts to signIn function for Google (#53)

mirzemehdi · Oct 5, 2024 · 0f21c3f · 0f21c3f
1 parent d942b84
commit 0f21c3f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/kmpauth-google/src/androidMain/kotlin/com/mmk/kmpauth/google/GoogleAuthUiProviderImpl.kt b/kmpauth-google/src/androidMain/kotlin/com/mmk/kmpauth/google/GoogleAuthUiProviderImpl.kt
@@ -21,10 +21,11 @@ internal class GoogleAuthUiProviderImpl(
     private val googleLegacyAuthentication: GoogleLegacyAuthentication,
 ) :
     GoogleAuthUiProvider {
-    override suspend fun signIn(): GoogleUser? {
+    override suspend fun signIn(filterByAuthorizedAccounts: Boolean): GoogleUser? {
         return try {
-            getGoogleUserFromCredential(filterByAuthorizedAccounts = true)
+            getGoogleUserFromCredential(filterByAuthorizedAccounts = filterByAuthorizedAccounts)
         } catch (e: NoCredentialException) {
+            if (!filterByAuthorizedAccounts) return handleCredentialException(e)
             try {
                 getGoogleUserFromCredential(filterByAuthorizedAccounts = false)
             } catch (e: GetCredentialException) {

diff --git a/kmpauth-google/src/androidMain/kotlin/com/mmk/kmpauth/google/GoogleLegacyAuthentication.kt b/kmpauth-google/src/androidMain/kotlin/com/mmk/kmpauth/google/GoogleLegacyAuthentication.kt
@@ -25,7 +25,7 @@ internal class GoogleLegacyAuthentication(
 
 ) : GoogleAuthUiProvider {
 
-    override suspend fun signIn(): GoogleUser? {
+    override suspend fun signIn(filterByAuthorizedAccounts: Boolean): GoogleUser? {
         val signInClient = getGoogleSignInClient().signInIntent
         activityResultState.isInProgress = true
         try {

diff --git a/kmpauth-google/src/commonMain/kotlin/com/mmk/kmpauth/google/GoogleAuthUiProvider.kt b/kmpauth-google/src/commonMain/kotlin/com/mmk/kmpauth/google/GoogleAuthUiProvider.kt
@@ -8,7 +8,15 @@ public interface GoogleAuthUiProvider {
     /**
      * Opens Sign In with Google UI, and returns [GoogleUser]
      * if sign-in was successful, otherwise, null
+     * By default all available accounts are listed to choose from
+     * @see signIn(filterByAuthorizedAccounts: Boolean)
      * @return returns GoogleUser or null(if sign-in was not successful)
      */
-    public suspend fun signIn(): GoogleUser?
+    public suspend fun signIn(): GoogleUser? = signIn(filterByAuthorizedAccounts = false)
+
+    /**
+     * @param filterByAuthorizedAccounts set to true so users can choose between available accounts to sign in.
+     * setting to false list any accounts that have previously been used to sign in to your app.
+     */
+    public suspend fun signIn(filterByAuthorizedAccounts: Boolean): GoogleUser?
 }
diff --git a/kmpauth-google/src/iosMain/kotlin/com/mmk/kmpauth/google/GoogleAuthUiProviderImpl.kt b/kmpauth-google/src/iosMain/kotlin/com/mmk/kmpauth/google/GoogleAuthUiProviderImpl.kt
@@ -8,7 +8,7 @@ import kotlin.coroutines.suspendCoroutine
 
 internal class GoogleAuthUiProviderImpl : GoogleAuthUiProvider {
     @OptIn(ExperimentalForeignApi::class)
-    override suspend fun signIn(): GoogleUser? = suspendCoroutine { continutation ->
+    override suspend fun signIn(filterByAuthorizedAccounts: Boolean): GoogleUser? = suspendCoroutine { continutation ->
 
         val rootViewController =
             UIApplication.sharedApplication.keyWindow?.rootViewController