From 16ae4bdc22a01f0cec6b90958332c694c692f692 Mon Sep 17 00:00:00 2001
From: lucaronin <luca.rossi.917@gmail.com>
Date: Tue, 24 Feb 2026 10:18:50 +0100
Subject: [PATCH] fix: surface actual error messages in GitHub OAuth login flow

The frontend was swallowing Tauri backend errors (which are strings,
not Error instances) and always showing generic "Failed to start login."
Now the actual error message is displayed. Also adds User-Agent header
to device flow requests, a clear error message for 404 responses, and
a test for the 404 case.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src-tauri/src/github.rs          | 28 +++++++++++++++++++++++++++-
 src/components/SettingsPanel.tsx |  4 ++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src-tauri/src/github.rs b/src-tauri/src/github.rs
index a4f9172e..fa1bc841 100644
--- a/src-tauri/src/github.rs
+++ b/src-tauri/src/github.rs
@@ -175,14 +175,22 @@ async fn github_device_flow_start_with_base(base_url: &str) -> Result<DeviceFlow
     let response = client
         .post(format!("{}/login/device/code", base_url))
         .header("Accept", "application/json")
+        .header("User-Agent", "Laputa-App")
         .form(&[("client_id", GITHUB_CLIENT_ID), ("scope", "repo")])
         .send()
         .await
         .map_err(|e| format!("Device flow request failed: {}", e))?;
 
     if !response.status().is_success() {
+        let status = response.status();
         let body = response.text().await.unwrap_or_default();
-        return Err(format!("Device flow start failed: {}", body));
+        if status.as_u16() == 404 {
+            return Err(
+                "GitHub device flow not available. The OAuth App may not have device flow enabled."
+                    .to_string(),
+            );
+        }
+        return Err(format!("Device flow start failed ({}): {}", status, body));
     }
 
     response
@@ -204,6 +212,7 @@ async fn github_device_flow_poll_with_base(
     let response = client
         .post(format!("{}/login/oauth/access_token", base_url))
         .header("Accept", "application/json")
+        .header("User-Agent", "Laputa-App")
         .form(&[
             ("client_id", GITHUB_CLIENT_ID),
             ("device_code", device_code),
@@ -794,6 +803,23 @@ mod tests {
         assert!(result.unwrap_err().contains("Device flow start failed"));
     }
 
+    #[tokio::test]
+    async fn test_github_device_flow_start_404_gives_clear_message() {
+        let mut server = mockito::Server::new_async().await;
+        let mock = server
+            .mock("POST", "/login/device/code")
+            .with_status(404)
+            .with_body(r#"{"error":"Not Found"}"#)
+            .create_async()
+            .await;
+
+        let result = github_device_flow_start_with_base(&server.url()).await;
+        mock.assert_async().await;
+        assert!(result.is_err());
+        let err = result.unwrap_err();
+        assert!(err.contains("device flow not available"));
+    }
+
     #[tokio::test]
     async fn test_github_device_flow_poll_complete() {
         let mut server = mockito::Server::new_async().await;
diff --git a/src/components/SettingsPanel.tsx b/src/components/SettingsPanel.tsx
index fe448585..70409701 100644
--- a/src/components/SettingsPanel.tsx
+++ b/src/components/SettingsPanel.tsx
@@ -172,11 +172,11 @@ function GitHubSection({ githubUsername, githubToken, onConnected, onDisconnect
       pollLoop().catch(err => {
         stopPolling()
         setOauthStatus('error')
-        setErrorMessage(err instanceof Error ? err.message : 'Polling failed.')
+        setErrorMessage(typeof err === 'string' ? err : err instanceof Error ? err.message : 'Polling failed.')
       })
     } catch (err) {
       setOauthStatus('error')
-      setErrorMessage(err instanceof Error ? err.message : 'Failed to start login.')
+      setErrorMessage(typeof err === 'string' ? err : err instanceof Error ? err.message : 'Failed to start login.')
     }
   }, [onConnected, stopPolling])