Skip to content

[Identity] Remove version check for now, until other services support it #12164

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

Closed
sophiajt wants to merge 2 commits into from
Closed

[Identity] Remove version check for now, until other services support it #12164

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
35f7faa
Remove version check for now, until other services support it
Oct 29, 2020
408f45b
Remove related test for version
Nov 1, 2020
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
44 changes: 12 additions & 32 deletions sdk/identity/identity/src/credentials/managedIdentityCredential.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,46 +116,26 @@ export class ManagedIdentityCredential implements TokenCredential {
private createAppServiceMsiAuthRequest(
resource: string,
clientId?: string,
version?: "2019-08-01" | "2017-09-01"
_version?: "2019-08-01" | "2017-09-01"
): RequestPrepareOptions {
const queryParameters: any = {
resource,
"api-version": AppServiceMsiApiVersion
};

if (version === "2019-08-01") {
if (clientId) {
queryParameters.client_id = clientId;
}
if (clientId) {
queryParameters.clientid = clientId;
}

return {
url: process.env.IDENTITY_ENDPOINT,
method: "GET",
queryParameters,
headers: {
Accept: "application/json",
"X-IDENTITY-HEADER": process.env.IDENTITY_HEADER
}
};
} else if (version === "2017-09-01") {
if (clientId) {
queryParameters.clientid = clientId;
return {
url: process.env.MSI_ENDPOINT,
method: "GET",
queryParameters,
headers: {
Accept: "application/json",
secret: process.env.MSI_SECRET
}

return {
url: process.env.MSI_ENDPOINT,
method: "GET",
queryParameters,
headers: {
Accept: "application/json",
secret: process.env.MSI_SECRET
}
};
} else {
throw new Error(
`Unsupported version ${version}. The supported versions are "2019-08-01" and "2017-09-01"`
);
}
};
}

private createCloudShellMsiAuthRequest(
Expand Down
73 changes: 37 additions & 36 deletions sdk/identity/identity/test/internal/node/managedIdentityCredential.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,43 +134,44 @@ describe("ManagedIdentityCredential", function() {
// assert.strictEqual(mockHttpClient.requests.length, 1);
// });

it("sends an authorization request correctly in an App Service environment version 2019-08-01", async () => {
// Trigger App Service behavior by setting environment variables
process.env.IDENTITY_ENDPOINT = "https://endpoint";
process.env.IDENTITY_HEADER = "secret";

const authDetails = await getMsiTokenAuthRequest(["https://service/.default"], "client", {
authResponse: {
status: 200,
parsedBody: {
token: "token",
expires_on: "1560999478"
}
}
});
// Currently not enabled. Re-enable when we add back in API version support for this API version
// it("sends an authorization request correctly in an App Service environment version 2019-08-01", async () => {
// // Trigger App Service behavior by setting environment variables
// process.env.IDENTITY_ENDPOINT = "https://endpoint";
// process.env.IDENTITY_HEADER = "secret";

// const authDetails = await getMsiTokenAuthRequest(["https://service/.default"], "client", {
// authResponse: {
// status: 200,
// parsedBody: {
// token: "token",
// expires_on: "1560999478"
// }
// }
// });

const authRequest = authDetails.requests[0];
assert.ok(authRequest.query, "No query string parameters on request");
if (authRequest.query) {
assert.equal(authRequest.method, "GET");
assert.equal(authRequest.query["client_id"], "client");
assert.equal(decodeURIComponent(authRequest.query["resource"]), "https://service");
assert.ok(
authRequest.url.startsWith(process.env.IDENTITY_ENDPOINT),
"URL does not start with expected host and path"
);
assert.equal(authRequest.headers.get("X-IDENTITY-HEADER"), process.env.IDENTITY_HEADER);
assert.ok(
authRequest.url.indexOf(`api-version=${AppServiceMsiApiVersion}`) > -1,
"URL does not have expected version"
);
if (authDetails.token) {
assert.equal(authDetails.token.expiresOnTimestamp, 1560999478);
} else {
assert.fail("No token was returned!");
}
}
});
// const authRequest = authDetails.requests[0];
// assert.ok(authRequest.query, "No query string parameters on request");
// if (authRequest.query) {
// assert.equal(authRequest.method, "GET");
// assert.equal(authRequest.query["client_id"], "client");
// assert.equal(decodeURIComponent(authRequest.query["resource"]), "https://service");
// assert.ok(
// authRequest.url.startsWith(process.env.IDENTITY_ENDPOINT),
// "URL does not start with expected host and path"
// );
// assert.equal(authRequest.headers.get("X-IDENTITY-HEADER"), process.env.IDENTITY_HEADER);
// assert.ok(
// authRequest.url.indexOf(`api-version=${AppServiceMsiApiVersion}`) > -1,
// "URL does not have expected version"
// );
// if (authDetails.token) {
// assert.equal(authDetails.token.expiresOnTimestamp, 1560999478);
// } else {
// assert.fail("No token was returned!");
// }
// }
// });

it("sends an authorization request correctly in an App Service environment", async () => {
// Trigger App Service behavior by setting environment variables
Expand Down