Merge pull request bitpay#2309 from micahriggan/fix/json-parse

matiu · web-flow · commit d5350016aec9 · 2019-08-05T17:55:18.000-03:00
Moving JSON parse into try catch
diff --git a/packages/bitcore-node/src/routes/api/wallet.ts b/packages/bitcore-node/src/routes/api/wallet.ts
@@ -46,19 +46,19 @@ const authenticate: RequestHandler = async (req: PreAuthRequest, res: Response,
   } catch (err) {
     return res.status(500).send('Problem authenticating wallet');
   }
-
-  if (req.is('application/octet-stream')) {
-    req.body = JSON.parse(req.body.toString());
-  }
-  if (!wallet) {
-    return res.status(404).send('Wallet not found');
-  }
-  Object.assign(req, { wallet });
-  const walletConfig = Config.for('api').wallets;
-  if (walletConfig && walletConfig.allowUnauthenticatedCalls) {
-    return next();
-  }
   try {
+    if (req.is('application/octet-stream')) {
+      req.body = JSON.parse(req.body.toString());
+    }
+    if (!wallet) {
+      return res.status(404).send('Wallet not found');
+    }
+    Object.assign(req, { wallet });
+    const walletConfig = Config.for('api').wallets;
+    if (walletConfig && walletConfig.allowUnauthenticatedCalls) {
+      return next();
+    }
+
     const validRequestSignature = verifyRequestSignature({
       message: [req.method, req.originalUrl, JSON.stringify(req.body)].join('|'),
       pubKey: wallet.pubKey,
