Skip to content
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

Jump to bottom

[core-client] Fix issue with Storage bearer challenges #28967

Merged
merged 2 commits into from
Mar 19, 2024
Merged

[core-client] Fix issue with Storage bearer challenges #28967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f64885
Fix issue with Storage bearer challenges
xirzec Mar 18, 2024
6774eb0
update changelog
xirzec Mar 18, 2024
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
3 changes: 3 additions & 0 deletions sdk/core/core-client/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

### Bugs Fixed

- Addressed an issue with `authorizeRequestOnTenantChallenge` not correctly parsing challenges. [PR #28967](https://github.com/Azure/azure-sdk-for-js/pull/28967)

### Other Changes

## 1.9.0 (2024-03-12)
Expand All @@ -30,6 +32,7 @@
## 1.7.3 (2023-06-01)

### Other Changes

- remove the validation that credential scopes must be a valid URL [Issue #25881](https://github.com/Azure/azure-sdk-for-js/issues/25881)

## 1.7.2 (2023-02-23)
Expand Down
6 changes: 3 additions & 3 deletions sdk/core/core-client/src/authorizeRequestOnTenantChallenge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,11 @@ function buildScopes(
challengeOptions: AuthorizeRequestOnChallengeOptions,
challengeInfo: Challenge,
): string[] {
if (!challengeInfo.resource_uri) {
if (!challengeInfo.resource_id) {
return challengeOptions.scopes;
}

const challengeScopes = new URL(challengeInfo.resource_uri);
const challengeScopes = new URL(challengeInfo.resource_id);
challengeScopes.pathname = Constants.DefaultScope;
return [challengeScopes.toString()];
}
Expand All @@ -105,7 +105,7 @@ function getChallenge(response: PipelineResponse): string | undefined {
*/
interface Challenge {
authorization_uri: string;
resource_uri?: string;
resource_id?: string;
}

/**
Expand Down
8 changes: 4 additions & 4 deletions sdk/core/core-client/test/authorizeRequestOnTenantChallenge.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ describe("storageBearerTokenChallengeAuthenticationPolicy", function () {

return {
headers: createHttpHeaders({
"WWW-Authenticate": `Bearer authorization_uri=https://login.microsoftonline.com/${fakeGuid}/oauth2/authorize resource_uri=https://storage.azure.com`,
"WWW-Authenticate": `Bearer authorization_uri=https://login.microsoftonline.com/${fakeGuid}/oauth2/authorize resource_id=https://storage.azure.com`,
}),
request: req,
status: 200,
Expand Down Expand Up @@ -113,7 +113,7 @@ describe("storageBearerTokenChallengeAuthenticationPolicy", function () {
assert.equal(req.headers.get("authorization"), "Bearer originalToken");
return {
headers: createHttpHeaders({
"WWW-Authenticate": `Bearer authorization_uri=https://login.microsoftonline.com/${fakeGuid}/oauth2/authorize resource_uri=https://storage.azure.com`,
"WWW-Authenticate": `Bearer authorization_uri=https://login.microsoftonline.com/${fakeGuid}/oauth2/authorize resource_id=https://storage.azure.com`,
}),
request: req,
status: 401,
Expand Down Expand Up @@ -158,7 +158,7 @@ describe("storageBearerTokenChallengeAuthenticationPolicy", function () {
assert.equal(req.headers.get("authorization"), "Bearer originalToken");
return {
headers: createHttpHeaders({
"WWW-Authenticate": `Bearer authorization_uri=https://login.microsoftonline.com/${fakeGuid}/oauth2/authorize resource_uri=https://storage.azure.com`,
"WWW-Authenticate": `Bearer authorization_uri=https://login.microsoftonline.com/${fakeGuid}/oauth2/authorize resource_id=https://storage.azure.com`,
}),
request: req,
status: 401,
Expand Down Expand Up @@ -245,7 +245,7 @@ describe("storageBearerTokenChallengeAuthenticationPolicy", function () {
assert.equal(req.headers.get("authorization"), "Bearer originalToken");
return {
headers: createHttpHeaders({
"WWW-Authenticate": `Bearer authorization_uri=https://login.microsoftonline.com/${fakeGuid}/oauth2/authorize resource_uri=https://storage.azure.com`,
"WWW-Authenticate": `Bearer authorization_uri=https://login.microsoftonline.com/${fakeGuid}/oauth2/authorize resource_id=https://storage.azure.com`,
}),
request: req,
status: 401,
Expand Down