Merge branch '386-display-invalid-user-profile' into 'develop'
Show error message when visit profile page of invalid user Closes #386 See merge request pleroma/pleroma-fe!606
This commit is contained in:
commit
dc01f90dde
6 changed files with 46 additions and 4 deletions
|
@ -47,6 +47,7 @@ const MASTODON_USER_FAVORITES_TIMELINE_URL = '/api/v1/favourites'
|
|||
import { each, map } from 'lodash'
|
||||
import { parseStatus, parseUser, parseNotification } from '../entity_normalizer/entity_normalizer.service.js'
|
||||
import 'whatwg-fetch'
|
||||
import { StatusCodeError } from '../errors/errors'
|
||||
|
||||
const oldfetch = window.fetch
|
||||
|
||||
|
@ -244,7 +245,15 @@ const denyUser = ({id, credentials}) => {
|
|||
const fetchUser = ({id, credentials}) => {
|
||||
let url = `${USER_URL}?user_id=${id}`
|
||||
return fetch(url, { headers: authHeaders(credentials) })
|
||||
.then((data) => data.json())
|
||||
.then((response) => {
|
||||
return new Promise((resolve, reject) => response.json()
|
||||
.then((json) => {
|
||||
if (!response.ok) {
|
||||
return reject(new StatusCodeError(response.status, json, { url }, response))
|
||||
}
|
||||
return resolve(json)
|
||||
}))
|
||||
})
|
||||
.then((data) => parseUser(data))
|
||||
}
|
||||
|
||||
|
|
14
src/services/errors/errors.js
Normal file
14
src/services/errors/errors.js
Normal file
|
@ -0,0 +1,14 @@
|
|||
export function StatusCodeError (statusCode, body, options, response) {
|
||||
this.name = 'StatusCodeError'
|
||||
this.statusCode = statusCode
|
||||
this.message = statusCode + ' - ' + (JSON && JSON.stringify ? JSON.stringify(body) : body)
|
||||
this.error = body // legacy attribute
|
||||
this.options = options
|
||||
this.response = response
|
||||
|
||||
if (Error.captureStackTrace) { // required for non-V8 environments
|
||||
Error.captureStackTrace(this)
|
||||
}
|
||||
}
|
||||
StatusCodeError.prototype = Object.create(Error.prototype)
|
||||
StatusCodeError.prototype.constructor = StatusCodeError
|
Loading…
Add table
Add a link
Reference in a new issue