@azteam/express 1.2.290 → 1.2.291

package/lib/AdminController.js

@@ -341,17 +341,6 @@ var AdminController = /*#__PURE__*/function (_Controller) {
     _this.paginateOptions = options.paginateOptions || {};
     _this.guardResponse = options.guardResponse || [];
     _this.allowResponse = options.allowResponse ? [].concat(_toConsumableArray(options.allowResponse), ALLOW_FIELDS) : ALLOW_FIELDS;
-    _this.rulesCreate = _objectSpread(_objectSpread({}, options.rulesCreate), {}, {
-      priority: (0, _validator.schemaNumber)(true),
-      status: (0, _validator.schemaEnum)([0, 1, 2], true)
-    });
-    _this.rulesModify = _objectSpread({
-      isForceModify: (0, _validator.schemaBoolean)(true)
-    }, _lodash["default"].mapValues(_this.rulesCreate, function (obj) {
-      return _objectSpread(_objectSpread({}, obj), {}, {
-        optional: true
-      });
-    }));
     if (_this.paginateOptions) {
       _this.paginateOptions.allowSearchFields = [].concat(_toConsumableArray(_this.paginateOptions.allowSearchFields), ['status', 'created_at_start', 'created_at_end', 'modified_at_start', 'modified_at_end']);
       _this.paginateOptions.allowSortFields = [].concat(_toConsumableArray(_this.paginateOptions.allowSortFields), ['created_at', 'modified_at', 'status']);
@@ -442,7 +431,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return {
         disabled: !this.roles.CREATE,
         path: '/',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.CREATE]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.BODY, this.rulesCreate), this.methodPostCreatePublic]
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.CREATE]), this.methodPostCreatePublic]
       };
     }
   }, {
@@ -493,7 +482,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, _validator.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), this.methodPutModifyPublic]
       };
     }
   }, {

package/lib/middleware/validateMiddleware.js

@@ -17,7 +17,7 @@ function _default(type, rules) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              (0, _validator["default"])(req[type], rules, true);
+              (0, _validator["default"])(req[type], rules);
               return _context.abrupt("return", next());
             case 2:
             case "end":

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.290",
+    "version": "1.2.291",
     "main": "./lib/index.js",
     "module": "./src/index.js",
     "scripts": {

package/src/AdminController.js

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import {NOT_EXISTS} from '@azteam/error';
-import {rulesId, schemaBoolean, schemaEnum, schemaNumber} from '@azteam/validator';
+import {rulesId} from '@azteam/validator';
 
 import {REQUEST_TYPE} from './constant';
 import {adminRoleMiddleware, paginateMiddleware, validateMiddleware} from './middleware';
@@ -41,19 +41,6 @@ class AdminController extends Controller {
         this.guardResponse = options.guardResponse || [];
         this.allowResponse = options.allowResponse ? [...options.allowResponse, ...ALLOW_FIELDS] : ALLOW_FIELDS;
 
-        this.rulesCreate = {
-            ...options.rulesCreate,
-            priority: schemaNumber(true),
-            status: schemaEnum([0, 1, 2], true),
-        };
-
-        this.rulesModify = {
-            isForceModify: schemaBoolean(true),
-            ..._.mapValues(this.rulesCreate, function (obj) {
-                return {...obj, optional: true};
-            }),
-        };
-
         if (this.paginateOptions) {
             this.paginateOptions.allowSearchFields = [
                 ...this.paginateOptions.allowSearchFields,
@@ -143,7 +130,7 @@ class AdminController extends Controller {
         return {
             disabled: !this.roles.CREATE,
             path: '/',
-            method: [adminRoleMiddleware([this.roles.CREATE]), validateMiddleware(REQUEST_TYPE.BODY, this.rulesCreate), this.methodPostCreatePublic],
+            method: [adminRoleMiddleware([this.roles.CREATE]), this.methodPostCreatePublic],
         };
     }
 
@@ -174,12 +161,7 @@ class AdminController extends Controller {
         return {
             disabled: !this.roles.UPDATE,
             path: '/:id',
-            method: [
-                adminRoleMiddleware([this.roles.UPDATE]),
-                validateMiddleware(REQUEST_TYPE.PARAMS, rulesId),
-                validateMiddleware(REQUEST_TYPE.BODY, this.rulesModify),
-                this.methodPutModifyPublic,
-            ],
+            method: [adminRoleMiddleware([this.roles.UPDATE]), validateMiddleware(REQUEST_TYPE.PARAMS, rulesId), this.methodPutModifyPublic],
         };
     }
 

package/src/middleware/validateMiddleware.js

@@ -2,7 +2,7 @@ import validator from '@azteam/validator';
 
 export default function (type, rules) {
     return async function (req, res, next) {
-        validator(req[type], rules, true);
+        validator(req[type], rules);
 
         return next();
     };