Skip to content

feat: add timeout to authenticated api endpoint #2001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mxatmx wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −18
Open

feat: add timeout to authenticated api endpoint #2001

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 22 additions & 18 deletions src/lib/auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
} from '@/store/mutation-types.js'

let channel
const AUTHENTICATED_REQUEST_TIMEOUT_MS = 10000

const auth = {
logIn(payload, callback) {
Expand Down Expand Up @@ -90,24 +91,27 @@ const auth = {
},

isServerLoggedIn(callback) {
superagent.get('/api/auth/authenticated').end((err, res) => {
if (err && res && [401, 422].includes(res.statusCode)) {
store.commit(USER_LOGIN_FAIL)
callback(null)
} else if (err) {
store.commit(USER_LOGIN_FAIL)
callback(err)
} else if (res && res.body === null) {
store.commit(USER_LOGIN_FAIL)
callback(err)
} else {
const user = res.body.user
const organisation = res.body.organisation || {}
store.commit(SET_ORGANISATION, organisation)
store.commit(USER_LOGIN, user)
callback(null)
}
})
superagent
.get('/api/auth/authenticated')
.timeout(AUTHENTICATED_REQUEST_TIMEOUT_MS)
.end((err, res) => {
if (err && res && [401, 422].includes(res.statusCode)) {
store.commit(USER_LOGIN_FAIL)
callback(null)
} else if (err) {
store.commit(USER_LOGIN_FAIL)
callback(err)
} else if (res && res.body === null) {
store.commit(USER_LOGIN_FAIL)
callback(err)
} else {
const user = res.body.user
const organisation = res.body.organisation || {}
store.commit(SET_ORGANISATION, organisation)
store.commit(USER_LOGIN, user)
callback(null)
}
})
},

// Needed for router to know if a redirection to login page is required or
Expand Down