Made useAuth safer
This commit is contained in:
1 parent
686be7ca8a
commit
2b01ed688c
2 files changed
+6
-2
No files matched your search
@@ -131,9 +131,11 @@ export const useAuth = () => {
|
|||||||
return refreshPromise
|
return refreshPromise
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (getCurrentInstance()) {
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
if (refreshToken.value && !sessionToken.value) refreshSessionToken()
|
if (refreshToken.value && !sessionToken.value) refreshSessionToken()
|
||||||
})
|
})
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
refreshToken,
|
refreshToken,
|
||||||
|
|||||||
+4
-2
@@ -25,13 +25,13 @@ export const cfetch = async (
|
|||||||
|
|
||||||
if (!baseUrl) throw new Error("BACKEND URL not set")
|
if (!baseUrl) throw new Error("BACKEND URL not set")
|
||||||
|
|
||||||
const { sessionToken, refreshSessionToken } = useAuth()
|
|
||||||
|
|
||||||
const defaults: AxiosRequestConfig = {
|
const defaults: AxiosRequestConfig = {
|
||||||
baseURL: baseUrl,
|
baseURL: baseUrl,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (authorize) {
|
if (authorize) {
|
||||||
|
const { sessionToken, refreshSessionToken } = useAuth()
|
||||||
|
|
||||||
let token = sessionToken.value
|
let token = sessionToken.value
|
||||||
|
|
||||||
if (token) defaults.headers = { Authorization: `Bearer ${token}` }
|
if (token) defaults.headers = { Authorization: `Bearer ${token}` }
|
||||||
@@ -64,6 +64,8 @@ export const cfetch = async (
|
|||||||
response = await axios(url, config)
|
response = await axios(url, config)
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
if (error.response?.status == 401) {
|
if (error.response?.status == 401) {
|
||||||
|
const { sessionToken, refreshSessionToken } = useAuth()
|
||||||
|
|
||||||
if (!config.headers) config.headers = {}
|
if (!config.headers) config.headers = {}
|
||||||
config.headers.Authorization = `Bearer ${await refreshSessionToken()}`
|
config.headers.Authorization = `Bearer ${await refreshSessionToken()}`
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user