From ac9486e634ce12b39048d4016bff651acd082a68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@nuxt.com>
Date: Sat, 17 Feb 2024 16:54:05 +0100
Subject: [PATCH] fix: improve GH error handling

---
 src/runtime/server/lib/oauth/github.ts | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/runtime/server/lib/oauth/github.ts b/src/runtime/server/lib/oauth/github.ts
index b9628403..1329e3fd 100644
--- a/src/runtime/server/lib/oauth/github.ts
+++ b/src/runtime/server/lib/oauth/github.ts
@@ -58,7 +58,17 @@ export function githubEventHandler({ config, onSuccess, onError }: OAuthConfig<O
       tokenURL: 'https://github.com/login/oauth/access_token',
       authorizationParams: {}
     }) as OAuthGitHubConfig
-    const { code } = getQuery(event)
+    const query = getQuery(event)
+
+    if (query.error) {
+      const error = createError({
+        statusCode: 401,
+        message: `GitHub login failed: ${query.error || 'Unknown error'}`,
+        data: query,
+      })
+      if (!onError) throw error
+      return onError(event, error)
+    }
 
     if (!config.clientId || !config.clientSecret) {
       const error = createError({
@@ -69,7 +79,7 @@ export function githubEventHandler({ config, onSuccess, onError }: OAuthConfig<O
       return onError(event, error)
     }
 
-    if (!code) {
+    if (!query.code) {
       config.scope = config.scope || []
       if (config.emailRequired && !config.scope.includes('user:email')) {
         config.scope.push('user:email')
@@ -94,7 +104,7 @@ export function githubEventHandler({ config, onSuccess, onError }: OAuthConfig<O
         body: {
           client_id: config.clientId,
           client_secret: config.clientSecret,
-          code
+          code: query.code
         }
       }
     )