mirror of
https://github.com/SableClient/Sable.git
synced 2026-11-20 17:11:17 -08:00
fix: retry media after token refresh
This commit is contained in:
2 files changed
+3
-13
No files matched your search
@@ -49,8 +49,9 @@ describe('service worker media auth recovery', () => {
|
||||
vi.mocked(fetch).mockImplementation(async (_input, init) => {
|
||||
const headers = new Headers(init?.headers);
|
||||
ranges.push({ authorization: headers.get('authorization'), range: headers.get('range') });
|
||||
return new Response('', {
|
||||
status: headers.get('authorization') === 'Bearer old-token' ? 401 : 206,
|
||||
const isOldToken = headers.get('authorization') === 'Bearer old-token';
|
||||
return new Response(isOldToken ? JSON.stringify({ errcode: 'M_UNKNOWN_TOKEN' }) : '', {
|
||||
status: isOldToken ? 401 : 206,
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -775,16 +775,6 @@ function respondWithInflightMedia(
|
||||
);
|
||||
}
|
||||
|
||||
async function isUnknownTokenError(response: Response): Promise<boolean> {
|
||||
if (response.status !== 401) return false;
|
||||
try {
|
||||
const data = await response.clone().json();
|
||||
return data?.errcode === 'M_UNKNOWN_TOKEN';
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
async function respondWithMediaAuthRecovery(
|
||||
request: Request,
|
||||
session: SessionInfo,
|
||||
@@ -793,7 +783,6 @@ async function respondWithMediaAuthRecovery(
|
||||
): Promise<Response> {
|
||||
const response = await respondWithInflightMedia(request, session.accessToken, redirect);
|
||||
if ((response.status !== 401 && response.status !== 403) || !clientId) return response;
|
||||
if (await isUnknownTokenError(response)) return response;
|
||||
|
||||
// One exact-client retry; concurrent recoveries share this request.
|
||||
const refreshed = await requestSessionWithTimeout(clientId);
|
||||
|
||||
Reference in new issue
Block a user