clients/oauth: show oauth usernames if exists

polarsource · Feb 5, 2024 · 7c682fc · 7c682fc
1 parent eb339d4
commit 7c682fc
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 6 deletions.
diff --git a/clients/apps/web/src/components/Settings/AuthenticationSettings.tsx b/clients/apps/web/src/components/Settings/AuthenticationSettings.tsx
@@ -11,8 +11,8 @@ import {
 
 interface AuthenticationMethodProps {
   icon: React.ReactNode
-  title: string
-  subtitle: string
+  title: React.ReactNode
+  subtitle: React.ReactNode
   action: React.ReactNode
 }
 
@@ -65,7 +65,21 @@ const GitHubAuthenticationMethod: React.FC<GitHubAuthenticationMethodProps> = ({
           />
         </svg>
       }
-      title={oauthAccount ? oauthAccount.account_email : 'Connect GitHub'}
+      title={
+        oauthAccount ? (
+          <>
+            {oauthAccount.account_username ? (
+              <>
+                {oauthAccount.account_username} ({oauthAccount.account_email})
+              </>
+            ) : (
+              oauthAccount.account_email
+            )}
+          </>
+        ) : (
+          'Connect GitHub'
+        )
+      }
       subtitle={
         oauthAccount
           ? 'You can sign in with your GitHub account.'

diff --git a/clients/apps/web/src/components/Settings/ConnectedAppSettings.tsx b/clients/apps/web/src/components/Settings/ConnectedAppSettings.tsx
@@ -11,8 +11,8 @@ import { useEffect } from 'react'
 
 interface ConnectedAppProps {
   icon: React.ReactNode
-  title: string
-  subtitle: string
+  title: React.ReactNode
+  subtitle: React.ReactNode
   action: React.ReactNode
 }
 
@@ -63,7 +63,21 @@ const DiscordConnectedApp: React.FC<DiscordConnectedAppProps> = ({
           </g>
         </svg>
       }
-      title={oauthAccount ? oauthAccount.account_email : 'Connect Discord'}
+      title={
+        oauthAccount ? (
+          <>
+            {oauthAccount.account_username ? (
+              <>
+                {oauthAccount.account_username} ({oauthAccount.account_email})
+              </>
+            ) : (
+              oauthAccount.account_email
+            )}
+          </>
+        ) : (
+          'Connect Discord'
+        )
+      }
       subtitle={
         oauthAccount
           ? 'Your Discord account is connected.'

diff --git a/clients/packages/sdk/src/client/models/index.ts b/clients/packages/sdk/src/client/models/index.ts
@@ -3269,6 +3269,12 @@ export interface OAuthAccountRead {
      * @memberof OAuthAccountRead
      */
     account_email: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OAuthAccountRead
+     */
+    account_username: string;
 }
 
 /**

diff --git a/server/polar/user/schemas.py b/server/polar/user/schemas.py
@@ -35,6 +35,7 @@ class OAuthAccountRead(TimestampedSchema):
     platform: OAuthPlatform
     account_id: str
     account_email: str
+    account_username: str | None
 
 
 class UserRead(UserBase, TimestampedSchema):