Merge pull request #345 from OpenHub-Store/auth-impr

rainxchzed · web-flow · commit 2b3da4763567 · 2026-03-21T12:26:54.000+05:00
diff --git a/core/presentation/src/commonMain/composeResources/values-ar/strings-ar.xml b/core/presentation/src/commonMain/composeResources/values-ar/strings-ar.xml
@@ -432,6 +432,8 @@
     <string name="auth_hint_try_again">يرجى محاولة تسجيل الدخول مرة أخرى للحصول على رمز جديد.</string>
     <string name="auth_hint_check_connection">يرجى التحقق من اتصالك بالإنترنت والمحاولة مرة أخرى.</string>
     <string name="auth_hint_denied">لقد رفضت طلب التفويض. حاول مرة أخرى إذا كان ذلك غير مقصود.</string>
+    <string name="auth_check_status">لقد قمت بالتفويض بالفعل</string>
+    <string name="auth_polling_status">جارٍ التحقق…</string>
 
     <!-- Read More / Show Less -->
     <string name="read_more">اقرأ المزيد</string>
diff --git a/core/presentation/src/commonMain/composeResources/values-bn/strings-bn.xml b/core/presentation/src/commonMain/composeResources/values-bn/strings-bn.xml
@@ -432,6 +432,8 @@
     <string name="auth_hint_try_again">একটি নতুন কোড পেতে অনুগ্রহ করে আবার সাইন ইন করার চেষ্টা করুন।</string>
     <string name="auth_hint_check_connection">অনুগ্রহ করে আপনার ইন্টারনেট সংযোগ পরীক্ষা করুন এবং আবার চেষ্টা করুন।</string>
     <string name="auth_hint_denied">আপনি অনুমোদনের অনুরোধ প্রত্যাখ্যান করেছেন। এটি অনিচ্ছাকৃত হলে আবার চেষ্টা করুন।</string>
+    <string name="auth_check_status">আমি ইতিমধ্যেই অনুমোদন করেছি</string>
+    <string name="auth_polling_status">যাচাই করা হচ্ছে…</string>
 
     <!-- Read More / Show Less -->
     <string name="read_more">আরও পড়ুন</string>
diff --git a/core/presentation/src/commonMain/composeResources/values-es/strings-es.xml b/core/presentation/src/commonMain/composeResources/values-es/strings-es.xml
@@ -397,6 +397,8 @@
     <string name="auth_hint_try_again">Intenta iniciar sesión de nuevo para obtener un nuevo código.</string>
     <string name="auth_hint_check_connection">Revisa tu conexión a internet e intenta de nuevo.</string>
     <string name="auth_hint_denied">Rechazaste la solicitud de autorización. Intenta de nuevo si fue involuntario.</string>
+    <string name="auth_check_status">Ya he autorizado</string>
+    <string name="auth_polling_status">Comprobando…</string>
 
     <!-- Read More / Show Less -->
     <string name="read_more">Leer más</string>
diff --git a/core/presentation/src/commonMain/composeResources/values-fr/strings-fr.xml b/core/presentation/src/commonMain/composeResources/values-fr/strings-fr.xml
@@ -397,6 +397,8 @@
     <string name="auth_hint_try_again">Veuillez réessayer de vous connecter pour obtenir un nouveau code.</string>
     <string name="auth_hint_check_connection">Vérifiez votre connexion internet et réessayez.</string>
     <string name="auth_hint_denied">Vous avez refusé la demande d\'autorisation. Réessayez si c\'était involontaire.</string>
+    <string name="auth_check_status">J’ai déjà autorisé</string>
+    <string name="auth_polling_status">Vérification…</string>
 
     <!-- Read More / Show Less -->
     <string name="read_more">Lire la suite</string>
