feat: mutex 락 여부에 따라 내부 로직 수정

Nexters · Jan 1, 2025 · 81e0949 · 81e0949
1 parent 541e766
commit 81e0949
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/packages/api/src/fetcher.ts b/packages/api/src/fetcher.ts
@@ -30,14 +30,23 @@ export const instance = ky.create({
     afterResponse: [
       async (request, options, response) => {
         if (!response.ok && response.status === 401 && !request.url.includes('logout')) {
-          if (tokenRefreshMutex.isLocked()) {
-            await tokenRefreshMutex.waitForUnlock();
-          }
           try {
-            tokenRefreshMutex.acquire();
+            let accessToken: string | undefined;
+
+            if (tokenRefreshMutex.isLocked()) {
+              await tokenRefreshMutex.waitForUnlock();
+
+              const newAccessToken = window.localStorage.getItem(LOCAL_STORAGE.ACCESS_TOKEN);
+
+              if (newAccessToken) {
+                accessToken = newAccessToken;
+              }
+            } else {
+              await tokenRefreshMutex.acquire();
+              accessToken = await refreshAccessToken();
+            }
 
-            const newAccessToken = await refreshAccessToken();
-            request.headers.set('Authorization', `Bearer ${newAccessToken}`);
+            request.headers.set('Authorization', `Bearer ${accessToken}`);
             return ky(request, options);
           } catch (e) {
             if (e instanceof HTTPError && e.response.url.includes('/login/refresh')) {