feat: migrate to validator from email-validator (#2059)

* refactor(adds package): this adds the validator package and removes email-validator from dependencys

* refactor(auth.ts and email.ts): migrates from EmailValidator to validator

Author: ofgrenudo

package.json

@@ -60,7 +60,6 @@
     "dayjs": "1.11.7",
     "dns-caching": "^0.2.7",
     "email-templates": "12.0.1",
-    "email-validator": "2.0.4",
     "express": "4.21.2",
     "express-openapi-validator": "4.13.8",
     "express-rate-limit": "6.7.0",
@@ -107,6 +106,7 @@
     "typeorm": "0.3.12",
     "ua-parser-js": "^1.0.35",
     "undici": "^7.3.0",
+    "validator": "^13.15.15",
     "web-push": "3.5.0",
     "wink-jaro-distance": "^2.0.0",
     "winston": "3.8.2",
@@ -140,6 +140,7 @@
     "@types/secure-random-password": "0.2.1",
     "@types/semver": "7.3.13",
     "@types/swagger-ui-express": "4.1.3",
+    "@types/validator": "^13.15.3",
     "@types/web-push": "3.3.2",
     "@types/xml2js": "0.4.11",
     "@types/yamljs": "0.2.31",

pnpm-lock.yaml

@@ -7,8 +7,8 @@ import type { NotificationAgentEmail } from '@server/lib/settings';
 import { getSettings, NotificationAgentKey } from '@server/lib/settings';
 import logger from '@server/logger';
 import type { EmailOptions } from 'email-templates';
-import * as EmailValidator from 'email-validator';
 import path from 'path';
+import validator from 'validator';
 import { Notification, shouldSendAdminNotification } from '..';
 import type { NotificationAgent, NotificationPayload } from './agent';
 import { BaseAgent } from './agent';
@@ -221,7 +221,7 @@ class EmailAgent
             this.getSettings(),
             payload.notifyUser.settings?.pgpKey
           );
-          if (EmailValidator.validate(payload.notifyUser.email)) {
+          if (validator.isEmail(payload.notifyUser.email)) {
             await email.send(
               this.buildMessage(
                 type,
@@ -283,7 +283,7 @@ class EmailAgent
                 this.getSettings(),
                 user.settings?.pgpKey
               );
-              if (EmailValidator.validate(user.email)) {
+              if (validator.isEmail(user.email)) {
                 await email.send(
                   this.buildMessage(type, payload, user.email, user.displayName)
                 );

server/lib/notifications/agents/email.ts

@@ -15,9 +15,9 @@ import { ApiError } from '@server/types/error';
 import { getAppVersion } from '@server/utils/appVersion';
 import { getHostname } from '@server/utils/getHostname';
 import axios from 'axios';
-import * as EmailValidator from 'email-validator';
 import { Router } from 'express';
 import net from 'net';
+import validator from 'validator';
 
 const authRoutes = Router();
 
@@ -37,7 +37,7 @@ authRoutes.get('/me', isAuthenticated(), async (req, res) => {
   const settings = await getSettings();
   if (
     settings.notifications.agents.email.options.userEmailRequired &&
-    !EmailValidator.validate(user.email)
+    !validator.isEmail(user.email)
   ) {
     user.warnings.push('userEmailRequired');
     logger.warn(`User ${user.username} has no valid email address`);