diff --git a/core/presentation/src/commonMain/composeResources/values-hi/strings-hi.xml b/core/presentation/src/commonMain/composeResources/values-hi/strings-hi.xml
@@ -432,6 +432,8 @@
     <string name="auth_hint_try_again">नया कोड प्राप्त करने के लिए कृपया फिर से साइन इन करें।</string>
     <string name="auth_hint_check_connection">कृपया अपना इंटरनेट कनेक्शन जाँचें और पुनः प्रयास करें।</string>
     <string name="auth_hint_denied">आपने प्राधिकरण अनुरोध अस्वीकार कर दिया। यदि यह अनजाने में हुआ तो पुनः प्रयास करें।</string>
+    <string name="auth_check_status">मैं पहले ही अनुमति दे चुका हूँ</string>
+    <string name="auth_polling_status">जाँच की जा रही है…</string>
 
     <!-- Read More / Show Less -->
     <string name="read_more">और पढ़ें</string>
diff --git a/core/presentation/src/commonMain/composeResources/values-it/strings-it.xml b/core/presentation/src/commonMain/composeResources/values-it/strings-it.xml
@@ -433,6 +433,8 @@
     <string name="auth_hint_try_again">Riprova ad accedere per ottenere un nuovo codice.</string>
     <string name="auth_hint_check_connection">Controlla la tua connessione internet e riprova.</string>
     <string name="auth_hint_denied">Hai rifiutato la richiesta di autorizzazione. Riprova se è stato involontario.</string>
+    <string name="auth_check_status">Ho già autorizzato</string>
+    <string name="auth_polling_status">Verifica in corso…</string>
 
     <!-- Read More / Show Less -->
     <string name="read_more">Leggi di più</string>
diff --git a/core/presentation/src/commonMain/composeResources/values-ja/strings-ja.xml b/core/presentation/src/commonMain/composeResources/values-ja/strings-ja.xml
@@ -397,6 +397,9 @@
     <string name="auth_hint_try_again">新しいコードを取得するために再度サインインしてください。</string>
     <string name="auth_hint_check_connection">インターネット接続を確認して再試行してください。</string>
     <string name="auth_hint_denied">認証リクエストを拒否しました。意図しない場合は再試行してください。</string>
+    <string name="auth_check_status">すでに認証しました</string>
+    <string name="auth_polling_status">確認中…</string>
+
     <!-- Read More / Show Less -->
     <string name="read_more">もっと読む</string>
     <string name="show_less">折りたたむ</string>
diff --git a/core/presentation/src/commonMain/composeResources/values-ko/strings-ko.xml b/core/presentation/src/commonMain/composeResources/values-ko/strings-ko.xml
@@ -430,6 +430,9 @@
     <string name="auth_hint_try_again">새 코드를 받으려면 다시 로그인해 주세요.</string>
     <string name="auth_hint_check_connection">인터넷 연결을 확인하고 다시 시도하세요.</string>
     <string name="auth_hint_denied">인증 요청을 거부했습니다. 의도하지 않은 경우 다시 시도하세요.</string>
+    <string name="auth_check_status">이미 인증했습니다</string>
+    <string name="auth_polling_status">확인 중…</string>
+
     <!-- Read More / Show Less -->
     <string name="read_more">더 보기</string>
     <string name="show_less">간략히</string>
diff --git a/core/presentation/src/commonMain/composeResources/values-pl/strings-pl.xml b/core/presentation/src/commonMain/composeResources/values-pl/strings-pl.xml
@@ -395,6 +395,8 @@
     <string name="auth_hint_try_again">Spróbuj zalogować się ponownie, aby uzyskać nowy kod.</string>
     <string name="auth_hint_check_connection">Sprawdź połączenie internetowe i spróbuj ponownie.</string>
     <string name="auth_hint_denied">Odrzuciłeś żądanie autoryzacji. Spróbuj ponownie, jeśli było to niezamierzone.</string>
+    <string name="auth_check_status">Już autoryzowałem</string>
+    <string name="auth_polling_status">Sprawdzanie…</string>
 
     <!-- Read More / Show Less -->
     <string name="read_more">Czytaj więcej</string>
