Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

fix: Add tenantId to provision azure login #3195

Merged
cwhitten merged 3 commits into from
May 27, 2020
Merged

fix: Add tenantId to provision azure login #3195

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c62b1bb
add tenantId to login
May 27, 2020
8784be4
Merge branch 'master' into qika/fix3160
cwhitten May 27, 2020
acee0d0
Merge branch 'master' into qika/fix3160
cwhitten May 27, 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
12 changes: 6 additions & 6 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 @@ -32,7 +32,7 @@ const usage = () => {
['appId', 'Microsoft App ID (Will create if absent)'],
['luisAuthoringKey', 'LUIS Authoring Key to use when publishing to LUIS'],
['luisAuthoringRegion', 'Azure Region used with LUIS (defaults to westus)'],
['tenantId','ID of your tenant if required (will choose first in list by default)'],
['tenantId', 'ID of your tenant if required (will choose first in list by default)'],
['createLuisResource', 'Create a LUIS resource? Default true'],
['createLuisAuthoringResource', 'Create a LUIS authoring resource? Default true'],
['createCosmosDb', 'Create a CosmosDB? Default true'],
Expand Down Expand Up @@ -198,7 +198,7 @@ const getTenantId = async (accessToken) => {
const selectedTenant = jsonRes.value.shift();
logger({
status: BotProjectDeployLoggerType.PROVISION_INFO,
message: `> Using Tenant ${ selectedTenant.displayName } - ID: ${ selectedTenant.tenantId }`,
message: `> Using Tenant ${selectedTenant.displayName} - ID: ${selectedTenant.tenantId}`,
});
// if alternatives exist, list htem
if (jsonRes.value.length > 0) {
Expand All @@ -210,11 +210,11 @@ const getTenantId = async (accessToken) => {
jsonRes.value.forEach((tenant) => {
logger({
status: BotProjectDeployLoggerType.PROVISION_INFO,
message: chalk.yellow(` * ${ tenant.displayName } - ID: ${ tenant.tenantId }`),
message: chalk.yellow(` * ${tenant.displayName} - ID: ${tenant.tenantId}`),
});
});
}

return selectedTenant.tenantId;
} catch (err) {
throw new Error(`Get Tenant Id Failed, details: ${getErrorMesssage(err)}`);
Expand Down Expand Up @@ -373,7 +373,7 @@ const create = async (
tenantId = token.tenantId;
logger({
status: BotProjectDeployLoggerType.PROVISION_INFO,
message: `> Using Tenant ID: ${ tenantId }`,
message: `> Using Tenant ID: ${tenantId}`,
});
} else {
tenantId = await getTenantId(accessToken);
Expand Down Expand Up @@ -557,7 +557,7 @@ const create = async (

console.log(chalk.bold('Login to Azure:'));
msRestNodeAuth
.interactiveLogin()
.interactiveLogin({ domain: tenantId })
.then(async creds => {
const createResult = await create(
creds,
Expand Down