@azteam/express 1.2.287 → 1.2.289

package/lib/AdminController.js

@@ -7,8 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _lodash = _interopRequireDefault(require("lodash"));
 var _error = require("@azteam/error");
+var _validator = require("@azteam/validator");
 var _constant = require("./constant");
-var _validate = require("./validate");
 var _middleware = require("./middleware");
 var _Controller2 = _interopRequireDefault(require("./Controller"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -342,11 +342,11 @@ var AdminController = /*#__PURE__*/function (_Controller) {
     _this.guardResponse = options.guardResponse || [];
     _this.allowResponse = options.allowResponse ? [].concat(_toConsumableArray(options.allowResponse), ALLOW_FIELDS) : ALLOW_FIELDS;
     _this.rulesCreate = _objectSpread(_objectSpread({}, options.rulesCreate), {}, {
-      priority: (0, _validate.schemaNumber)(true),
-      status: (0, _validate.schemaEnum)([0, 1, 2], true)
+      priority: (0, _validator.schemaNumber)(true),
+      status: (0, _validator.schemaEnum)([0, 1, 2], true)
     });
     _this.rulesModify = _objectSpread({
-      isForceModify: (0, _validate.schemaBoolean)(true)
+      isForceModify: (0, _validator.schemaBoolean)(true)
     }, _lodash["default"].mapValues(_this.rulesCreate, function (obj) {
       return _objectSpread(_objectSpread({}, obj), {}, {
         optional: true
@@ -382,7 +382,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return {
         disabled: !this.roles.READ,
         path: '/:id',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.READ]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validate.rulesId), this.methodGetOnePublic]
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.READ]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), this.methodGetOnePublic]
       };
     }
   }, {
@@ -391,7 +391,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return {
         disabled: !this.roles.READ,
         path: '/:id',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.READ]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validate.rulesId), this.methodGetOneTrash]
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.READ]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), this.methodGetOneTrash]
       };
     }
   }, {
@@ -493,7 +493,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return {
         disabled: !this.roles.UPDATE,
         path: '/:id',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validate.rulesId), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.BODY, this.rulesModify), this.methodPutModifyPublic]
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.BODY, this.rulesModify), this.methodPutModifyPublic]
       };
     }
   }, {
@@ -503,7 +503,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return {
         disabled: !this.roles.UPDATE,
         path: '/available/:id',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validate.rulesId), /*#__PURE__*/function () {
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), /*#__PURE__*/function () {
           var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(req, res) {
             var item;
             return _regeneratorRuntime().wrap(function _callee14$(_context14) {
@@ -548,7 +548,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return {
         disabled: !this.roles.UPDATE,
         path: '/unavailable/:id',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validate.rulesId), /*#__PURE__*/function () {
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), /*#__PURE__*/function () {
           var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(req, res) {
             var item;
             return _regeneratorRuntime().wrap(function _callee15$(_context15) {
@@ -593,7 +593,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return {
         disabled: !this.roles.UPDATE,
         path: '/waiting/:id',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validate.rulesId), /*#__PURE__*/function () {
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), /*#__PURE__*/function () {
           var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(req, res) {
             var item;
             return _regeneratorRuntime().wrap(function _callee16$(_context16) {
@@ -658,7 +658,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return {
         disabled: !this.roles.DELETE,
         path: '/:id',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.DELETE]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validate.rulesId), this.methodDeletePublic]
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.DELETE]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), this.methodDeletePublic]
       };
     }
   }, {
@@ -667,7 +667,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return {
         disabled: !this.roles.RESTORE,
         path: '/:id',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.RESTORE]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validate.rulesId), this.methodPostRestoreTrash]
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.RESTORE]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), this.methodPostRestoreTrash]
       };
     }
   }, {
@@ -697,7 +697,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return {
         disabled: !this.roles.DESTROY,
         path: '/:id',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.DESTROY]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validate.rulesId), this.methodDeleteDestroyTrash]
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.DESTROY]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), this.methodDeleteDestroyTrash]
       };
     }
   }]);

package/lib/middleware/validateMiddleware.js