diff --git a/core/presentation/src/commonMain/composeResources/values-ru/strings-ru.xml b/core/presentation/src/commonMain/composeResources/values-ru/strings-ru.xml
@@ -397,6 +397,8 @@
     <string name="auth_hint_try_again">Пожалуйста, попробуйте войти снова для получения нового кода.</string>
     <string name="auth_hint_check_connection">Проверьте подключение к интернету и попробуйте снова.</string>
     <string name="auth_hint_denied">Вы отклонили запрос авторизации. Попробуйте снова, если это было непреднамеренно.</string>
+    <string name="auth_check_status">Я уже авторизовался</string>
+    <string name="auth_polling_status">Проверка…</string>
 
     <!-- Read More / Show Less -->
     <string name="read_more">Читать далее</string>
diff --git a/core/presentation/src/commonMain/composeResources/values-tr/strings-tr.xml b/core/presentation/src/commonMain/composeResources/values-tr/strings-tr.xml
@@ -429,6 +429,8 @@
     <string name="auth_hint_try_again">Yeni bir kod almak için lütfen tekrar giriş yapmayı deneyin.</string>
     <string name="auth_hint_check_connection">Lütfen internet bağlantınızı kontrol edin ve tekrar deneyin.</string>
     <string name="auth_hint_denied">Yetkilendirme isteğini reddettiniz. İstemeden yaptıysanız tekrar deneyin.</string>
+    <string name="auth_check_status">Zaten yetkilendirdim</string>
+    <string name="auth_polling_status">Kontrol ediliyor…</string>
 
     <!-- Read More / Show Less -->
     <string name="read_more">Devamını oku</string>
diff --git a/core/presentation/src/commonMain/composeResources/values-zh-rCN/strings-zh-rCN.xml b/core/presentation/src/commonMain/composeResources/values-zh-rCN/strings-zh-rCN.xml
@@ -398,6 +398,9 @@
     <string name="auth_hint_try_again">请重新登录以获取新的验证码。</string>
     <string name="auth_hint_check_connection">请检查您的网络连接并重试。</string>
     <string name="auth_hint_denied">您拒绝了授权请求。如果是误操作，请重试。</string>
+    <string name="auth_check_status">我已经授权</string>
+    <string name="auth_polling_status">正在检查…</string>
+
     <!-- Read More / Show Less -->
     <string name="read_more">阅读更多</string>
     <string name="show_less">收起</string>
diff --git a/core/presentation/src/commonMain/composeResources/values/strings.xml b/core/presentation/src/commonMain/composeResources/values/strings.xml
@@ -444,6 +444,8 @@
     <string name="auth_hint_try_again">Please try signing in again to get a new code.</string>
     <string name="auth_hint_check_connection">Please check your internet connection and try again.</string>
     <string name="auth_hint_denied">You denied the authorization request. Try again if this was unintentional.</string>
+    <string name="auth_check_status">I already authorized</string>
+    <string name="auth_polling_status">Checking…</string>
 
     <!-- Read More / Show Less -->
     <string name="read_more">Read More</string>
diff --git a/feature/auth/data/src/commonMain/kotlin/zed/rainxch/auth/data/repository/AuthenticationRepositoryImpl.kt b/feature/auth/data/src/commonMain/kotlin/zed/rainxch/auth/data/repository/AuthenticationRepositoryImpl.kt
@@ -223,6 +223,61 @@ class AuthenticationRepositoryImpl(
         }
     }
 
