improve error handling which was broken by migration from superagent …

…to fetch

src/api/client.js

@@ -43,20 +43,41 @@ export default class ApiClient
     return format_url(urlObj);
   }
 
+  async handleResponseError(response) {
+    if (!response.ok) {
+      let json, errorMessage;
+
+      errorMessage = response.statusText;
+
+      try {
+        json = await response.json();
+        errorMessage = json.error || errorMessage;
+      } catch (e) {
+        throw new Error(errorMessage);
+      }
+
+      throw new Error(errorMessage);
+    }
+  }
+
   async get(relativeUrl, query = {}) {
     let defaultHeaders = {};
 
     if (this.serverReq !== null && 'cookie' in this.serverReq.headers) {
       defaultHeaders = { Cookie: this.serverReq.headers['cookie'] };
     }
 
-    return fetch(
+    const response = await fetch(
       this.apiUrlForFetch(relativeUrl, query),
       {
         credentials: 'same-origin',
         headers: defaultHeaders
       }
     );
+
+    await this.handleResponseError(response);
+
+    return response;
   }
 
   async head(relativeUrl, query = {}) {
@@ -83,14 +104,17 @@ export default class ApiClient
       defaultHeaders = { Cookie: this.serverReq.headers['cookie'] };
     }
 
-    return fetch(
+    const response = await fetch(
       this.apiUrlForFetch(relativeUrl),
       {
         credentials: 'same-origin',
         method: 'DELETE',
         headers: defaultHeaders
       }
     );
+    await this.handleResponseError(response);
+
+    return response;
   }
 
   async post(relativeUrl, data = null) {
@@ -110,7 +134,7 @@ export default class ApiClient
       body = stringify(data);
     }
 
-    return fetch(
+    const response = await fetch(
       this.apiUrl(relativeUrl),
       {
         credentials: 'same-origin',
@@ -119,6 +143,10 @@ export default class ApiClient
         body
       }
     );
+
+    await this.handleResponseError(response);
+
+    return response;
   }
 
   /*
@@ -139,7 +167,7 @@ export default class ApiClient
       body = data;
     }
 
-    return fetch(
+    const response = await fetch(
       this.apiUrl(relativeUrl),
       {
         credentials: 'same-origin',
@@ -148,6 +176,9 @@ export default class ApiClient
         body
       }
     );
+    await this.handleResponseError(response);
+
+    return response;
   }
 
   async postJSON(relativeUrl, data = null) {
@@ -167,7 +198,7 @@ export default class ApiClient
       body = JSON.stringify(data);
     }
 
-    return fetch(
+    const response = await fetch(
       this.apiUrl(relativeUrl),
       {
         credentials: 'same-origin',
@@ -176,6 +207,9 @@ export default class ApiClient
         body
       }
     );
+    await this.handleResponseError(response);
+
+    return response;
   }
 
   async subscriptions(offset = 0) {
@@ -234,7 +268,14 @@ export default class ApiClient
 
   async relatedPosts(postId) {
     const response = await this.get(`/api/v1/post/${postId}/related-posts`);
-    return await response.json();
+
+    const json = await response.json();
+
+    if (!response.ok) {
+      throw new Error(json.error);
+    }
+
+    return json;
   }
 
   async userTags() {

src/api/controller.js

@@ -1703,19 +1703,24 @@ export default class ApiController {
 
   getUser = async (ctx) => {
     const User = this.bookshelf.model('User');
-    const u = await User
-      .where({ username: ctx.params.username })
-      .fetch({
-        require: true,
-        withRelated: [
-          'following', 'followers', 'liked_posts',
-          'liked_hashtags', 'liked_schools', 'liked_geotags',
-          'favourited_posts', 'followed_hashtags',
-          'followed_schools', 'followed_geotags'
-        ]
-      });
 
-    ctx.body = u.toJSON();
+    try {
+      const u = await User
+              .where({ username: ctx.params.username })
+              .fetch({
+                require: true,
+                withRelated: [
+                  'following', 'followers', 'liked_posts',
+                  'liked_hashtags', 'liked_schools', 'liked_geotags',
+                  'favourited_posts', 'followed_hashtags',
+                  'followed_schools', 'followed_geotags'
+                ]
+              });
+      ctx.body = u.toJSON();
+    } catch (e) {
+      ctx.status = 404;
+      return;
+    }
   };
 
   followUser = async (ctx) => {
@@ -2701,7 +2706,8 @@ export default class ApiController {
       ctx.body = posts;
     } catch (e) {
       ctx.status = 500;
-      ctx.body = { error: e.message };
+      ctx.body = { error: 'Internal Server Error' };
+      ctx.app.logger.error(e);
     }
   };