We don't need the primary email on the User currently, better to keep it simple with the sign in email

Author: Lan2u

src/authentication/get-user-from-session.ts

@@ -26,7 +26,6 @@ export const getUserFromSession =
       ),
       E.map(session => ({
         emailAddress: session.passport.user.emailAddress,
-        primaryEmailAddress: session.passport.user.primaryEmailAddress,
         memberNumber: session.passport.user.memberNumber,
       })),
       O.fromEither

src/authentication/send-log-in-link.ts

@@ -73,7 +73,6 @@ export const sendLogInLink = (
   const email = toEmail(matchedEmail)(
     magicLink.create(conf)({
       emailAddress: matchedEmail,
-      primaryEmailAddress: members[0].primaryEmailAddress,
       memberNumber: members[0].memberNumber,
     })
   );

src/templates/logged-in-user-square.ts

@@ -3,10 +3,12 @@ import {html} from '../types/html';
 import {gravatarHashFromEmail} from '../read-models/members/avatar';
 import {getGravatarThumbnail} from './avatar';
 
+// TODO consider allowing users to specify what email is used for gravatar.
+// For now we just use the email provided.
 export const loggedInUserSquare = (member: User) => html`
   <a href="/me">
     ${getGravatarThumbnail(
-      gravatarHashFromEmail(member.primaryEmailAddress),
+      gravatarHashFromEmail(member.emailAddress),
       member.memberNumber
     )}
   </a>

src/types/user.ts

@@ -3,7 +3,6 @@ import {EmailAddressCodec} from '.';
 
 export const User = t.strict({
   emailAddress: EmailAddressCodec,
-  primaryEmailAddress: EmailAddressCodec,
   memberNumber: t.number,
 });
 

tests/helpers.ts

@@ -41,9 +41,6 @@ export const userActor = (): UserActor => ({
   tag: 'user',
   user: {
     emailAddress: getRightOrFail(EmailAddressCodec.decode('test@test.com')),
-    primaryEmailAddress: getRightOrFail(
-      EmailAddressCodec.decode('test@test.com')
-    ),
     memberNumber: 12,
   },
 });

tests/queries/equipment/render.test.ts

@@ -87,7 +87,6 @@ describe('Render equipment page', () => {
     describe('regular member view', () => {
         const regularMember: User = {
             emailAddress: faker.internet.email() as EmailAddress,
-            primaryEmailAddress: faker.internet.email() as EmailAddress,
             memberNumber: faker.number.int({min: 1}),
         };
         const memberDetails: Pick<ViewModel, 'isSuperUser' | 'isSuperUserOrOwnerOfArea' | 'user' | 'isSuperUserOrTrainerOfArea'> = {
@@ -116,7 +115,6 @@ describe('Render equipment page', () => {
     describe('super user view', () => {
         const superUser: User = {
             emailAddress: faker.internet.email() as EmailAddress,
-            primaryEmailAddress: faker.internet.email() as EmailAddress,
             memberNumber: faker.number.int({min: 1}),
         };
         const memberDetails: Pick<ViewModel, 'isSuperUser' | 'isSuperUserOrOwnerOfArea' | 'user' | 'isSuperUserOrTrainerOfArea'> = {

tests/queries/training-matrix/construct-training-matrix.test.ts

@@ -284,7 +284,6 @@ describe('construct-training-matrix', () => {
             tag: "user",
             user: {
               emailAddress: existingTrainerMetalMill.email,
-              primaryEmailAddress: existingTrainerMetalMill.email,
               memberNumber: existingTrainerMetalMill.memberNumber,
             }
           },
@@ -368,7 +367,6 @@ describe('construct-training-matrix', () => {
             tag: "user",
             user: {
               emailAddress: existingTrainerMetalMill.email,
-              primaryEmailAddress: existingTrainerMetalMill.email,
               memberNumber: existingTrainerMetalMill.memberNumber,
             }
           },

tests/read-models/members/get-all.test.ts

@@ -9,7 +9,6 @@ describe('liftActorOrUser', () => {
       tag: 'user',
       user: {
         emailAddress: 'admin@example.com' as EmailAddress,
-        primaryEmailAddress: 'admin@example.com' as EmailAddress,
         memberNumber: 1337,
       },
     };
@@ -21,7 +20,6 @@ describe('liftActorOrUser', () => {
   it('lifts users', () => {
     const user = {
       emailAddress: 'admin@example.com' as EmailAddress,
-      primaryEmailAddress: 'admin@example.com' as EmailAddress,
       memberNumber: 1337,
     };
     expect(liftActorOrUser(user)).toEqual({

tests/read-models/shared-state/get-equipment.test.ts

@@ -139,7 +139,6 @@ describe('get', () => {
         tag: 'user',
         user: {
           emailAddress: faker.internet.email() as EmailAddress,
-          primaryEmailAddress: faker.internet.email() as EmailAddress,
           memberNumber: faker.number.int(),
         },
       };
@@ -221,7 +220,6 @@ describe('get', () => {
         tag: 'user',
         user: {
           emailAddress: faker.internet.email() as EmailAddress,
-          primaryEmailAddress: faker.internet.email() as EmailAddress,
           memberNumber: faker.number.int(),
         },
       };
@@ -299,7 +297,6 @@ describe('get', () => {
           user: {
             // An 'admin'
             emailAddress: faker.internet.email() as EmailAddress,
-            primaryEmailAddress: faker.internet.email() as EmailAddress,
             memberNumber: faker.number.int(),
           },
         };

tests/read-models/shared-state/get-member.test.ts

@@ -788,7 +788,6 @@ describe('get-via-shared-read-model', () => {
             it('Searching for the member by either number (as actor) shows the same base data', () => {
               const asSelf = framework.sharedReadModel.members.getAsActor({
                 emailAddress: memberEmail,
-                primaryEmailAddress: memberEmail,
                 memberNumber: memberNumber,
               });
               const old = asSelf(memberNumber);