Merge branch 'develop'

Author: kiwicopple

src/api/policies.ts

@@ -48,7 +48,7 @@ router.post('/', async (req, res) => {
   } catch (error) {
     // For this one, we always want to give back the error to the customer
     console.log('POST error!', error)
-    res.status(200).json({ error: error.toString(), status: 200 })
+    res.status(400).json({ error: error.message })
   }
 })
 
@@ -85,7 +85,7 @@ router.patch('/:id', async (req, res) => {
   } catch (error) {
     // For this one, we always want to give back the error to the customer
     console.log('Soft error!', error)
-    res.status(200).json({ error: error.toString(), status: 200 })
+    res.status(400).json({ error: error.message })
   }
 })
 

src/api/query.ts

@@ -11,7 +11,7 @@ router.post('/', async (req, res) => {
   } catch (error) {
     // For this one, we always want to give back the error to the customer
     console.log('Soft error!', error)
-    res.status(200).json({ error: error.toString(), status: 200 })
+    res.status(400).json({ error: error.message })
   }
 })
 

src/api/tables.ts

@@ -66,7 +66,7 @@ router.post('/', async (req, res) => {
   } catch (error) {
     // For this one, we always want to give back the error to the customer
     console.log('Soft error!', error)
-    res.status(200).json({ error: error.toString(), status: 200 })
+    res.status(400).json({ error: error.message })
   }
 })
 
@@ -101,7 +101,7 @@ router.patch('/:id', async (req, res) => {
   } catch (error) {
     // For this one, we always want to give back the error to the customer
     console.log('Soft error!', error)
-    res.status(200).json({ error: error.toString(), status: 200 })
+    res.status(400).json({ error: error.message })
   }
 })
 

test/integration/index.spec.js

@@ -53,6 +53,18 @@ describe('When passing an encrypted connection header', () => {
     }
   })
 })
+describe('should give meaningful errors', () => {
+  it('POST', async () => {
+    try {
+      const res = await axios.post(`${URL}/query`, { query: 'drop table fake_table' })
+      assert.equal(res.data.body, 'Code block should not be reached') // Error should be thrown before executing
+    } catch (error) {
+      let { status, data } = error.response
+      assert.equal(status, 400)
+      assert.equal(data.error, 'error: table "fake_table" does not exist')
+    }
+  })
+})
 describe('/query', () => {
   it('POST', async () => {
     const res = await axios.post(`${URL}/query`, { query: 'SELECT * FROM USERS' })