Update workEmailDomainRegex

GCTC-NTGC · Dec 5, 2024 · 7b13e9d · 7b13e9d
1 parent db738c3
commit 7b13e9d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/api/app/GraphQL/Validators/UpdateUserAsUserInputValidator.php b/api/app/GraphQL/Validators/UpdateUserAsUserInputValidator.php
@@ -45,8 +45,8 @@ public function rules(): array
                  */
                 Rule::unique('users', 'email')->ignore($this->arg('id'), 'id'),
                 Rule::unique('users', 'work_email')->ignore($this->arg('id'), 'id'),
-                // Note: Domains should be kept in sync with the workEmailDomainRegex
-                'ends_with:gc.ca,canada.ca,elections.ca,ccc.ca,canadapost-postescanada.ca,gg.ca',
+                // Note: Should be kept in sync with the workEmailDomainRegex
+                'regex:/((?<=@)[A-Za-z0-9-.]+(?<=\.gc\.ca)|@gc\.ca|canada\.ca|elections\.ca|ccc\.ca|canadapost-postescanada\.ca|gg\.ca)$/i',
             ],
             'sub' => [
                 'sometimes',

diff --git a/packages/helpers/src/constants/regularExpressions.ts b/packages/helpers/src/constants/regularExpressions.ts
@@ -8,7 +8,7 @@
 export const keyStringRegex = /^[a-z]+[_a-z0-9]*$/;
 // See: https://regex101.com/r/EAZ8ha/6
 export const phoneNumberRegex = /^\+[1-9]\d{1,14}$/;
-// See: https://regex101.com/r/T8IYJU/3
+// See: https://regex101.com/r/T8IYJU/4
 // Note: This should be kept in sync with the check in the UpdateUserInputValidator
 export const workEmailDomainRegex =
-  /(gc\.ca|canada\.ca|elections\.ca|ccc\.ca|canadapost-postescanada\.ca|gg\.ca)$/i;
+  /((?<=@)[A-Za-z0-9-.]+(?<=\.gc\.ca)|@gc\.ca|canada\.ca|elections\.ca|ccc\.ca|canadapost-postescanada\.ca|gg\.ca)$/i;