From 27d2cf65e64f7c07cde2c97eed2031909f8ea890 Mon Sep 17 00:00:00 2001 From: araddcc002 Date: Fri, 9 Feb 2024 11:54:09 +0000 Subject: [PATCH 1/4] updated email system to use better username display --- backend/src/services/v2/smtp/smtp.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/backend/src/services/v2/smtp/smtp.ts b/backend/src/services/v2/smtp/smtp.ts index 3c9bc11f2..09a4e3af0 100644 --- a/backend/src/services/v2/smtp/smtp.ts +++ b/backend/src/services/v2/smtp/smtp.ts @@ -41,7 +41,10 @@ export async function requestReviewForRelease(entity: string, review: ReviewDoc, { title: 'Model ID', data: release.modelId }, { title: 'Your Role', data: review.role.toUpperCase() }, { title: 'Semver', data: release.semver }, - { title: 'Created By', data: release.createdBy }, + { + title: 'Created By', + data: (await authentication.getUserInformation(toEntity('user', release.createdBy))).name || 'Unknown user', + }, ], [ { name: 'Open Release', url: 'TODO' }, @@ -68,7 +71,11 @@ export async function requestReviewForAccessRequest( { title: 'Model ID', data: accessRequest.modelId }, { title: 'Your Role', data: review.role.toUpperCase() }, { title: 'Entities Requesting Access', data: accessRequest.metadata.overview.entities.toString() }, - { title: 'Created By', data: accessRequest.createdBy }, + { + title: 'Created By', + data: + (await authentication.getUserInformation(toEntity('user', accessRequest.createdBy))).name || 'Unknown user', + }, ], [ { name: 'Open Access Request', url: 'TODO' }, From 460a070af33ecc0224a56e2436b2527eeab4cfd0 Mon Sep 17 00:00:00 2001 From: araddcc002 Date: Fri, 9 Feb 2024 11:58:46 +0000 Subject: [PATCH 2/4] changed the fallback email display name to be original createdBy value --- backend/src/services/v2/smtp/smtp.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/src/services/v2/smtp/smtp.ts b/backend/src/services/v2/smtp/smtp.ts index 09a4e3af0..04a400d55 100644 --- a/backend/src/services/v2/smtp/smtp.ts +++ b/backend/src/services/v2/smtp/smtp.ts @@ -43,7 +43,7 @@ export async function requestReviewForRelease(entity: string, review: ReviewDoc, { title: 'Semver', data: release.semver }, { title: 'Created By', - data: (await authentication.getUserInformation(toEntity('user', release.createdBy))).name || 'Unknown user', + data: (await authentication.getUserInformation(toEntity('user', release.createdBy))).name || release.createdBy, }, ], [ @@ -74,7 +74,8 @@ export async function requestReviewForAccessRequest( { title: 'Created By', data: - (await authentication.getUserInformation(toEntity('user', accessRequest.createdBy))).name || 'Unknown user', + (await authentication.getUserInformation(toEntity('user', accessRequest.createdBy))).name || + accessRequest.createdBy, }, ], [ From 962e8775f53d40d78f995936f60b252cdb6f3dda Mon Sep 17 00:00:00 2001 From: araddcc002 Date: Fri, 9 Feb 2024 12:11:51 +0000 Subject: [PATCH 3/4] updated more email names --- backend/src/services/v2/smtp/smtp.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/backend/src/services/v2/smtp/smtp.ts b/backend/src/services/v2/smtp/smtp.ts index 04a400d55..87443f061 100644 --- a/backend/src/services/v2/smtp/smtp.ts +++ b/backend/src/services/v2/smtp/smtp.ts @@ -98,8 +98,11 @@ export async function notifyReviewResponseForRelease(review: ReviewDoc, release: log.info('response not found') return } + const emailContent = buildEmail( - `Release ${release.semver} has been reviewed by ${reviewResponse?.user}`, + `Release ${release.semver} has been reviewed by ${ + (await authentication.getUserInformation(toEntity('user', reviewResponse?.user))).name || reviewResponse?.user + }`, [ { title: 'Model ID', data: release.modelId }, { title: 'Reviewer Role', data: review.role.toUpperCase() }, @@ -125,7 +128,9 @@ export async function notifyReviewResponseForAccess(review: ReviewDoc, accessReq return } const emailContent = buildEmail( - `Access request for model ${accessRequest.modelId} has been reviewed by ${reviewResponse.user}`, + `Access request for model ${accessRequest.modelId} has been reviewed by ${ + (await authentication.getUserInformation(toEntity('user', reviewResponse?.user))).name || reviewResponse?.user + }`, [ { title: 'Model ID', data: accessRequest.modelId }, { title: 'Reviewer Role', data: review.role.toUpperCase() }, From 8c3c01efd129327a5720ef4ea941d902f97406b1 Mon Sep 17 00:00:00 2001 From: araddcc002 Date: Fri, 9 Feb 2024 12:54:09 +0000 Subject: [PATCH 4/4] updated email test --- backend/test/services/smtp/smtp.spec.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/test/services/smtp/smtp.spec.ts b/backend/test/services/smtp/smtp.spec.ts index 93aaf769a..ff0faa3ce 100644 --- a/backend/test/services/smtp/smtp.spec.ts +++ b/backend/test/services/smtp/smtp.spec.ts @@ -62,6 +62,7 @@ vi.mock('nodemailer', async () => ({ const authenticationMock = vi.hoisted(() => ({ getUserInformationList: vi.fn(() => [Promise.resolve({ email: 'email@email.com' })]), + getUserInformation: vi.fn(() => [Promise.resolve({ name: 'Joe Blogs' })]), })) vi.mock('../../../src/connectors/v2/authentication/index.js', async () => ({ default: authenticationMock })) @@ -123,6 +124,7 @@ describe('services > smtp > smtp', () => { test('that an email is sent for Access Request Reviews', async () => { await requestReviewForAccessRequest('user:user', review, access) + authenticationMock.getUserInformation.mockReturnValueOnce([Promise.resolve({ name: 'Joe Blogs' })]) expect(transporterMock.sendMail.mock.calls.at(0)).toMatchSnapshot() })