Merge pull request #395 from supabase-community/fix-cm

Fix CM automatically triggering
supabase-community · Dec 24, 2023 · ae5386b · ae5386b
2 parents 3f5400d + b02a59c
commit ae5386b
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 32 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -10,4 +10,4 @@ kotlin.experimental.tryK2=false
 org.jetbrains.compose.experimental.uikit.enabled=true
 org.jetbrains.compose.experimental.jscanvas.enabled=true
 
-supabase-version = 2.0.1
+supabase-version = 2.0.2
diff --git a/...eAuth/src/androidMain/kotlin/io/github/jan/supabase/compose/auth/composable/GoogleAuth.kt b/...eAuth/src/androidMain/kotlin/io/github/jan/supabase/compose/auth/composable/GoogleAuth.kt
@@ -20,6 +20,7 @@ import com.google.android.gms.common.api.ApiException
 import com.google.android.gms.common.api.CommonStatusCodes
 import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential
 import com.google.android.libraries.identity.googleid.GoogleIdTokenParsingException
+import io.github.jan.supabase.annotations.SupabaseInternal
 import io.github.jan.supabase.compose.auth.ComposeAuth
 import io.github.jan.supabase.compose.auth.GoogleLoginConfig
 import io.github.jan.supabase.compose.auth.defaultSignOutBehavior
@@ -56,46 +57,56 @@ internal fun ComposeAuth.signInWithCM(onResult: (NativeSignInResult) -> Unit, fa
     val context = LocalContext.current
 
     LaunchedEffect(key1 = state.started){
-        val activity = context.getActivity()
+        if (state.started) {
+            val activity = context.getActivity()
 
-        if (activity == null || config.loginConfig["google"] == null) {
-            fallback.invoke()
-            state.reset()
-            return@LaunchedEffect
-        }
+            if (activity == null || config.loginConfig["google"] == null) {
+                fallback.invoke()
+                state.reset()
+                return@LaunchedEffect
+            }
 
-        try {
-            val request = GetCredentialRequest.Builder().addCredentialOption(getGoogleIDOptions(config.loginConfig["google"] as? GoogleLoginConfig)).build()
-            val result = CredentialManager.create(context).getCredential(activity, request)
+            try {
+                val request = GetCredentialRequest.Builder()
+                    .addCredentialOption(getGoogleIDOptions(config.loginConfig["google"] as? GoogleLoginConfig))
+                    .build()
+                val result = CredentialManager.create(context).getCredential(activity, request)
 
-            when (result.credential) {
-                is CustomCredential -> {
-                    if (result.credential.type == GoogleIdTokenCredential.TYPE_GOOGLE_ID_TOKEN_CREDENTIAL) {
-                        try {
-                            val googleIdTokenCredential = GoogleIdTokenCredential.createFrom(result.credential.data)
-                            signInWithGoogle(googleIdTokenCredential.idToken)
-                            onResult.invoke(NativeSignInResult.Success)
-                        } catch (e: GoogleIdTokenParsingException) {
-                            onResult.invoke(
-                                NativeSignInResult.Error(
-                                    e.localizedMessage ?: "error: google id parsing exception"
+                when (result.credential) {
+                    is CustomCredential -> {
+                        if (result.credential.type == GoogleIdTokenCredential.TYPE_GOOGLE_ID_TOKEN_CREDENTIAL) {
+                            try {
+                                val googleIdTokenCredential =
+                                    GoogleIdTokenCredential.createFrom(result.credential.data)
+                                signInWithGoogle(googleIdTokenCredential.idToken)
+                                onResult.invoke(NativeSignInResult.Success)
+                            } catch (e: GoogleIdTokenParsingException) {
+                                onResult.invoke(
+                                    NativeSignInResult.Error(
+                                        e.localizedMessage ?: "error: google id parsing exception"
+                                    )
                                 )
-                            )
+                            }
+                        } else {
+                            onResult.invoke(NativeSignInResult.Error("error: unexpected type of credential"))
                         }
-                    } else {
-                        onResult.invoke(NativeSignInResult.Error("error: unexpected type of credential"))
+                    } else -> {
+                        onResult.invoke(NativeSignInResult.Error("error: unsupported credentials"))
                     }
                 }
-                else -> onResult.invoke(NativeSignInResult.Error("error: unsupported credentials"))
-            }
-
-        } catch (e: GetCredentialException) {
-            when(e){
-                is GetCredentialCancellationException -> onResult.invoke(NativeSignInResult.ClosedByUser)
-                else -> onResult.invoke(NativeSignInResult.Error(e.localizedMessage ?: "error: getCredentialException"))
+            } catch (e: GetCredentialException) {
+                when (e) {
+                    is GetCredentialCancellationException -> onResult.invoke(NativeSignInResult.ClosedByUser)
+                    else -> onResult.invoke(
+                        NativeSignInResult.Error(
+                            e.localizedMessage ?: "error: getCredentialException"
+                        )
+                    )
+                }
+            } finally {
+                state.reset()
             }
         }
-
     }
 
     return state
@@ -166,6 +177,7 @@ internal fun ComposeAuth.oneTapSignIn(onResult: (NativeSignInResult) -> Unit, fa
 /**
  * Composable for Google SignOut with native behavior
  */
+@OptIn(SupabaseInternal::class)
 @Composable
 actual fun ComposeAuth.rememberSignOutWithGoogle(signOutScope: SignOutScope): NativeSignInState {
     val context = LocalContext.current