Skip to content

Fix broken 401 retry logic and wire forceRefresh through default auth provider #187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jethibau-msft wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix broken 401 retry logic and wire forceRefresh through default auth provider #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Common/Client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ export function getClient<T>(clientClass: RestClientFactory<T>, clientOptions?:

if (!options.authTokenProvider) {
options.authTokenProvider = {
getAuthorizationHeader: (): Promise<string> => {
return getAccessToken().then(token => token ? ("Bearer " + token) : "");
getAuthorizationHeader: (forceRefresh?: boolean): Promise<string> => {
return (getAccessToken as (forceRefresh?: boolean) => Promise<string>)(forceRefresh).then(token => token ? ("Bearer " + token) : "");
}
};
}
Expand Down
16 changes: 9 additions & 7 deletions src/Common/Fetch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,17 +174,17 @@ export async function issueRequest(requestUrl: string, options?: RequestInit, vs
options.credentials = "same-origin";

let refreshToken = false;
let retried = false;

do {
while (true) {

// Ensure we have an authorization token available from the auth manager.
if (vssRequestOptions && vssRequestOptions.authTokenProvider) {
const authHeader = await vssRequestOptions.authTokenProvider.getAuthorizationHeader(refreshToken);
if (authHeader) {
headers.append("Authorization", authHeader);
refreshToken = true;
headers.set("Authorization", authHeader);
}
headers.append("X-TFS-FedAuthRedirect", "Suppress");
headers.set("X-TFS-FedAuthRedirect", "Suppress");
}

// Execute the http request defined by the caller.
Expand All @@ -198,13 +198,15 @@ export async function issueRequest(requestUrl: string, options?: RequestInit, vs
throw error;
}

// If we recieved a 401 and have a token manager, we will refresh our token and try again.
if (response.status === 401 && !refreshToken && vssRequestOptions && vssRequestOptions.authTokenProvider) {
// If we received a 401 and have a token manager, refresh the token and retry once.
if (response.status === 401 && !retried && vssRequestOptions && vssRequestOptions.authTokenProvider) {
retried = true;
refreshToken = true;
continue;
}

} while (false);
break;
}

// Parse error details from requests that returned non 200-299 status codes.
if (!response.ok) {
Expand Down