@azteam/express 1.2.296 → 1.2.298

package/lib/AdminController.js

@@ -43,7 +43,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
     var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     _classCallCheck(this, AdminController);
     _this = _super.call(this, pathName, repository);
-    _defineProperty(_assertThisInitialized(_this), "methodGetPaginatePublic", /*#__PURE__*/function () {
+    _defineProperty(_assertThisInitialized(_this), "methodGetPaginate", /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, res) {
         var paginateData;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -89,7 +89,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
         return _ref2.apply(this, arguments);
       };
     }());
-    _defineProperty(_assertThisInitialized(_this), "methodGetOnePublic", /*#__PURE__*/function () {
+    _defineProperty(_assertThisInitialized(_this), "methodGetOne", /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(req, res) {
         var item;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
@@ -147,7 +147,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
         return _ref4.apply(this, arguments);
       };
     }());
-    _defineProperty(_assertThisInitialized(_this), "methodPostCreatePublic", /*#__PURE__*/function () {
+    _defineProperty(_assertThisInitialized(_this), "methodPostCreate", /*#__PURE__*/function () {
       var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(req, res) {
         var data, item;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
@@ -178,7 +178,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
         return _ref5.apply(this, arguments);
       };
     }());
-    _defineProperty(_assertThisInitialized(_this), "methodPutModifyPublic", /*#__PURE__*/function () {
+    _defineProperty(_assertThisInitialized(_this), "methodPutModify", /*#__PURE__*/function () {
       var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(req, res) {
         var item, data;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
@@ -220,7 +220,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
         return _ref6.apply(this, arguments);
       };
     }());
-    _defineProperty(_assertThisInitialized(_this), "methodDeletePublic", /*#__PURE__*/function () {
+    _defineProperty(_assertThisInitialized(_this), "methodDelete", /*#__PURE__*/function () {
       var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(req, res) {
         var item;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
@@ -348,12 +348,12 @@ var AdminController = /*#__PURE__*/function (_Controller) {
     return _this;
   }
   _createClass(AdminController, [{
-    key: "getPaginatePublic",
-    value: function getPaginatePublic() {
+    key: "getPaginate",
+    value: function getPaginate() {
       return {
         disabled: !this.roles.READ,
         path: '/',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.READ]), (0, _middleware.paginateMiddleware)(this.paginateOptions), this.methodGetPaginatePublic]
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.READ]), (0, _middleware.paginateMiddleware)(this.paginateOptions), this.methodGetPaginate]
       };
     }
   }, {
@@ -366,12 +366,12 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       };
     }
   }, {
-    key: "getOnePublic",
-    value: function getOnePublic() {
+    key: "getOne",
+    value: function getOne() {
       return {
         disabled: !this.roles.READ,
         path: '/:id',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.READ]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), this.methodGetOnePublic]
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.READ]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), this.methodGetOne]
       };
     }
   }, {
@@ -426,12 +426,12 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return afterCreate;
     }()
   }, {
-    key: "postCreatePublic",
-    value: function postCreatePublic() {
+    key: "postCreate",
+    value: function postCreate() {
       return {
         disabled: !this.roles.CREATE,
         path: '/',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.CREATE]), this.methodPostCreatePublic]
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.CREATE]), this.methodPostCreate]
       };
     }
   }, {
@@ -477,17 +477,17 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return afterModify;
     }()
   }, {
-    key: "putModifyPublic",
-    value: function putModifyPublic() {
+    key: "putModify",
+    value: function putModify() {
       return {
         disabled: !this.roles.UPDATE,
         path: '/:id',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), this.methodPutModifyPublic]
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), this.methodPutModify]
       };
     }
   }, {
-    key: "putModifyStatusAvailablePublic",
-    value: function putModifyStatusAvailablePublic() {
+    key: "putModifyStatusAvailable",
+    value: function putModifyStatusAvailable() {
       var _this2 = this;
       return {
         disabled: !this.roles.UPDATE,
@@ -531,8 +531,8 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       };
     }
   }, {
-    key: "putModifyStatusUnavailablePublic",
-    value: function putModifyStatusUnavailablePublic() {
+    key: "putModifyStatusUnavailable",
+    value: function putModifyStatusUnavailable() {
       var _this3 = this;
       return {
         disabled: !this.roles.UPDATE,
@@ -576,8 +576,8 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       };
     }
   }, {
-    key: "putModifyStatusWaitingPublic",
-    value: function putModifyStatusWaitingPublic() {
+    key: "putModifyStatusWaiting",
+    value: function putModifyStatusWaiting() {
       var _this4 = this;
       return {
         disabled: !this.roles.UPDATE,
@@ -642,12 +642,12 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return afterDelete;
     }()
   }, {
-    key: "deletePublic",
-    value: function deletePublic() {
+    key: "delete",
+    value: function _delete() {
       return {
         disabled: !this.roles.DELETE,
         path: '/:id',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.DELETE]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), this.methodDeletePublic]
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.DELETE]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), this.methodDelete]
       };
     }
   }, {

package/lib/Controller.js

@@ -26,9 +26,7 @@ var Controller = /*#__PURE__*/function () {
           var matches = methodName.match(/^(get|post|put|patch|delete)/);
           if (matches) {
             var path = '/';
-            if (methodName.endsWith('Public')) {
-              path += 'public';
-            } else if (methodName.endsWith('Trash')) {
+            if (methodName.endsWith('Trash')) {
               path += 'trash';
             }
             result.push({

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.296",
+    "version": "1.2.298",
     "main": "./lib/index.js",
     "module": "./src/index.js",
     "scripts": {
@@ -12,7 +12,7 @@
         "@azteam/crypto": "1.0.29",
         "@azteam/error": "1.0.31",
         "@azteam/http-client": "1.0.105",
-        "@azteam/validator": "1.0.6",
+        "@azteam/validator": "1.0.7",
         "@grpc/grpc-js": "1.6.7",
         "@grpc/proto-loader": "0.6.12",
         "@socket.io/redis-adapter": "7.2.0",

package/src/AdminController.js

@@ -54,16 +54,16 @@ class AdminController extends Controller {
         }
     }
 
-    methodGetPaginatePublic = async (req, res) => {
+    methodGetPaginate = async (req, res) => {
         const paginateData = await this.repository.find(req.query, req.paginate);
         return res.success(paginateData, this.guardResponse, this.allowResponse);
     };
 
-    getPaginatePublic() {
+    getPaginate() {
         return {
             disabled: !this.roles.READ,
             path: '/',
-            method: [adminRoleMiddleware([this.roles.READ]), paginateMiddleware(this.paginateOptions), this.methodGetPaginatePublic],
+            method: [adminRoleMiddleware([this.roles.READ]), paginateMiddleware(this.paginateOptions), this.methodGetPaginate],
         };
     }
 
@@ -80,17 +80,17 @@ class AdminController extends Controller {
         };
     }
 
-    methodGetOnePublic = async (req, res) => {
+    methodGetOne = async (req, res) => {
         const item = await this.repository.findOneById(req.params.id);
         if (!item) return res.error(NOT_EXISTS);
         return res.success(item, this.guardResponse, this.allowResponse);
     };
 
-    getOnePublic() {
+    getOne() {
         return {
             disabled: !this.roles.READ,
             path: '/:id',
-            method: [adminRoleMiddleware([this.roles.READ]), validateMiddleware(REQUEST_TYPE.PARAMS, rulesId), this.methodGetOnePublic],
+            method: [adminRoleMiddleware([this.roles.READ]), validateMiddleware(REQUEST_TYPE.PARAMS, rulesId), this.methodGetOne],
         };
     }
 
@@ -116,7 +116,7 @@ class AdminController extends Controller {
         return item;
     }
 
-    methodPostCreatePublic = async (req, res) => {
+    methodPostCreate = async (req, res) => {
         const data = await this.beforeCreate(req.body);
 
         let item = await this.repository.createByUser(req.user.id, data);
@@ -126,11 +126,11 @@ class AdminController extends Controller {
         return res.success(item, this.guardResponse, this.allowResponse);
     };
 
-    postCreatePublic() {
+    postCreate() {
         return {
             disabled: !this.roles.CREATE,
             path: '/',
-            method: [adminRoleMiddleware([this.roles.CREATE]), this.methodPostCreatePublic],
+            method: [adminRoleMiddleware([this.roles.CREATE]), this.methodPostCreate],
         };
     }
 
@@ -142,7 +142,7 @@ class AdminController extends Controller {
         return item;
     }
 
-    methodPutModifyPublic = async (req, res) => {
+    methodPutModify = async (req, res) => {
         let item = await this.repository.findOneById(req.params.id);
         if (!item) return res.error(NOT_EXISTS);
 
@@ -157,15 +157,15 @@ class AdminController extends Controller {
         return res.success(item, this.guardResponse, this.allowResponse);
     };
 
-    putModifyPublic() {
+    putModify() {
         return {
             disabled: !this.roles.UPDATE,
             path: '/:id',
-            method: [adminRoleMiddleware([this.roles.UPDATE]), validateMiddleware(REQUEST_TYPE.PARAMS, rulesId), this.methodPutModifyPublic],
+            method: [adminRoleMiddleware([this.roles.UPDATE]), validateMiddleware(REQUEST_TYPE.PARAMS, rulesId), this.methodPutModify],
         };
     }
 
-    putModifyStatusAvailablePublic() {
+    putModifyStatusAvailable() {
         return {
             disabled: !this.roles.UPDATE,
             path: '/available/:id',
@@ -186,7 +186,7 @@ class AdminController extends Controller {
         };
     }
 
-    putModifyStatusUnavailablePublic() {
+    putModifyStatusUnavailable() {
         return {
             disabled: !this.roles.UPDATE,
             path: '/unavailable/:id',
@@ -207,7 +207,7 @@ class AdminController extends Controller {
         };
     }
 
-    putModifyStatusWaitingPublic() {
+    putModifyStatusWaiting() {
         return {
             disabled: !this.roles.UPDATE,
             path: '/waiting/:id',
@@ -232,7 +232,7 @@ class AdminController extends Controller {
         return item;
     }
 
-    methodDeletePublic = async (req, res) => {
+    methodDelete = async (req, res) => {
         const item = await this.repository.findOneById(req.params.id);
         if (!item) return res.error(NOT_EXISTS);
 
@@ -243,11 +243,11 @@ class AdminController extends Controller {
         return res.success(true);
     };
 
-    deletePublic() {
+    delete() {
         return {
             disabled: !this.roles.DELETE,
             path: '/:id',
-            method: [adminRoleMiddleware([this.roles.DELETE]), validateMiddleware(REQUEST_TYPE.PARAMS, rulesId), this.methodDeletePublic],
+            method: [adminRoleMiddleware([this.roles.DELETE]), validateMiddleware(REQUEST_TYPE.PARAMS, rulesId), this.methodDelete],
         };
     }
 

package/src/Controller.js

@@ -15,9 +15,7 @@ class Controller {
                 const matches = methodName.match(/^(get|post|put|patch|delete)/);
                 if (matches) {
                     let path = '/';
-                    if (methodName.endsWith('Public')) {
-                        path += 'public';
-                    } else if (methodName.endsWith('Trash')) {
+                    if (methodName.endsWith('Trash')) {
                         path += 'trash';
                     }