@azteam/express 1.2.288 → 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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.288",
+    "version": "1.2.289",
     "main": "./lib/index.js",
     "module": "./src/index.js",
     "scripts": {
@@ -12,9 +12,10 @@
         "@azteam/crypto": "1.0.27",
         "@azteam/error": "1.0.29",
         "@azteam/http-client": "1.0.103",
-        "@azteam/validator": "1.0.1",
+        "@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",
@@ -29,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": "7.2.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';