Merge pull request #8422 from Budibase/bug/sev5/public-api-404

Public rows API: Return correct status codes

packages/server/src/api/controllers/row/index.ts

@@ -30,7 +30,6 @@ export async function patch(ctx: any): Promise<any> {
   if (body && !body._id) {
     return save(ctx)
   }
-  try {
   const { row, table } = await quotas.addQuery(
     () => pickApi(tableId).patch(ctx),
     {
@@ -38,13 +37,9 @@ export async function patch(ctx: any): Promise<any> {
     }
   )
   ctx.status = 200
-    ctx.eventEmitter &&
+  ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:update`, appId, row, table)
-      ctx.eventEmitter.emitRow(`row:update`, appId, row, table)
   ctx.message = `${table.name} updated successfully.`
   ctx.body = row
-  } catch (err) {
-    ctx.throw(400, err)
-  }
 }
 
 export const save = async (ctx: any) => {
@@ -55,7 +50,6 @@ export const save = async (ctx: any) => {
   if (body && body._id) {
     return patch(ctx)
   }
-  try {
   const { row, table } = await quotas.addRow(() =>
     quotas.addQuery(() => pickApi(tableId).save(ctx), {
       datasourceId: tableId,
@@ -65,42 +59,26 @@ export const save = async (ctx: any) => {
   ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:save`, appId, row, table)
   ctx.message = `${table.name} saved successfully`
   ctx.body = row
-  } catch (err) {
-    ctx.throw(400, err)
 }
-}
-
 export async function fetchView(ctx: any) {
   const tableId = getTableId(ctx)
-  try {
   ctx.body = await quotas.addQuery(() => pickApi(tableId).fetchView(ctx), {
     datasourceId: tableId,
   })
-  } catch (err) {
-    ctx.throw(400, err)
-  }
 }
 
 export async function fetch(ctx: any) {
   const tableId = getTableId(ctx)
-  try {
   ctx.body = await quotas.addQuery(() => pickApi(tableId).fetch(ctx), {
     datasourceId: tableId,
   })
-  } catch (err) {
-    ctx.throw(400, err)
-  }
 }
 
 export async function find(ctx: any) {
   const tableId = getTableId(ctx)
-  try {
   ctx.body = await quotas.addQuery(() => pickApi(tableId).find(ctx), {
     datasourceId: tableId,
   })
-  } catch (err) {
-    ctx.throw(400, err)
-  }
 }
 
 export async function destroy(ctx: any) {
@@ -137,46 +115,30 @@ export async function destroy(ctx: any) {
 
 export async function search(ctx: any) {
   const tableId = getTableId(ctx)
-  try {
   ctx.status = 200
   ctx.body = await quotas.addQuery(() => pickApi(tableId).search(ctx), {
     datasourceId: tableId,
   })
-  } catch (err) {
-    ctx.throw(400, err)
-  }
 }
 
 export async function validate(ctx: any) {
   const tableId = getTableId(ctx)
-  try {
   ctx.body = await pickApi(tableId).validate(ctx)
-  } catch (err) {
-    ctx.throw(400, err)
-  }
 }
 
 export async function fetchEnrichedRow(ctx: any) {
   const tableId = getTableId(ctx)
-  try {
   ctx.body = await quotas.addQuery(
     () => pickApi(tableId).fetchEnrichedRow(ctx),
     {
       datasourceId: tableId,
     }
   )
-  } catch (err) {
-    ctx.throw(400, err)
-  }
 }
 
 export const exportRows = async (ctx: any) => {
   const tableId = getTableId(ctx)
-  try {
   ctx.body = await quotas.addQuery(() => pickApi(tableId).exportRows(ctx), {
     datasourceId: tableId,
   })
-  } catch (err) {
-    ctx.throw(400, err)
-  }
 }

packages/server/src/api/controllers/row/internal.js

@@ -118,7 +118,7 @@ exports.patch = async ctx => {
   })
 
   if (!validateResult.valid) {
-    throw { validation: validateResult.errors }
+    ctx.throw(400, { validation: validateResult.errors })
   }
 
   // returned row is cleaned and prepared for writing to DB