fix: define default value, and enhance the validation of limit and of…

…fset
Greenstand · Jul 20, 2023 · 6d719d0 · 6d719d0
1 parent 49bac90
commit 6d719d0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/server/handlers/walletHandler/index.js b/server/handlers/walletHandler/index.js
@@ -12,7 +12,7 @@ const walletGet = async (req, res) => {
   await walletGetQuerySchema.validateAsync(req.query, { abortEarly: false });
   const walletService = new WalletService();
 
-  const { limit, offset } = req.query;
+  const { limit, offset } = (req.query.limit) ? req.query : {limit: 1000, offset: 0};
   const wallets = await walletService.getAllWallets(req.wallet_id, {
     limit,
     offset,

diff --git a/server/handlers/walletHandler/schemas.js b/server/handlers/walletHandler/schemas.js
@@ -2,8 +2,14 @@ const Joi = require('joi');
 const TrustRelationshipEnums = require('../../utils/trust-enums');
 
 const walletGetQuerySchema = Joi.object({
-  limit: Joi.number().required(),
-  offset: Joi.number().integer(),
+  limit: Joi.number()
+      .integer().message('limit can only be non-negative integer')
+      .min(0).message('limit can only be non-negative integer')
+      .max(Number.MAX_SAFE_INTEGER).message('limit value overflow'),
+  offset: Joi.number()
+      .integer().message('offset can only be non-negative integer')
+      .min(0).message('offset can only be non-negative integer')
+      .max(Number.MAX_SAFE_INTEGER).message('offset value overflow'),
 });
 
 const walletIdParamSchema = Joi.object({