validateEmail() returns boolean

dev-xo · Jan 5, 2024 · a83360c · a83360c
1 parent 7e1ad22
commit a83360c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -123,7 +123,7 @@ export interface SendTOTP {
  * @param email The email address to validate.
  */
 export interface ValidateEmail {
-  (email: string): Promise<void>
+  (email: string): Promise<boolean>
 }
 
 /**
@@ -414,7 +414,9 @@ export class TOTPStrategy<User> extends Strategy<User, TOTPVerifyParams> {
     formData: FormData
     options: RequiredAuthenticateOptions
   }) {
-    await this.validateEmail(email)
+    if (!(await this.validateEmail(email))) {
+      throw new Error(this.customErrors.invalidEmail)
+    }
     const { otp: code, ...totpPayload } = generateTOTP({
       ...this.totpGeneration,
       secret: generateSecret(),
@@ -469,7 +471,7 @@ export class TOTPStrategy<User> extends Strategy<User, TOTPVerifyParams> {
 
   private async _validateEmailDefault(email: string) {
     const regexEmail = /^[^\s@]+@[^\s@]+\.[^\s@]+$/gm
-    if (!regexEmail.test(email)) throw new Error(this.customErrors.invalidEmail)
+    return regexEmail.test(email)
   }
 
   private async _validateTOTP({

diff --git a/test/index.spec.ts b/test/index.spec.ts
@@ -341,14 +341,15 @@ describe('[ TOTP ]', () => {
         })
     })
 
-    test('Should failure redirect when custom validateEmail throws Error.', async () => {
+    test('Should failure redirect when custom validateEmail returns false.', async () => {
       const ERROR_MESSAGE = 'TEST: Invalid email.'
       const strategy = new TOTPStrategy(
         {
           ...TOTP_STRATEGY_OPTIONS,
-          validateEmail: () => {
-            throw new Error(ERROR_MESSAGE)
+          customErrors: {
+            invalidEmail: ERROR_MESSAGE,
           },
+          validateEmail: async () => false,
         },
         verify,
       )