+    override suspend fun pollDeviceTokenOnce(deviceCode: String): Result<GithubDeviceTokenSuccess?> =
+        withContext(Dispatchers.IO) {
+            val clientId = BuildKonfig.GITHUB_CLIENT_ID
+            try {
+                val res = GitHubAuthApi.pollDeviceToken(clientId, deviceCode)
+                val success = res.getOrNull()?.toDomain()
+
+                if (success != null) {
+                    logger.debug("✅ Single poll: Token received! Saving...")
+                    saveTokenWithVerification(success)
+                    Result.success(success)
+                } else {
+                    val error = res.exceptionOrNull()
+                    val errorMsg = (error?.message ?: "").lowercase()
+
+                    when {
+                        "authorization_pending" in errorMsg || "slow_down" in errorMsg -> {
+                            Result.success(null)
+                        }
+
+                        "access_denied" in errorMsg -> {
+                            Result.failure(
+                                Exception("Authentication was denied. Please try again if this was a mistake."),
+                            )
+                        }
+
+                        "expired_token" in errorMsg ||
+                            "expired_device_code" in errorMsg ||
+                            "token_expired" in errorMsg -> {
+                            Result.failure(
+                                Exception("Authorization code expired. Please try again."),
+                            )
+                        }
+
+                        "bad_verification_code" in errorMsg ||
+                            "incorrect_device_code" in errorMsg -> {
+                            Result.failure(
+                                Exception("Invalid verification code. Please restart authentication."),
+                            )
+                        }
+
+                        else -> {
+                            logger.debug("⚠️ Single poll unknown error: $errorMsg")
+                            Result.success(null)
+                        }
+                    }
+                }
+            } catch (e: CancellationException) {
+                throw e
+            } catch (e: Exception) {
+                logger.debug("⚠️ Single poll network error: ${e.message}")
+                Result.success(null)
+            }
+        }
+
     private fun isNetworkError(errorMsg: String): Boolean =
         errorMsg.contains("unable to resolve") ||
             errorMsg.contains("no address") ||
diff --git a/feature/auth/domain/src/commonMain/kotlin/zed/rainxch/auth/domain/repository/AuthenticationRepository.kt b/feature/auth/domain/src/commonMain/kotlin/zed/rainxch/auth/domain/repository/AuthenticationRepository.kt
@@ -10,4 +10,12 @@ interface AuthenticationRepository {
     suspend fun startDeviceFlow(): GithubDeviceStart
 
     suspend fun awaitDeviceToken(start: GithubDeviceStart): GithubDeviceTokenSuccess
+
+    /**
+     * Single poll attempt. Returns:
+     * - [Result.success] with non-null [GithubDeviceTokenSuccess] if user authorized
+     * - [Result.success] with null if authorization is still pending (keep polling)
+     * - [Result.failure] on terminal errors (denied, expired, invalid code)
+     */
+    suspend fun pollDeviceTokenOnce(deviceCode: String): Result<GithubDeviceTokenSuccess?>
 }
diff --git a/feature/auth/presentation/src/commonMain/kotlin/zed/rainxch/auth/presentation/AuthenticationAction.kt b/feature/auth/presentation/src/commonMain/kotlin/zed/rainxch/auth/presentation/AuthenticationAction.kt
@@ -22,4 +22,8 @@ sealed interface AuthenticationAction {
     ) : AuthenticationAction
 
     data object SkipLogin : AuthenticationAction
+
+    data object PollNow : AuthenticationAction
+
+    data object OnResumed : AuthenticationAction
 }
diff --git a/feature/auth/presentation/src/commonMain/kotlin/zed/rainxch/auth/presentation/AuthenticationRoot.kt b/feature/auth/presentation/src/commonMain/kotlin/zed/rainxch/auth/presentation/AuthenticationRoot.kt
diff --git a/feature/auth/presentation/src/commonMain/kotlin/zed/rainxch/auth/presentation/AuthenticationState.kt b/feature/auth/presentation/src/commonMain/kotlin/zed/rainxch/auth/presentation/AuthenticationState.kt
diff --git a/feature/auth/presentation/src/commonMain/kotlin/zed/rainxch/auth/presentation/AuthenticationViewModel.kt b/feature/auth/presentation/src/commonMain/kotlin/zed/rainxch/auth/presentation/AuthenticationViewModel.kt
