Merge pull request #443 from supabase-community/fix-apple

Fix apple auth triggering automatically
supabase-community · Jan 30, 2024 · 3d9502d · 3d9502d
2 parents 6cf1fdc + 2724abc
commit 3d9502d
Showing 1 changed file with 19 additions and 18 deletions.
diff --git a/...poseAuth/src/appleMain/kotlin/io/github/jan/supabase/compose/auth/composable/AppleAuth.kt b/...poseAuth/src/appleMain/kotlin/io/github/jan/supabase/compose/auth/composable/AppleAuth.kt
@@ -45,29 +45,30 @@ actual fun ComposeAuth.rememberSignInWithApple(
     val scope = rememberCoroutineScope()
 
     LaunchedEffect(key1 = state.started) {
-
-        if (config.loginConfig["apple"] == null) {
-            fallback.invoke()
-            state.reset()
-            return@LaunchedEffect
-        }
-
-        val appleIDProvider = ASAuthorizationAppleIDProvider()
-        val request = appleIDProvider.createRequest().apply {
-            requestedScopes = listOf(ASAuthorizationScopeFullName, ASAuthorizationScopeEmail)
-            nonce = (config.loginConfig["apple"] as? AppleLoginConfig)?.nonce
-        }
-
-        val controller = ASAuthorizationController(listOf(request)).apply {
-            delegate = authorizationController(scope) {
-                onResult.invoke(it)
+        if(state.started) {
+            if (config.loginConfig["apple"] == null) {
+                fallback.invoke()
                 state.reset()
+                return@LaunchedEffect
             }
 
-            presentationContextProvider = presentationAnchor()
+            val appleIDProvider = ASAuthorizationAppleIDProvider()
+            val request = appleIDProvider.createRequest().apply {
+                requestedScopes = listOf(ASAuthorizationScopeFullName, ASAuthorizationScopeEmail)
+                nonce = (config.loginConfig["apple"] as? AppleLoginConfig)?.nonce
+            }
+
+            val controller = ASAuthorizationController(listOf(request)).apply {
+                delegate = authorizationController(scope) {
+                    onResult.invoke(it)
+                    state.reset()
+                }
 
+                presentationContextProvider = presentationAnchor()
+
+            }
+            controller.performRequests()
         }
-        controller.performRequests()
     }
 
     return state