Merge pull request #201 from ahmedrowaihi/patch-1

🐛 FIX(github/email): fix github oauth scope & callback handler

Author: moinulmoin

src/app/api/auth/login/github/callback/route.ts

@@ -24,6 +24,26 @@ export const GET = async (request: NextRequest) => {
       },
     });
     const githubUser: GitHubUser = await githubUserResponse.json();
+    if (!githubUser.email) {
+      const githubEmailsResponse = await fetch(
+        "https://api.github.com/user/emails",
+        {
+          headers: {
+            Authorization: `Bearer ${tokens.accessToken}`,
+          },
+        }
+      );
+      const githubEmails: {
+        email: string;
+        primary: boolean;
+        verified: boolean;
+      }[] = await githubEmailsResponse.json();
+      const verifiedEmail = githubEmails.find(
+        (email) => email.primary && email.verified
+      );
+      if (verifiedEmail) githubUser.email = verifiedEmail.email;
+    }
+
     const existingUser = await db.user.findUnique({
       where: {
         githubId: githubUser.id,
@@ -52,9 +72,11 @@ export const GET = async (request: NextRequest) => {
         name: githubUser.name,
         email: githubUser.email,
         picture: githubUser.avatar_url,
+        emailVerified: Boolean(githubUser.email),
       },
     });
-    sendWelcomeEmail({ toMail: newUser.email!, userName: newUser.name! });
+    if (githubUser.email)
+      sendWelcomeEmail({ toMail: newUser.email!, userName: newUser.name! });
     const session = await lucia.createSession(newUser.id, {});
     const sessionCookie = lucia.createSessionCookie(session.id);
     cookies().set(

src/app/api/auth/login/github/route.ts

@@ -4,7 +4,9 @@ import { github } from "~/lib/lucia";
 
 export const GET = async () => {
   const state = generateState();
-  const url = await github.createAuthorizationURL(state);
+  const url = await github.createAuthorizationURL(state, {
+    scopes: ["user:email", "read:user"],
+  });
 
   cookies().set("github_oauth_state", state, {
     path: "/",