@@ -5,69 +5,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = _default;
-var _error = require("@azteam/error");
-var _fastestValidator = _interopRequireDefault(require("fastest-validator"));
+var _validator = _interopRequireDefault(require("@azteam/validator"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-var v = new _fastestValidator["default"]({
-  messages: {
-    jsonString: "The '{field}' field must be an json string! Actual: {actual}"
-  }
-});
-v.add('json', function (_ref, path, context) {
-  var schema = _ref.schema,
-    messages = _ref.messages;
-  return {
-    source: "\n            try {\n                JSON.parse(value);\n            } catch (e) {\n                ".concat(this.makeError({
-      type: 'jsonString',
-      actual: 'value',
-      messages: messages
-    }), "\n                return;\n            }\n            return value; \n        ")
-  };
-});
-
-/* remove empty field or not have validate field */
-function omitData(data) {
-  var inKeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  Object.keys(data).map(function (key, index) {
-    if (inKeys.includes(key)) {
-      var value = data[key];
-      if (typeof value === 'string') {
-        value = value.trim();
-        if (value === '' || value === 'NaN' || value === 'null' || value === 'undefined') {
-          delete data[key];
-        } else {
-          data[key] = value;
-        }
-      } else if (value === null || value === undefined || Number.isNaN(value)) {
-        delete data[key];
-      }
-    } else {
-      delete data[key];
-    }
-  });
-  return data;
-}
 function _default(type, rules) {
   return /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, res, next) {
-      var reqData, errors;
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, res, next) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              reqData = omitData(req[type], Object.keys(rules)); /* validate field */
-              errors = v.validate(reqData, rules);
-              if (!Array.isArray(errors)) {
-                _context.next = 4;
-                break;
-              }
-              throw new _error.ErrorException(_error.INVALID, errors);
-            case 4:
+              (0, _validator["default"])(req[type], rules, true);
               return _context.abrupt("return", next());
-            case 5:
+            case 2:
             case "end":
               return _context.stop();
           }
@@ -75,7 +27,7 @@ function _default(type, rules) {
       }, _callee);
     }));
     return function (_x, _x2, _x3) {
-      return _ref2.apply(this, arguments);
+      return _ref.apply(this, arguments);
     };
   }();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.287",
+    "version": "1.2.289",
     "main": "./lib/index.js",
     "module": "./src/index.js",
     "scripts": {
@@ -12,8 +12,10 @@
         "@azteam/crypto": "1.0.27",
         "@azteam/error": "1.0.29",
         "@azteam/http-client": "1.0.103",
+        "@azteam/validator": "1.0.2",
         "@grpc/grpc-js": "1.6.7",
         "@grpc/proto-loader": "0.6.12",
+        "@socket.io/redis-adapter": "7.2.0",
         "body-parser": "1.19.0",
         "cookie-parser": "1.4.4",
         "cors": "2.8.4",
@@ -28,7 +30,6 @@
         "method-override": "3.0.0",
         "morgan": "1.10.0",
         "psl": "1.8.0",
-        "socket.io": "4.4.1",
-        "@socket.io/redis-adapter": "6.1.0"
+        "socket.io": "4.4.1"
     }
 }

package/src/AdminController.js

@@ -1,8 +1,8 @@
 import _ from 'lodash';
 import {NOT_EXISTS} from '@azteam/error';
+import {rulesId, schemaBoolean, schemaEnum, schemaNumber} from '@azteam/validator';
 
 import {REQUEST_TYPE} from './constant';
-import {rulesId, schemaBoolean, schemaEnum, schemaNumber} from './validate';
 import {adminRoleMiddleware, paginateMiddleware, validateMiddleware} from './middleware';
 import Controller from './Controller';
 

package/src/middleware/validateMiddleware.js

@@ -1,58 +1,9 @@
-import {ErrorException, INVALID} from '@azteam/error';
-import Validator from 'fastest-validator';
-
-const v = new Validator({
-    messages: {
-        jsonString: "The '{field}' field must be an json string! Actual: {actual}",
-    },
-});
-
-v.add('json', function ({schema, messages}, path, context) {
-    return {
-        source: `
-            try {
-                JSON.parse(value);
-            } catch (e) {
-                ${this.makeError({type: 'jsonString', actual: 'value', messages})}
-                return;
-            }
-            return value; 
-        `,
-    };
-});
-
-/* remove empty field or not have validate field */
-function omitData(data, inKeys = []) {
-    Object.keys(data).map(function (key, index) {
-        if (inKeys.includes(key)) {
-            let value = data[key];
-            if (typeof value === 'string') {
-                value = value.trim();
-                if (value === '' || value === 'NaN' || value === 'null' || value === 'undefined') {
-                    delete data[key];
-                } else {
-                    data[key] = value;
-                }
-            } else if (value === null || value === undefined || Number.isNaN(value)) {
-                delete data[key];
-            }
-        } else {
-            delete data[key];
-        }
-    });
-    return data;
-}
+import validator from '@azteam/validator';
 
 export default function (type, rules) {
     return async function (req, res, next) {
-        const reqData = omitData(req[type], Object.keys(rules));
-
-        /* validate field */
-        const errors = v.validate(reqData, rules);
+        validator(req[type], rules, true);
 
-        if (Array.isArray(errors)) {
-            throw new ErrorException(INVALID, errors);
-        }
         return next();
     };
 }