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

fix: use subscription api for tenant id retrieving #3359

Merged
merged 3 commits into from
Jun 9, 2020
Merged

fix: use subscription api for tenant id retrieving #3359

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5655e43
use subscription api for tenant id retrieving
Jun 9, 2020
ce428cf
Merge branch 'master' into qika/tenant
cwhitten Jun 9, 2020
eb3c6cf
Merge branch 'master' into qika/tenant
cwhitten Jun 9, 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
13 changes: 6 additions & 7 deletions Composer/packages/lib/bot-deploy/src/botProjectDeploy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,21 +121,20 @@ export class BotProjectDeploy {
'Error: Missing access token. Please provide a non-expired Azure access token. Tokens can be obtained by running az account get-access-token'
);
}
if (!this.subId) {
throw new Error(`Error: Missing subscription Id. Please provide a valid Azure subscription id.`);
}
try {
const tenantUrl = `https://management.azure.com/tenants?api-version=2020-01-01`;
const tenantUrl = `https://management.azure.com/subscriptions/${this.subId}?api-version=2020-01-01`;
const options = {
headers: { Authorization: `Bearer ${this.accessToken}` },
} as rp.RequestPromiseOptions;
const response = await rp.get(tenantUrl, options);
const jsonRes = JSON.parse(response);
if (
jsonRes.value === undefined ||
(jsonRes.value && jsonRes.value.length === 0) ||
(jsonRes.value && jsonRes.value.length > 0 && jsonRes.value[0].tenantId === undefined)
) {
if (jsonRes.tenantId === undefined) {
throw new Error(`No tenants found in the account.`);
}
return jsonRes.value[0].tenantId;
return jsonRes.tenantId;
} catch (err) {
throw new Error(`Get Tenant Id Failed, details: ${this.getErrorMesssage(err)}`);
}
Expand Down
38 changes: 13 additions & 25 deletions Composer/plugins/samples/assets/shared/scripts/provisionComposer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,39 +179,28 @@ const unpackObject = output => {
*/
const getTenantId = async (accessToken) => {
if (!accessToken) {
throw new Error('Error: Missing access token. Please provide a non-expired Azure access token. Tokens can be obtained by running az account get-access-token');
throw new Error(
'Error: Missing access token. Please provide a non-expired Azure access token. Tokens can be obtained by running az account get-access-token'
);
}
if (!subId) {
throw new Error(
`Error: Missing subscription Id. Please provide a valid Azure subscription id.`
);
}
try {
const tenantUrl = `https://management.azure.com/tenants?api-version=2020-01-01`;
const tenantUrl = `https://management.azure.com/subscriptions/${subId}?api-version=2020-01-01`;
const options = {
headers: { Authorization: `Bearer ${accessToken}` },
};
const response = await rp.get(tenantUrl, options);
const jsonRes = JSON.parse(response);
if (jsonRes.value === undefined || (jsonRes.value && jsonRes.value.length === 0) || (jsonRes.value && jsonRes.value.length > 0 && jsonRes.value[0].tenantId === undefined)) {
if (
jsonRes.tenantId === undefined
) {
throw new Error(`No tenants found in the account.`);
}
const selectedTenant = jsonRes.value.shift();
logger({
status: BotProjectDeployLoggerType.PROVISION_INFO,
message: `> Using Tenant ${selectedTenant.displayName} - ID: ${selectedTenant.tenantId}`,
});
// if alternatives exist, list htem
if (jsonRes.value.length > 0) {
logger({
status: BotProjectDeployLoggerType.PROVISION_INFO,
message: chalk.yellow(` Note: You have access to multiple tenants. To specify an alternative, specify --tenantId=<desired tenant ID>`),
});
// list all available tenants
jsonRes.value.forEach((tenant) => {
logger({
status: BotProjectDeployLoggerType.PROVISION_INFO,
message: chalk.yellow(` * ${tenant.displayName} - ID: ${tenant.tenantId}`),
});
});
}

return selectedTenant.tenantId;
return jsonRes.tenantId;
} catch (err) {
throw new Error(`Get Tenant Id Failed, details: ${getErrorMesssage(err)}`);
}
Expand Down Expand Up @@ -364,7 +353,6 @@ const create = async (
const accessToken = token.accessToken;
// the returned access token will almost surely have a tenantId.
// use this as the default if one isn't specified.
// otherwise, fetch a list and use the first, but print available options.
if (token.tenantId) {
tenantId = token.tenantId;
logger({
Expand Down