aboutsummaryrefslogtreecommitdiff
path: root/src/modules/users.js
diff options
context:
space:
mode:
authorHJ <30-hj@users.noreply.git.pleroma.social>2019-08-06 18:03:32 +0000
committerHJ <30-hj@users.noreply.git.pleroma.social>2019-08-06 18:03:32 +0000
commit17dc7357d5036681b346f745190204e213c0ef8c (patch)
tree33966f59ce8dbf4f75afb43bbb24ec860ff98aaf /src/modules/users.js
parent0e6489d84019ac146af1dd5df9f1db548b4df5ac (diff)
parent4fc27414d25d719991d2368740c5ffea67af907d (diff)
Merge branch 'issue-617' into 'develop'
Handle JSONified errors while registering Closes #617 See merge request pleroma/pleroma-fe!888
Diffstat (limited to 'src/modules/users.js')
-rw-r--r--src/modules/users.js11
1 files changed, 1 insertions, 10 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) {