diff --git a/sample/chat-demo-mpp/common/build.gradle.kts b/sample/chat-demo-mpp/common/build.gradle.kts index 8685dddf4..6c1aacc8e 100644 --- a/sample/chat-demo-mpp/common/build.gradle.kts +++ b/sample/chat-demo-mpp/common/build.gradle.kts @@ -14,7 +14,7 @@ plugins { group = "io.github.jan.supabase" version = "1.0-SNAPSHOT" -val pluginVersion = "3.2.0" +val pluginVersion = "3.2.7" kotlin { @OptIn(ExperimentalKotlinGradlePluginApi::class) diff --git a/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ChatViewModel.kt b/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ChatViewModel.kt index 0fb064e5e..be0e7f884 100644 --- a/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ChatViewModel.kt +++ b/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ChatViewModel.kt @@ -97,6 +97,10 @@ class ChatViewModel( } } + fun handleSignInWithGoogleResult() { + alert.value = "Successfully signed in with Google!" + } + fun logout() { coroutineScope.launch { kotlin.runCatching { diff --git a/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/supabaseModule.kt b/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/supabaseModule.kt index 42060f8e8..4f621bdee 100644 --- a/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/supabaseModule.kt +++ b/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/supabaseModule.kt @@ -3,6 +3,9 @@ package io.github.jan.supabase.common.di import io.github.jan.supabase.auth.Auth import io.github.jan.supabase.auth.AuthConfig import io.github.jan.supabase.auth.FlowType +import io.github.jan.supabase.compose.auth.ComposeAuth +import io.github.jan.supabase.compose.auth.appleNativeLogin +import io.github.jan.supabase.compose.auth.googleNativeLogin import io.github.jan.supabase.createSupabaseClient import io.github.jan.supabase.logging.LogLevel import io.github.jan.supabase.postgrest.Postgrest @@ -24,6 +27,9 @@ val supabaseModule = module { flowType = FlowType.PKCE } install(Realtime) + install(ComposeAuth) { + googleNativeLogin(serverClientId = "YOUR_WEB_CLIENT_ID") + } } } } \ No newline at end of file diff --git a/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/LoginScreen.kt b/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/LoginScreen.kt index 7ec089f16..76f260292 100644 --- a/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/LoginScreen.kt +++ b/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/LoginScreen.kt @@ -39,7 +39,11 @@ import io.github.jan.supabase.common.ui.components.PasswordField import io.github.jan.supabase.common.ui.components.PasswordRecoveryDialog import io.github.jan.supabase.compose.auth.ui.ProviderButtonContent import io.github.jan.supabase.compose.auth.ui.annotations.AuthUiExperimental - +import io.github.jan.supabase.compose.auth.composeAuth +import io.github.jan.supabase.compose.auth.ui.ProviderIcon +import io.github.jan.supabase.compose.auth.composable.NativeSignInResult +import io.github.jan.supabase.compose.auth.composable.rememberSignInWithGoogle +import co.touchlab.kermit.Logger @OptIn(ExperimentalMaterial3Api::class, SupabaseExperimental::class, AuthUiExperimental::class) @Composable fun LoginScreen(viewModel: ChatViewModel) { @@ -48,7 +52,28 @@ fun LoginScreen(viewModel: ChatViewModel) { var email by remember { mutableStateOf("") } var otpDialogState by remember { mutableStateOf(OTPDialogState.Invisible) } var showPasswordRecoveryDialog by remember { mutableStateOf(false) } + val action = viewModel.supabaseClient.composeAuth.rememberSignInWithGoogle( + onResult = { result -> + when (result) { + is NativeSignInResult.Success -> { + viewModel.handleSignInWithGoogleResult() + Logger.d("LoginScreen - Success") + } + + is NativeSignInResult.ClosedByUser -> { + Logger.d("LoginScreen - ClosedByUser") + } + is NativeSignInResult.Error -> { + Logger.d("LoginScreen - Error") + } + + is NativeSignInResult.NetworkError -> { + Logger.d("LoginScreen - Network Error") + } + } + }, + ) Column( modifier = Modifier.fillMaxSize(), verticalArrangement = Arrangement.Center, @@ -94,7 +119,14 @@ fun LoginScreen(viewModel: ChatViewModel) { ) { ProviderButtonContent(Google, text = if (signUp) "Sign Up with Google" else "Login with Google") } - + Button( + onClick = { + action.startFlow() + }, + ) { + ProviderIcon(Google, contentDescription = null) + Text("Native Sign In with Google") + } TextButton( onClick = { otpDialogState = OTPDialogState.Visible(email) } ) { diff --git a/sample/chat-demo-mpp/ios/chatdemoios.xcodeproj/xcuserdata/hieuvu.xcuserdatad/xcschemes/xcschememanagement.plist b/sample/chat-demo-mpp/ios/chatdemoios.xcodeproj/xcuserdata/hieuvu.xcuserdatad/xcschemes/xcschememanagement.plist index 9145cc551..bfd290b21 100644 --- a/sample/chat-demo-mpp/ios/chatdemoios.xcodeproj/xcuserdata/hieuvu.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/sample/chat-demo-mpp/ios/chatdemoios.xcodeproj/xcuserdata/hieuvu.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,7 +7,7 @@ chatdemoios.xcscheme_^#shared#^_ orderHint - 2 + 0 SuppressBuildableAutocreation diff --git a/sample/chat-demo-mpp/ios/chatdemoios/Info.plist b/sample/chat-demo-mpp/ios/chatdemoios/Info.plist index 11845e1da..118efea59 100644 --- a/sample/chat-demo-mpp/ios/chatdemoios/Info.plist +++ b/sample/chat-demo-mpp/ios/chatdemoios/Info.plist @@ -2,7 +2,22 @@ + CFBundleIdentifier + io.github.jan.supabase.ios + GIDClientID + YOUR_IOS_CLIENT_ID CADisableMinimumFrameDurationOnPhone + CFBundleURLTypes + + + CFBundleTypeRole + Editor + CFBundleURLSchemes + + YOUR_REVERSED_IOS_CLIENT_ID + + +