Skip to content

Commit

Permalink
refactor: clean up code a bit
Browse files Browse the repository at this point in the history
  • Loading branch information
mvanroon committed May 13, 2022
1 parent bc0e0d1 commit a342e7c
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ export const refreshTokenIfNeeded = async (requestRefresh: TokenRefreshRequest):
// check if access token is expired
if (!accessToken || isTokenExpired(accessToken)) {
// do refresh

accessToken = await refreshToken(requestRefresh)
}

Expand Down Expand Up @@ -231,7 +230,10 @@ export const authTokenInterceptor =
if (!refreshToken) return requestConfig

const authenticateRequest = (token: string | undefined) => {
if (token) requestConfig.headers[header] = `${headerPrefix}${token}`
if (token) {
requestConfig.headers = requestConfig.headers ?? {}
requestConfig.headers[header] = `${headerPrefix}${token}`
}
return requestConfig
}

Expand All @@ -245,7 +247,7 @@ export const authTokenInterceptor =
// Do refresh if needed
let accessToken
try {
isRefreshing = true
setIsRefreshing(true)
accessToken = await refreshTokenIfNeeded(requestRefresh)
} catch (error) {
declineQueue(error as Error)
Expand All @@ -256,7 +258,7 @@ export const authTokenInterceptor =

throw error
} finally {
isRefreshing = false
setIsRefreshing(false)
}
resolveQueue(accessToken)

Expand Down

0 comments on commit a342e7c

Please sign in to comment.