Browse Source

Fixing an issue with checkAuth function not checking response status before attempting to get JSON.

pull/4023/head
mike12345567 5 years ago
parent
commit
58f40da036
  1. 8
      packages/builder/src/stores/portal/auth.js
  2. 4
      packages/server/src/api/controllers/dev.js

8
packages/builder/src/stores/portal/auth.js

@ -8,11 +8,11 @@ export function createAuthStore() {
subscribe: store.subscribe,
checkAuth: async () => {
const response = await api.get("/api/admin/users/self")
const user = await response.json()
if (response.status === 200) {
store.update(state => ({ ...state, user }))
} else {
if (response.status !== 200) {
store.update(state => ({ ...state, user: null }))
} else {
const user = await response.json()
store.update(state => ({ ...state, user }))
}
},
login: async creds => {

4
packages/server/src/api/controllers/dev.js

@ -16,7 +16,9 @@ async function redirect(ctx, method) {
body: ctx.request.body,
})
)
ctx.body = await response.json()
if (response.status !== 200) {
ctx.throw(response.status, response.statusText)
}
const cookie = response.headers.get("set-cookie")
if (cookie) {
ctx.set("set-cookie", cookie)

Loading…
Cancel
Save