From 089adfb40f2721e3326d36534329c96ced42d4bc Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Tue, 6 Jul 2021 13:59:02 -0700
Subject: [PATCH] Moved REST validators library

---
 src/{ => controllers/rest-api}/middleware/validators.js | 8 ++++----
 src/controllers/rest-api/users/controller.js            | 9 ---------
 src/controllers/rest-api/users/router.js                | 2 +-
 3 files changed, 5 insertions(+), 14 deletions(-)
 rename src/{ => controllers/rest-api}/middleware/validators.js (95%)

diff --git a/src/middleware/validators.js b/src/controllers/rest-api/middleware/validators.js
similarity index 95%
rename from src/middleware/validators.js
rename to src/controllers/rest-api/middleware/validators.js
index 64d4566..071acb0 100644
--- a/src/middleware/validators.js
+++ b/src/controllers/rest-api/middleware/validators.js
@@ -2,11 +2,11 @@
   REST API validator middleware.
 */
 
-const User = require('../models/users')
-const config = require('../../config')
-const getToken = require('../lib/auth')
+const User = require('../../../models/users')
+const config = require('../../../../config')
+const getToken = require('../../../lib/auth')
 const jwt = require('jsonwebtoken')
-const wlogger = require('../lib/wlogger')
+const wlogger = require('../../../lib/wlogger')
 
 let _this
 
diff --git a/src/controllers/rest-api/users/controller.js b/src/controllers/rest-api/users/controller.js
index b9d9295..aaa51af 100644
--- a/src/controllers/rest-api/users/controller.js
+++ b/src/controllers/rest-api/users/controller.js
@@ -271,15 +271,6 @@ class UserRESTControllerLib {
       ctx.throw(422, err.message)
     }
   }
-
-  // Validate Email Format
-  async validateEmail (email) {
-    // eslint-disable-next-line no-useless-escape
-    if (/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(email)) {
-      return true
-    }
-    return false
-  }
 }
 
 module.exports = UserRESTControllerLib
diff --git a/src/controllers/rest-api/users/router.js b/src/controllers/rest-api/users/router.js
index 94f479c..58d4df0 100644
--- a/src/controllers/rest-api/users/router.js
+++ b/src/controllers/rest-api/users/router.js
@@ -7,7 +7,7 @@ const Router = require('koa-router')
 
 // Local libraries.
 const UserRESTControllerLib = require('./controller')
-const Validators = require('../../../middleware/validators')
+const Validators = require('../middleware/validators')
 
 let _this