Merge pull request #2198 from bcgov/feature/ALCS-2522-fix

ALCS-2522: Send user request email even if no email provided
bcgov · Mar 6, 2025 · 7084bd7 · 7084bd7
2 parents dea7191 + 55b33cc
commit 7084bd7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/services/apps/alcs/src/common/authorization/authorization.service.ts b/services/apps/alcs/src/common/authorization/authorization.service.ts
@@ -195,8 +195,8 @@ export class AuthorizationService {
         this.mapUserFromTokenToCreateDto(payload),
       );
 
-      if (user.clientRoles.length === 0 && !isPortal && user.email !== undefined) {
-        await this.userService.sendNewUserRequestEmail(user.email, user.bceidGuid ?? user.displayName);
+      if (user.clientRoles.length === 0 && !isPortal) {
+        await this.userService.sendNewUserRequestEmail(user.bceidGuid ?? user.displayName, user.email);
       }
     }
   }

diff --git a/services/apps/alcs/src/user/user.service.spec.ts b/services/apps/alcs/src/user/user.service.spec.ts
@@ -151,7 +151,7 @@ describe('UserService', () => {
     const body = `A new user ${email}: ${userIdentifier} has requested access to ALCS.<br/> 
 <a href="https://bcgov.github.io/sso-requests/my-dashboard/integrations">CSS</a>`;
 
-    await service.sendNewUserRequestEmail(email, userIdentifier);
+    await service.sendNewUserRequestEmail(userIdentifier, email);
 
     expect(emailServiceMock.sendEmail).toBeCalledWith({
       to: config.get('EMAIL.DEFAULT_ADMINS'),

diff --git a/services/apps/alcs/src/user/user.service.ts b/services/apps/alcs/src/user/user.service.ts
@@ -124,11 +124,12 @@ export class UserService {
     return null;
   }
 
-  async sendNewUserRequestEmail(email: string, userIdentifier: string) {
+  async sendNewUserRequestEmail(userIdentifier: string, email?: string) {
+    const userText = email ? `${email}: ${userIdentifier}` : `${userIdentifier}`;
     const env = this.config.get('ENV');
     const prefix = env === 'production' ? '' : `[${env}]`;
     const subject = `${prefix} Access Requested to ALCS`;
-    const body = `A new user ${email}: ${userIdentifier} has requested access to ALCS.<br/> 
+    const body = `A new user ${userText} has requested access to ALCS.<br/> 
 <a href="https://bcgov.github.io/sso-requests/my-dashboard/integrations">CSS</a>`;
 
     await this.emailService.sendEmail({