diff --git a/services/apps/alcs/src/common/authorization/authorization.service.ts b/services/apps/alcs/src/common/authorization/authorization.service.ts
index 1f435a5d7..68ca35024 100644
--- 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
index 9277972bc..12c509fe2 100644
--- 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.
CSS`;
- 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
index cbabe36aa..7d0fd7903 100644
--- 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.
+ const body = `A new user ${userText} has requested access to ALCS.
CSS`;
await this.emailService.sendEmail({