@azteam/express 1.2.273 → 1.2.274

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.273",
+    "version": "1.2.274",
     "main": "src/index.js",
     "engines": {
         "node": ">= 12.0.0",

package/src/AdminController.js

@@ -44,15 +44,15 @@ class AdminController extends Controller {
         };
 
         if (this.paginateOptions) {
-            this.paginateOptions.searchFields = [
-                ...this.paginateOptions.searchFields,
+            this.paginateOptions.allowSearchFields = [
+                ...this.paginateOptions.allowSearchFields,
                 'status',
                 'created_at_start',
                 'created_at_end',
                 'modified_at_start',
                 'modified_at_end',
             ];
-            this.paginateOptions.sortFields = [...this.paginateOptions.sortFields, 'created_at', 'modified_at', 'status'];
+            this.paginateOptions.allowSortFields = [...this.paginateOptions.allowSortFields, 'created_at', 'modified_at', 'status'];
         }
     }
 

package/src/middleware/paginateMiddleware.js

@@ -22,8 +22,9 @@ function omitData(data) {
 export default function (options = {}) {
     options = {
         limit: 20,
-        searchFields: [],
-        sortFields: ['created_at', 'modified_at', 'status'],
+        allowSearchFields: [],
+        allowSortFields: ['created_at', 'modified_at', 'status'],
+        allowLimits: [20, 40, 80],
         ...options,
     };
 
@@ -34,15 +35,17 @@ export default function (options = {}) {
         req.paginate = {
             limit: options.limit,
         };
-        if (req.query.limit) {
+        if (req.query.limit && options.allowLimits.includes(req.query.limit)) {
             req.paginate.limit = Number(req.query.limit);
             delete req.query.limit;
+        } else {
+            throw new ErrorException(INVALID, `limit just accept ${options.allowLimits.toString()}`);
         }
 
         req.paginate.page = req.query.page ? Number(req.query.page) : 1;
         req.paginate.offset = (req.paginate.page - 1) * req.paginate.limit;
 
-        if (req.query.sort_by && options.sortFields.includes(req.query.sort_by)) {
+        if (req.query.sort_by && options.allowSortFields.includes(req.query.sort_by)) {
             req.paginate.sort = {
                 [req.query.sort_by]: req.query.sort_type === 'asc' ? 'asc' : 'desc',
             };
@@ -52,6 +55,10 @@ export default function (options = {}) {
         delete req.query.sort_type;
         delete req.query.page;
 
+        if (!options.allowSearchFields.includes(key)) {
+            throw new ErrorException(INVALID, `Not exists search ${key}`);
+        }
+
         if (req.query.autocomplete) {
             if (!options.autocompleteField) {
                 throw new ErrorException(INVALID, 'Not exists autocomplete field');
@@ -81,7 +88,7 @@ export default function (options = {}) {
                     };
                 }
 
-                if (!options.searchFields.includes(key)) {
+                if (!options.allowSearchFields.includes(key)) {
                     throw new ErrorException(INVALID, `Not exists search ${key}`);
                 }
             });