From 4fc27414d25d719991d2368740c5ffea67af907d Mon Sep 17 00:00:00 2001
From: Lee Starnes <lee@canned-death.us>
Date: Tue, 6 Aug 2019 18:03:31 +0000
Subject: [PATCH] Handle JSONified errors while registering

Closes #617
---
 src/modules/users.js            | 11 +----------
 src/services/api/api.service.js |  9 ++++-----
 src/services/errors/errors.js   | 35 +++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/src/modules/users.js b/src/modules/users.js
index 10def9cd..4d78aef5 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -3,7 +3,6 @@ import oauthApi from '../services/new_api/oauth.js'
 import { compact, map, each, merge, last, concat, uniq } from 'lodash'
 import { set } from 'vue'
 import { registerPushNotifications, unregisterPushNotifications } from '../services/push/push.js'
-import { humanizeErrors } from './errors'
 
 // TODO: Unify with mergeOrAdd in statuses.js
 export const mergeOrAdd = (arr, obj, item) => {
@@ -382,16 +381,8 @@ const users = {
         store.dispatch('loginUser', data.access_token)
       } catch (e) {
         let errors = e.message
-        // replace ap_id with username
-        if (typeof errors === 'object') {
-          if (errors.ap_id) {
-            errors.username = errors.ap_id
-            delete errors.ap_id
-          }
-          errors = humanizeErrors(errors)
-        }
         store.commit('signUpFailure', errors)
-        throw Error(errors)
+        throw e
       }
     },
     async getCaptcha (store) {
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index d4ad1c4e..84616dd1 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -1,7 +1,7 @@
 import { each, map, concat, last } from 'lodash'
 import { parseStatus, parseUser, parseNotification, parseAttachment } from '../entity_normalizer/entity_normalizer.service.js'
 import 'whatwg-fetch'
-import { StatusCodeError } from '../errors/errors'
+import { RegistrationError, StatusCodeError } from '../errors/errors'
 
 /* eslint-env browser */
 const EXTERNAL_PROFILE_URL = '/api/externalprofile/show.json'
@@ -199,12 +199,11 @@ const register = ({ params, credentials }) => {
       ...rest
     })
   })
-    .then((response) => [response.ok, response])
-    .then(([ok, response]) => {
-      if (ok) {
+    .then((response) => {
+      if (response.ok) {
         return response.json()
       } else {
-        return response.json().then((error) => { throw new Error(error) })
+        return response.json().then((error) => { throw new RegistrationError(error) })
       }
     })
 }
diff --git a/src/services/errors/errors.js b/src/services/errors/errors.js
index 548f3c68..590552da 100644
--- a/src/services/errors/errors.js
+++ b/src/services/errors/errors.js
@@ -1,3 +1,5 @@
+import { humanizeErrors } from '../../modules/errors'
+
 export function StatusCodeError (statusCode, body, options, response) {
   this.name = 'StatusCodeError'
   this.statusCode = statusCode
@@ -12,3 +14,36 @@ export function StatusCodeError (statusCode, body, options, response) {
 }
 StatusCodeError.prototype = Object.create(Error.prototype)
 StatusCodeError.prototype.constructor = StatusCodeError
+
+export class RegistrationError extends Error {
+  constructor (error) {
+    super()
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this)
+    }
+
+    try {
+      // the error is probably a JSON object with a single key, "errors", whose value is another JSON object containing the real errors
+      if (typeof error === 'string') {
+        error = JSON.parse(error)
+        if (error.hasOwnProperty('error')) {
+          error = JSON.parse(error.error)
+        }
+      }
+
+      if (typeof error === 'object') {
+        // replace ap_id with username
+        if (error.ap_id) {
+          error.username = error.ap_id
+          delete error.ap_id
+        }
+        this.message = humanizeErrors(error)
+      } else {
+        this.message = error
+      }
+    } catch (e) {
+      // can't parse it, so just treat it like a string
+      this.message = error
+    }
+  }
+}