Merge pull request #515 from lifeomic/handle-concurrent-401s

Handle Concurrent API Auth Failures
lifeomic · Jan 15, 2024 · f6130bb · f6130bb
2 parents fb97b6b + b39d330
commit f6130bb
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 15 deletions.
diff --git a/src/hooks/useAuth.test.tsx b/src/hooks/useAuth.test.tsx
@@ -333,6 +333,7 @@ test('refreshForAuthFailure refreshes auth token if not already loading', async
   jest.useFakeTimers();
   act(() => {
     result.current.refreshForAuthFailure(new Error() as AxiosError);
+    result.current.refreshForAuthFailure(new Error() as AxiosError);
   });
   expect(refreshHandler).toHaveBeenCalledTimes(1);
   expect(result.current.loading).toBe(true);

diff --git a/src/hooks/useAuth.tsx b/src/hooks/useAuth.tsx
@@ -3,6 +3,7 @@ import React, {
   useCallback,
   useContext,
   useEffect,
+  useRef,
   useState,
 } from 'react';
 import { RefreshResult } from 'react-native-app-auth';
@@ -70,6 +71,7 @@ export const AuthContextProvider = ({
     RefreshHandler | undefined
   >();
   const { currentAppState } = useCurrentAppState();
+  const refreshLock = useRef<Promise<void>>();
 
   const storeAuthResult = useCallback(async (result: AuthResult) => {
     await secureStorage.setObject(result);
@@ -87,23 +89,37 @@ export const AuthContextProvider = ({
 
   const refreshAuthResult = useCallback(
     async (_refreshHandler: RefreshHandler, _authResult: AuthResult) => {
-      if (__DEV__ && process.env.NODE_ENV !== 'test') {
-        console.warn('Attempting access token refresh');
+      const refreshSession = async () => {
+        if (__DEV__ && process.env.NODE_ENV !== 'test') {
+          console.log('Attempting access token refresh');
+        }
+        try {
+          setLoading(true);
+          const refreshResult = await _refreshHandler(_authResult);
+          await storeAuthResult({
+            ...refreshResult,
+
+            // Careful not to lose `refreshToken`, which may not be in `refreshResult`
+            refreshToken:
+              refreshResult.refreshToken || _authResult.refreshToken,
+          });
+        } catch (error) {
+          if (process.env.NODE_ENV !== 'test') {
+            console.warn('Error occurred refreshing access token', error);
+          }
+          clearAuthResult();
+        }
+      };
+
+      if (refreshLock.current) {
+        return refreshLock.current;
       }
+
       try {
-        setLoading(true);
-        const refreshResult = await _refreshHandler(_authResult);
-        await storeAuthResult({
-          ...refreshResult,
-
-          // Careful not to lose `refreshToken`, which may not be in `refreshResult`
-          refreshToken: refreshResult.refreshToken || _authResult.refreshToken,
-        });
-      } catch (error) {
-        if (process.env.NODE_ENV !== 'test') {
-          console.warn('Error occurred refreshing access token', error);
-        }
-        clearAuthResult();
+        refreshLock.current = refreshSession();
+        await refreshLock.current;
+      } finally {
+        refreshLock.current = undefined;
       }
     },
     [storeAuthResult, clearAuthResult],