@@ -32,6 +32,11 @@ function clearToken(): void {
3232 memoryToken = null ;
3333}
3434
35+ /** Clear memory only when it still holds `expected` (avoid wiping a newer concurrent store). */
36+ function clearTokenIfCurrent ( expected : string | null ) : void {
37+ if ( expected != null && readToken ( ) === expected ) clearToken ( ) ;
38+ }
39+
3540function clearLegacySessionToken ( ) : void {
3641 try {
3742 sessionStorage . removeItem ( LEGACY_TOKEN_KEY ) ;
@@ -83,23 +88,23 @@ export function installApiAuthFetch(): void {
8388 const response = await originalFetch ( firstInput , firstInit ) ;
8489 if ( response . status !== 401 ) return response ;
8590
86- if ( token ) clearToken ( ) ;
87-
8891 // Another request may have stored a token while this one was in flight (or while prompt blocked).
8992 const refreshed = readToken ( ) ;
9093 if ( refreshed && refreshed !== token ) {
9194 const [ retryInput , retryInit ] = withToken ( input , init , refreshed ) ;
9295 const retry = await originalFetch ( retryInput , retryInit ) ;
9396 if ( retry . status !== 401 ) return retry ;
94- clearToken ( ) ;
97+ clearTokenIfCurrent ( refreshed ) ;
98+ } else {
99+ clearTokenIfCurrent ( token ) ;
95100 }
96101
97102 const nextToken = await resolveTokenAfter401 ( token ) ;
98103 if ( ! nextToken ) return response ;
99104
100105 const [ retryInput , retryInit ] = withToken ( input , init , nextToken ) ;
101106 const retry = await originalFetch ( retryInput , retryInit ) ;
102- if ( retry . status === 401 ) clearToken ( ) ;
107+ if ( retry . status === 401 ) clearTokenIfCurrent ( nextToken ) ;
103108 return retry ;
104109 } ;
105110}
0 commit comments