From fa8e0d294fb2bb67b40fd446b3b49945a558ad5c Mon Sep 17 00:00:00 2001
From: msukkari <michael.sukkarieh@mail.mcgill.ca>
Date: Sat, 18 Oct 2025 14:00:52 -0700
Subject: [PATCH] properly handle emails for github app auth case

---
 .../[domain]/components/settingsDropdown.tsx    | 17 +++++++++++------
 packages/web/src/ee/features/sso/sso.ts         | 13 +++----------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/packages/web/src/app/[domain]/components/settingsDropdown.tsx b/packages/web/src/app/[domain]/components/settingsDropdown.tsx
index 377d0ef7..92a5705a 100644
--- a/packages/web/src/app/[domain]/components/settingsDropdown.tsx
+++ b/packages/web/src/app/[domain]/components/settingsDropdown.tsx
@@ -73,19 +73,24 @@ export const SettingsDropdown = ({
                     <Settings className="h-4 w-4" />
                 </Button>
             </DropdownMenuTrigger>
-            <DropdownMenuContent className="w-64">
+            <DropdownMenuContent className="w-64" align="end" sideOffset={5}>
                 {session?.user ? (
                     <DropdownMenuGroup>
-                        <div className="flex flex-row items-start gap-3 p-2">
-                            <Avatar className="flex-shrink-0">
+                        <div className="flex flex-row items-center gap-3 px-3 py-3">
+                            <Avatar className="h-10 w-10 flex-shrink-0">
                                 <AvatarImage
                                     src={session.user.image ?? ""}
                                 />
-                                <AvatarFallback>
-                                    {session.user.name && session.user.name.length > 0 ? session.user.name[0] : 'U'}
+                                <AvatarFallback className="bg-primary/10 text-primary font-semibold">
+                                    {session.user.name && session.user.name.length > 0 ? session.user.name[0].toUpperCase() : 'U'}
                                 </AvatarFallback>
                             </Avatar>
-                            <p className="text-sm font-medium break-all flex-1 leading-relaxed">{session.user.email ?? "User"}</p>
+                            <div className="flex flex-col flex-1 min-w-0">
+                                <p className="text-sm font-semibold truncate">{session.user.name ?? "User"}</p>
+                                {session.user.email && (
+                                    <p className="text-xs text-muted-foreground truncate">{session.user.email}</p>
+                                )}
+                            </div>
                         </div>
                         <DropdownMenuItem
                             onClick={() => {
diff --git a/packages/web/src/ee/features/sso/sso.ts b/packages/web/src/ee/features/sso/sso.ts
index 0f14a364..d32e6f3c 100644
--- a/packages/web/src/ee/features/sso/sso.ts
+++ b/packages/web/src/ee/features/sso/sso.ts
@@ -20,13 +20,13 @@ export const getSSOProviders = (): Provider[] => {
     const providers: Provider[] = [];
 
     if (env.AUTH_EE_GITHUB_CLIENT_ID && env.AUTH_EE_GITHUB_CLIENT_SECRET) {
-        const baseUrl = env.AUTH_EE_GITHUB_BASE_URL ?? "https://github.com";
-        const apiUrl = env.AUTH_EE_GITHUB_BASE_URL ? `${env.AUTH_EE_GITHUB_BASE_URL}/api/v3` : "https://api.github.com";
         providers.push(GitHub({
             clientId: env.AUTH_EE_GITHUB_CLIENT_ID,
             clientSecret: env.AUTH_EE_GITHUB_CLIENT_SECRET,
+            enterprise: {
+                baseUrl: env.AUTH_EE_GITHUB_BASE_URL,
+            },
             authorization: {
-                url: `${baseUrl}/login/oauth/authorize`,
                 params: {
                     scope: [
                         'read:user',
@@ -41,14 +41,7 @@ export const getSSOProviders = (): Provider[] => {
                     ].join(' '),
                 },
             },
-            token: {
-                url: `${baseUrl}/login/oauth/access_token`,
-            },
-            userinfo: {
-                url: `${apiUrl}/user`,
-            },
         }));
-    }
 
     if (env.AUTH_EE_GITLAB_CLIENT_ID && env.AUTH_EE_GITLAB_CLIENT_SECRET) {
         providers.push(Gitlab({