🐛 fix apple signin error alert

Author: DGuang21

composeApp/src/commonMain/kotlin/com/slax/reader/ui/login/LoginScreen.kt

@@ -89,16 +89,13 @@ fun LoginScreen(navController: NavHostController) {
     }
 
     Column(
-        modifier = Modifier.fillMaxSize().background(Color.White).windowInsetsPadding(WindowInsets.navigationBars),
-        verticalArrangement = Arrangement.SpaceBetween
+        modifier = Modifier.fillMaxSize().background(Color.White).windowInsetsPadding(WindowInsets.navigationBars)
     ) {
         // 顶部内容区域
-        Column {
-            Spacer(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .aspectRatio(375f / 128f)
-            )
+        Column(
+            modifier = Modifier.weight(1f, fill = false)
+        ) {
+            Spacer(modifier = Modifier.heightIn(min = 48.dp, max = 128.dp).fillMaxWidth().weight(0.15f))
 
             Text(
                 text = "欢迎来到 \nSlax Reader",
@@ -134,9 +131,15 @@ fun LoginScreen(navController: NavHostController) {
             }
         }
 
+        Spacer(modifier = Modifier.height(16.dp))
+
         // 底部登录按钮区域
         Column(modifier = Modifier.padding(bottom = 30.dp)) {
             GoogleButtonUiContainer(onGoogleSignInResult = { googleUser ->
+                if (googleUser == null) {
+                    return@GoogleButtonUiContainer
+                }
+
                 scope.launch {
                     viewModel.googleSignIn(
                         googleUser,
@@ -176,6 +179,13 @@ fun LoginScreen(navController: NavHostController) {
                             pendingLoginAction = {
                                 scope.launch {
                                     val result = appleProvider.signIn()
+                                    if (result.isFailure) {
+                                        val error = result.exceptionOrNull()
+                                        if (!error?.message.orEmpty().contains("canceled", ignoreCase = true)) {
+                                            errorMessage = error?.message
+                                        }
+                                        return@launch
+                                    }
                                     viewModel.appleSignIn(
                                         result = result,
                                         onSuccess = successHandle,
@@ -188,6 +198,13 @@ fun LoginScreen(navController: NavHostController) {
                         } else {
                             scope.launch {
                                 val result = appleProvider.signIn()
+                                if (result.isFailure) {
+                                    val error = result.exceptionOrNull()
+                                    if (!error?.message.orEmpty().contains("canceled", ignoreCase = true)) {
+                                        errorMessage = error?.message
+                                    }
+                                    return@launch
+                                }
                                 viewModel.appleSignIn(
                                     result = result,
                                     onSuccess = successHandle,

composeApp/src/commonMain/kotlin/com/slax/reader/ui/login/ViewModel.kt

@@ -64,7 +64,11 @@ class LoginViewModel(
         onSuccess: () -> Unit,
         onError: (err: String) -> Unit
     ) {
-        if (result == null || result.idToken == "") {
+        if (result == null) {
+            return
+        }
+
+        if (result.idToken == "") {
             onError("Failed to get Google ID token")
             return
         }

composeApp/src/iosMain/kotlin/com/slax/reader/domain/auth/AppleSignIn.ios.kt

@@ -13,7 +13,12 @@ actual class AppleSignInProvider {
     actual suspend fun signIn(): Result<AppleSignInResult> =
         suspendCancellableCoroutine { continuation ->
             val provider = ASAuthorizationAppleIDProvider()
-            val request = provider.createRequest()
+            val request = provider.createRequest().apply {
+                requestedScopes = listOf(
+                    ASAuthorizationScopeFullName,
+                    ASAuthorizationScopeEmail
+                )
+            }
 
             val controller = ASAuthorizationController(
                 authorizationRequests = listOf(request)
@@ -52,8 +57,17 @@ actual class AppleSignInProvider {
                     controller: ASAuthorizationController,
                     didCompleteWithError: NSError
                 ) {
+                    if (didCompleteWithError.code < 1002L) {
+                        return
+                    }
+                    val errorMessage = when (didCompleteWithError.code) {
+                        1002L -> "Authorization request not handled"
+                        1003L -> "Authorization request failed"
+                        1004L -> "Authorization request not interactive"
+                        else -> didCompleteWithError.localizedDescription
+                    }
                     continuation.resume(
-                        Result.failure(Exception(didCompleteWithError.localizedDescription))
+                        Result.failure(Exception(errorMessage))
                     )
                 }
             }

gradle.properties

@@ -5,7 +5,7 @@ kotlin.apple.deprecated.allowUsingEmbedAndSignWithCocoaPodsDependencies=true
 buildkonfig.flavor=dev
 appVersionName=1.0.1
 org.gradle.jvmargs=-Xmx4096M -Dfile.encoding\=UTF-8
-appVersionCode=677
+appVersionCode=679
 android.useAndroidX=true
 kotlin.native.binary.smallBinary=true
 ksp.useKSP2=true

iosApp/Versions.xcconfig

@@ -1,5 +1,5 @@
 BUNDLE_SHORT_VERSION_STRING = 1.0.1
-BUNDLE_VERSION = 677
+BUNDLE_VERSION = 679
 GID_CLIENT_ID = 561250096193-7hjcrkob9cv49gkvt9jn544dsih1oi4g.apps.googleusercontent.com
 GID_SERVER_CLIENT_ID = 561250096193-gr0t8bc9j9h9hd3rds97vpqd1tq0vq2s.apps.googleusercontent.com
 GID_REVERSED_CLIENT_ID = com.googleusercontent.apps.561250096193-7hjcrkob9cv49gkvt9jn544dsih1oi4g