@eaccess/auth 0.1.19 → 0.1.20

package/dist/index.d.cts

@@ -55,6 +55,7 @@ interface AuthConfig {
         google?: GoogleProviderConfig;
         azure?: AzureProviderConfig;
     };
+    githubUserAgent?: string;
     twoFactor?: {
         enabled?: boolean;
         requireForOAuth?: boolean;
@@ -1167,7 +1168,7 @@ declare abstract class BaseOAuthProvider implements OAuthProvider {
     protected processOAuthLogin(userData: OAuthUserData, req: Request): Promise<OAuthCallbackResult>;
     protected abstract getProviderName(): string;
     protected exchangeCodeForToken(code: string, tokenUrl: string): Promise<string>;
-    protected fetchUserFromAPI(accessToken: string, apiUrl: string): Promise<any>;
+    protected fetchUserFromAPI(accessToken: string, apiUrl: string, headers?: Record<string, string>): Promise<any>;
 }
 
 declare class GitHubProvider extends BaseOAuthProvider {

package/dist/index.d.ts

@@ -55,6 +55,7 @@ interface AuthConfig {
         google?: GoogleProviderConfig;
         azure?: AzureProviderConfig;
     };
+    githubUserAgent?: string;
     twoFactor?: {
         enabled?: boolean;
         requireForOAuth?: boolean;
@@ -1167,7 +1168,7 @@ declare abstract class BaseOAuthProvider implements OAuthProvider {
     protected processOAuthLogin(userData: OAuthUserData, req: Request): Promise<OAuthCallbackResult>;
     protected abstract getProviderName(): string;
     protected exchangeCodeForToken(code: string, tokenUrl: string): Promise<string>;
-    protected fetchUserFromAPI(accessToken: string, apiUrl: string): Promise<any>;
+    protected fetchUserFromAPI(accessToken: string, apiUrl: string, headers?: Record<string, string>): Promise<any>;
 }
 
 declare class GitHubProvider extends BaseOAuthProvider {

package/dist/index.js

@@ -696,11 +696,12 @@ var BaseOAuthProvider = class {
     }
     return data.access_token;
   }
-  async fetchUserFromAPI(accessToken, apiUrl) {
+  async fetchUserFromAPI(accessToken, apiUrl, headers = {}) {
     const response = await fetch(apiUrl, {
       headers: {
         Authorization: `Bearer ${accessToken}`,
-        Accept: "application/json"
+        Accept: "application/json",
+        ...headers
       }
     });
     if (!response.ok) {
@@ -731,14 +732,24 @@ var GitHubProvider = class extends BaseOAuthProvider {
       throw new Error("No authorization code provided");
     }
     const accessToken = await this.exchangeCodeForToken(code, "https://github.com/login/oauth/access_token");
-    const [user, emails] = await Promise.all([this.fetchUserFromAPI(accessToken, "https://api.github.com/user"), this.fetchUserFromAPI(accessToken, "https://api.github.com/user/emails")]);
-    const primaryEmail = Array.isArray(emails) ? emails.find((email) => email.primary)?.email : null;
-    if (!primaryEmail) {
-      throw new Error("No primary email found in GitHub account");
+    const apiHeaders = {
+      Accept: "application/vnd.github+json",
+      "User-Agent": this.authConfig.githubUserAgent || "EasyAccess",
+      "X-GitHub-Api-Version": "2022-11-28"
+    };
+    const [user, emails] = await Promise.all([
+      this.fetchUserFromAPI(accessToken, "https://api.github.com/user", apiHeaders),
+      this.fetchUserFromAPI(accessToken, "https://api.github.com/user/emails", apiHeaders)
+    ]);
+    const verifiedEmails = Array.isArray(emails) ? emails.filter((email) => email.verified) : [];
+    const primaryEmail = verifiedEmails.find((email) => email.primary)?.email;
+    const fallbackEmail = primaryEmail || verifiedEmails[0]?.email;
+    if (!fallbackEmail) {
+      throw new Error("No verified email found in GitHub account");
     }
     return {
       id: user.id.toString(),
-      email: primaryEmail,
+      email: fallbackEmail,
       username: user.login,
       name: user.name || user.login,
       avatar: user.avatar_url