client: remove deprecated authenticatedUser.email

sourcegraph · Jan 6, 2023 · 6b80bb1 · 6b80bb1
1 parent 7a6dc29
commit 6b80bb1
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 17 deletions.
diff --git a/client/shared/src/auth.ts b/client/shared/src/auth.ts
@@ -10,7 +10,6 @@ export const currentAuthStateQuery = gql`
             databaseID
             username
             avatarURL
-            email
             displayName
             siteAdmin
             tags
@@ -36,6 +35,7 @@ export const currentAuthStateQuery = gql`
             emails {
                 email
                 verified
+                isPrimary
             }
             latestSettings {
                 id

diff --git a/client/shared/src/util/url.ts b/client/shared/src/util/url.ts
@@ -594,16 +594,17 @@ export function buildGetStartedURL(cloudSignup?: boolean, authenticatedUser?: Au
  * @returns signup UR string with relevant params attached
  */
 export const buildCloudTrialURL = (
-    authenticatedUser: Pick<AuthenticatedUser, 'displayName' | 'email'> | null | undefined,
+    authenticatedUser: Pick<AuthenticatedUser, 'displayName' | 'emails'> | null | undefined,
     product?: string
 ): string => {
     const url = new URL('https://signup.sourcegraph.com/')
 
     if (product) {
         url.searchParams.append('p', product)
     }
-    if (authenticatedUser?.email) {
-        url.searchParams.append('email', authenticatedUser.email)
+    const primaryEmail = authenticatedUser?.emails.find(email => email.isPrimary)
+    if (primaryEmail) {
+        url.searchParams.append('email', primaryEmail.email)
     }
     if (authenticatedUser?.displayName) {
         url.searchParams.append('name', authenticatedUser.displayName)

diff --git a/client/web/src/communitySearchContexts/CommunitySearchContextPage.story.tsx b/client/web/src/communitySearchContexts/CommunitySearchContextPage.story.tsx
@@ -54,7 +54,6 @@ const PLATFORM_CONTEXT: CommunitySearchContextPageProps['platformContext'] = {
 const authUser: AuthenticatedUser = {
     __typename: 'User',
     id: '0',
-    email: 'alice@sourcegraph.com',
     username: 'alice',
     avatarURL: null,
     session: { canSignOut: true },
@@ -73,7 +72,13 @@ const authUser: AuthenticatedUser = {
     databaseID: 0,
     tosAccepted: true,
     searchable: true,
-    emails: [],
+    emails: [
+        {
+            email: 'alice@sourcegraph.com',
+            isPrimary: true,
+            verified: true,
+        },
+    ],
     latestSettings: null,
 }
 

diff --git a/client/web/src/enterprise/batches/preview/BatchChangePreviewPage.tsx b/client/web/src/enterprise/batches/preview/BatchChangePreviewPage.tsx
@@ -25,7 +25,7 @@ import { BatchSpecInfoByline } from './BatchSpecInfoByline'
 import { CreateUpdateBatchChangeAlert } from './CreateUpdateBatchChangeAlert'
 import { PreviewList } from './list/PreviewList'
 
-export type PreviewPageAuthenticatedUser = Pick<AuthenticatedUser, 'url' | 'displayName' | 'username' | 'email'>
+export type PreviewPageAuthenticatedUser = Pick<AuthenticatedUser, 'url' | 'displayName' | 'username' | 'emails'>
 
 export interface BatchChangePreviewPageProps extends BatchChangePreviewProps {
     /** Used for testing. */

diff --git a/client/web/src/enterprise/batches/preview/list/VisibleChangesetApplyPreviewNode.tsx b/client/web/src/enterprise/batches/preview/list/VisibleChangesetApplyPreviewNode.tsx
@@ -384,7 +384,8 @@ const ExpandedSection: React.FunctionComponent<
                                     node.targets.changeset.author
                                         ? node.targets.changeset.author
                                         : {
-                                              email: authenticatedUser.email,
+                                              email:
+                                                  authenticatedUser.emails.find(email => email.isPrimary)?.email || '',
                                               displayName: authenticatedUser.displayName || authenticatedUser.username,
                                               user: authenticatedUser,
                                           }

diff --git a/client/web/src/enterprise/code-monitoring/components/actions/EmailAction.tsx b/client/web/src/enterprise/code-monitoring/components/actions/EmailAction.tsx
@@ -94,6 +94,8 @@ export const EmailAction: React.FunctionComponent<React.PropsWithChildren<Action
     const testState = loading ? 'loading' : called && !error ? 'called' : error || undefined
 
     const emailConfigured = window.context.emailEnabled
+    const userPrimaryEmail = authenticatedUser.emails.find(email => email.isPrimary)
+
     const emailNotConfiguredMessage = !emailConfigured ? (
         !action ? (
             <>
@@ -116,7 +118,7 @@ export const EmailAction: React.FunctionComponent<React.PropsWithChildren<Action
             idName="email"
             disabled={disabledBasedOnEmailConfig}
             completed={!!action}
-            completedSubtitle={authenticatedUser.email}
+            completedSubtitle={userPrimaryEmail?.email || ''}
             actionEnabled={enabled}
             toggleActionEnabled={toggleEmailNotificationEnabled}
             includeResults={includeResults}
@@ -138,7 +140,7 @@ export const EmailAction: React.FunctionComponent<React.PropsWithChildren<Action
                     id="code-monitoring-form-actions-recipients"
                     className="mb-2"
                     label="Recipients"
-                    value={`${authenticatedUser.email || ''} (you)`}
+                    value={`${userPrimaryEmail?.email || ''} (you)`}
                     disabled={true}
                     autoFocus={true}
                     required={true}

diff --git a/client/web/src/enterprise/code-monitoring/testing/util.ts b/client/web/src/enterprise/code-monitoring/testing/util.ts
@@ -10,7 +10,6 @@ export const mockUser: AuthenticatedUser = {
     __typename: 'User',
     id: 'userID',
     username: 'username',
-    email: 'user@me.com',
     siteAdmin: true,
     databaseID: 0,
     tags: [],
@@ -26,7 +25,13 @@ export const mockUser: AuthenticatedUser = {
     session: { __typename: 'Session', canSignOut: true },
     tosAccepted: true,
     searchable: true,
-    emails: [],
+    emails: [
+        {
+            email: 'user@me.com',
+            isPrimary: true,
+            verified: true,
+        },
+    ],
     latestSettings: null,
 }
 
@@ -304,7 +309,13 @@ export const mockCodeMonitorNodes: ListCodeMonitors['nodes'] = [
 export const mockAuthenticatedUser: AuthenticatedUser = {
     id: 'userID',
     username: 'username',
-    email: 'user@me.com',
+    emails: [
+        {
+            email: 'user@me.com',
+            isPrimary: true,
+            verified: true,
+        },
+    ],
     siteAdmin: true,
 } as AuthenticatedUser
 

diff --git a/client/web/src/enterprise/searchContexts/SearchContextForm.story.tsx b/client/web/src/enterprise/searchContexts/SearchContextForm.story.tsx
@@ -68,7 +68,6 @@ const searchContextToEdit: SearchContextFields = {
 const authUser: AuthenticatedUser = {
     __typename: 'User',
     id: '0',
-    email: 'alice@sourcegraph.com',
     username: 'alice',
     avatarURL: null,
     session: { canSignOut: true },
@@ -87,7 +86,13 @@ const authUser: AuthenticatedUser = {
     databaseID: 0,
     tosAccepted: true,
     searchable: true,
-    emails: [],
+    emails: [
+        {
+            email: 'alice@sourcegraph.com',
+            isPrimary: true,
+            verified: true,
+        },
+    ],
     latestSettings: null,
 }
 

diff --git a/client/web/src/user/settings/research/ProductResearch.tsx b/client/web/src/user/settings/research/ProductResearch.tsx
@@ -10,7 +10,7 @@ import { PageTitle } from '../../../components/PageTitle'
 
 interface Props {
     telemetryService: TelemetryService
-    authenticatedUser: Pick<AuthenticatedUser, 'email'>
+    authenticatedUser: Pick<AuthenticatedUser, 'emails'>
 }
 
 const SIGN_UP_FORM_URL = 'https://info.sourcegraph.com/product-research'
@@ -24,7 +24,10 @@ export const ProductResearchPage: React.FunctionComponent<React.PropsWithChildre
     }, [telemetryService])
 
     const signUpForm = new URL(SIGN_UP_FORM_URL)
-    signUpForm.searchParams.set('email', authenticatedUser.email)
+    const primaryEmail = authenticatedUser.emails.find(email => email.isPrimary)
+    if (primaryEmail) {
+        signUpForm.searchParams.set('email', primaryEmail.email)
+    }
 
     return (
         <>