Merge pull request #413 from WeiyuSun/enhance_transfer_service&handler

fix: move transfer validation from service to handler
Greenstand · Aug 28, 2023 · fec6bf8 · fec6bf8
2 parents c127534 + bf128bc
commit fec6bf8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/server/handlers/transferHandler/schemas.js b/server/handlers/transferHandler/schemas.js
@@ -10,15 +10,19 @@ const transferPostSchema = Joi.alternatives()
     {
       then: Joi.object({
         tokens: Joi.array().items(Joi.string()).required().unique(),
-        sender_wallet: Joi.alternatives().try(Joi.string()).required(),
+        sender_wallet: Joi.alternatives().try(Joi.string()).required().invalid(Joi.ref('receiver_wallet')).messages({
+          'any.invalid': 'Cannot transfer to the same wallet as the originating one!'
+        }),
         receiver_wallet: Joi.alternatives().try(Joi.string()).required(),
         claim: Joi.boolean().default(false),
       }),
       otherwise: Joi.object({
         bundle: Joi.object({
           bundle_size: Joi.number().min(1).max(10000).integer(),
         }).required(),
-        sender_wallet: Joi.string().required(),
+        sender_wallet: Joi.string().required().invalid(Joi.ref('receiver_wallet')).messages({
+          'any.invalid': 'Cannot transfer to the same wallet as the originating one!'
+        }),
         receiver_wallet: Joi.string().required(),
         claim: Joi.boolean().default(false),
       }),

diff --git a/server/services/TransferService.js b/server/services/TransferService.js
@@ -40,13 +40,6 @@ class TransferService {
     // begin transaction
     try {
       await this._session.beginTransaction();
-
-      if (transferBody.sender_wallet === transferBody.receiver_wallet) {
-        throw new HttpError(
-          422,
-          'Cannot transfer to the same wallet as the originating one!',
-        );
-      }
 
       const walletSender = await this._walletService.getByIdOrName(
         transferBody.sender_wallet,