revert error-handler logic to before to fix tests

web3-storage · Nov 11, 2023 · 4ea171d · 4ea171d
1 parent f37eca3
commit 4ea171d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/packages/api/scripts/cli.js b/packages/api/scripts/cli.js
@@ -33,7 +33,6 @@ prog
       outfile: path.join(__dirname, '..', 'dist', 'worker.js'),
       legalComments: 'external',
       inject: [path.join(__dirname, 'node-globals.js')],
-      loader: { '.js': 'jsx' },
       plugins: [
         {
           name: 'alias',

diff --git a/packages/api/src/error-handler.js b/packages/api/src/error-handler.js
@@ -28,15 +28,15 @@ export function errorHandler (err, { log }, request) {
     return new JSONResponse(error, { status })
   }
 
-  if (err instanceof HTTPError) {
-    return new JSONResponse(err, { status })
-  }
-
   let error = {
     code: err.code,
     message: err.message
   }
 
+  if (err instanceof HTTPError) {
+    return new JSONResponse(error, { status })
+  }
+
   switch (err.code) {
     // Magic SDK errors
     case MagicErrors.TokenExpired:

diff --git a/packages/api/test/user.spec.js b/packages/api/test/user.spec.js
@@ -605,7 +605,6 @@ describe('userLoginPost', function () {
       assert.equal(typeof responseJson, 'object', 'response can be parsed as json')
       assert.ok(responseJson.message.includes('new user registration is closed'), 'response object message indicates new user registration is closed')
       assert.equal(responseJson.code, 'NEW_USER_DENIED_TRY_OTHER_PRODUCT')
-      assert.equal(responseJson.otherProduct, 'https://console.web3.storage/')
     })
   })
 })