[microsoft#3526] Add support for MSI to JS samples and generators - l…

…anguage-generation samples (microsoft#3559) * Adding CloudAdapter to 05.a.multi-turn-prompt-with-language-fallback and fixing linter errors * Add MSI support to JS language-generation samples Co-authored-by: Martin Luccanera <18757147+MartinLuccanera@users.noreply.github.com>
southworks · Nov 3, 2021 · 9dac0f0 · 9dac0f0
1 parent eda231d
commit 9dac0f0
Showing 16 changed files with 48 additions and 24 deletions.
diff --git a/.../javascript_nodejs/language-generation/05.a.multi-turn-prompt-with-language-fallback/.env b/.../javascript_nodejs/language-generation/05.a.multi-turn-prompt-with-language-fallback/.env
@@ -1,2 +1,4 @@
+MicrosoftAppType=
 MicrosoftAppId=
 MicrosoftAppPassword=
+MicrosoftAppTenantId=
diff --git a/...ascript_nodejs/language-generation/05.a.multi-turn-prompt-with-language-fallback/index.js b/...ascript_nodejs/language-generation/05.a.multi-turn-prompt-with-language-fallback/index.js
@@ -27,7 +27,9 @@ const { UserProfileDialog } = require('./dialogs/userProfileDialog');
 
 const credentialsFactory = new ConfigurationServiceClientCredentialFactory({
     MicrosoftAppId: process.env.MicrosoftAppId,
-    MicrosoftAppPassword: process.env.MicrosoftAppPassword
+    MicrosoftAppPassword: process.env.MicrosoftAppPassword,
+    MicrosoftAppType: process.env.MicrosoftAppType,
+    MicrosoftAppTenantId: process.env.MicrosoftAppTenantId
 });
 
 const botFrameworkAuthentication = createBotFrameworkAuthenticationFromConfiguration(null, credentialsFactory);

diff --git a/...ipt_nodejs/language-generation/05.a.multi-turn-prompt-with-language-fallback/package.json b/...ipt_nodejs/language-generation/05.a.multi-turn-prompt-with-language-fallback/package.json
@@ -16,9 +16,9 @@
         "url": "https://github.com/Microsoft/BotBuilder-Samples.git"
     },
     "dependencies": {
-        "botbuilder": "~4.14.0",
-        "botbuilder-dialogs": "~4.14.0",
-        "botbuilder-lg": "~4.14.0",
+        "botbuilder": "~4.15.0-rc0",
+        "botbuilder-dialogs": "~4.15.0-rc0",
+        "botbuilder-lg": "~4.15.0-rc0",
         "dotenv": "^8.2.0",
         "path": "^0.12.7",
         "restify": "~8.5.1"

diff --git a/samples/javascript_nodejs/language-generation/05.multi-turn-prompt/.env b/samples/javascript_nodejs/language-generation/05.multi-turn-prompt/.env
@@ -1,2 +1,4 @@
+MicrosoftAppType=
 MicrosoftAppId=
 MicrosoftAppPassword=
+MicrosoftAppTenantId=
diff --git a/samples/javascript_nodejs/language-generation/05.multi-turn-prompt/index.js b/samples/javascript_nodejs/language-generation/05.multi-turn-prompt/index.js
@@ -27,7 +27,9 @@ const { UserProfileDialog } = require('./dialogs/userProfileDialog');
 
 const credentialsFactory = new ConfigurationServiceClientCredentialFactory({
     MicrosoftAppId: process.env.MicrosoftAppId,
-    MicrosoftAppPassword: process.env.MicrosoftAppPassword
+    MicrosoftAppPassword: process.env.MicrosoftAppPassword,
+    MicrosoftAppType: process.env.MicrosoftAppType,
+    MicrosoftAppTenantId: process.env.MicrosoftAppTenantId
 });
 
 const botFrameworkAuthentication = createBotFrameworkAuthenticationFromConfiguration(null, credentialsFactory);

diff --git a/samples/javascript_nodejs/language-generation/05.multi-turn-prompt/package.json b/samples/javascript_nodejs/language-generation/05.multi-turn-prompt/package.json
@@ -16,9 +16,9 @@
         "url": "https://github.com/Microsoft/BotBuilder-Samples.git"
     },
     "dependencies": {
-        "botbuilder": "~4.14.0",
-        "botbuilder-dialogs": "~4.14.0",
-        "botbuilder-lg": "~4.14.0",
+        "botbuilder": "~4.15.0-rc0",
+        "botbuilder-dialogs": "~4.15.0-rc0",
+        "botbuilder-lg": "~4.15.0-rc0",
         "dotenv": "^8.2.0",
         "path": "^0.12.7",
         "restify": "~8.5.1"

diff --git a/samples/javascript_nodejs/language-generation/06.using-cards/.env b/samples/javascript_nodejs/language-generation/06.using-cards/.env
@@ -1,2 +1,4 @@
+MicrosoftAppType=
 MicrosoftAppId=
-MicrosoftAppPassword=
+MicrosoftAppPassword=
+MicrosoftAppTenantId=
diff --git a/samples/javascript_nodejs/language-generation/06.using-cards/index.js b/samples/javascript_nodejs/language-generation/06.using-cards/index.js
@@ -28,7 +28,9 @@ const { MainDialog } = require('./dialogs/mainDialog');
 
 const credentialsFactory = new ConfigurationServiceClientCredentialFactory({
     MicrosoftAppId: process.env.MicrosoftAppId,
-    MicrosoftAppPassword: process.env.MicrosoftAppPassword
+    MicrosoftAppPassword: process.env.MicrosoftAppPassword,
+    MicrosoftAppType: process.env.MicrosoftAppType,
+    MicrosoftAppTenantId: process.env.MicrosoftAppTenantId
 });
 
 const botFrameworkAuthentication = createBotFrameworkAuthenticationFromConfiguration(null, credentialsFactory);

diff --git a/samples/javascript_nodejs/language-generation/06.using-cards/package.json b/samples/javascript_nodejs/language-generation/06.using-cards/package.json
@@ -16,9 +16,9 @@
         "url": "https://github.com/Microsoft/BotBuilder-Samples.git"
     },
     "dependencies": {
-        "botbuilder": "~4.14.0",
-        "botbuilder-dialogs": "~4.14.0",
-        "botbuilder-lg": "~4.14.0",
+        "botbuilder": "~4.15.0-rc0",
+        "botbuilder-dialogs": "~4.15.0-rc0",
+        "botbuilder-lg": "~4.15.0-rc0",
         "dotenv": "^8.2.0",
         "restify": "~8.5.1"
     },

diff --git a/samples/javascript_nodejs/language-generation/13.core-bot/.env b/samples/javascript_nodejs/language-generation/13.core-bot/.env
@@ -0,0 +1,7 @@
+MicrosoftAppType=
+MicrosoftAppId=
+MicrosoftAppPassword=
+MicrosoftAppTenantId=
+LuisAppId=
+LuisAPIKey=
+LuisAPIHostName=
diff --git a/samples/javascript_nodejs/language-generation/13.core-bot/.gitignore b/samples/javascript_nodejs/language-generation/13.core-bot/.gitignore
@@ -1,4 +1,3 @@
 node_modules/
 .nyc_output/
 .vscode/
-.env
diff --git a/samples/javascript_nodejs/language-generation/13.core-bot/index.js b/samples/javascript_nodejs/language-generation/13.core-bot/index.js
@@ -37,7 +37,9 @@ const BOOKING_DIALOG = 'bookingDialog';
 
 const credentialsFactory = new ConfigurationServiceClientCredentialFactory({
     MicrosoftAppId: process.env.MicrosoftAppId,
-    MicrosoftAppPassword: process.env.MicrosoftAppPassword
+    MicrosoftAppPassword: process.env.MicrosoftAppPassword,
+    MicrosoftAppType: process.env.MicrosoftAppType,
+    MicrosoftAppTenantId: process.env.MicrosoftAppTenantId
 });
 
 const botFrameworkAuthentication = createBotFrameworkAuthenticationFromConfiguration(null, credentialsFactory);

diff --git a/samples/javascript_nodejs/language-generation/13.core-bot/package.json b/samples/javascript_nodejs/language-generation/13.core-bot/package.json
@@ -17,11 +17,11 @@
     },
     "dependencies": {
         "@microsoft/recognizers-text-data-types-timex-expression": "1.1.4",
-        "botbuilder": "~4.14.0",
-        "botbuilder-ai": "~4.14.0",
-        "botbuilder-dialogs": "~4.14.0",
-        "botbuilder-testing": "~4.14.0",
-        "botbuilder-lg": "~4.14.0",
+        "botbuilder": "~4.15.0-rc0",
+        "botbuilder-ai": "~4.15.0-rc0",
+        "botbuilder-dialogs": "~4.15.0-rc0",
+        "botbuilder-testing": "~4.15.0-rc0",
+        "botbuilder-lg": "~4.15.0-rc0",
         "dotenv": "^8.2.0",
         "restify": "~8.5.1"
     },

diff --git a/samples/javascript_nodejs/language-generation/20.custom-functions/.env b/samples/javascript_nodejs/language-generation/20.custom-functions/.env
@@ -1,2 +1,4 @@
+MicrosoftAppType=
 MicrosoftAppId=
 MicrosoftAppPassword=
+MicrosoftAppTenantId=
diff --git a/samples/javascript_nodejs/language-generation/20.custom-functions/index.js b/samples/javascript_nodejs/language-generation/20.custom-functions/index.js
@@ -24,7 +24,9 @@ const { EchoBot } = require('./bot');
 
 const credentialsFactory = new ConfigurationServiceClientCredentialFactory({
     MicrosoftAppId: process.env.MicrosoftAppId,
-    MicrosoftAppPassword: process.env.MicrosoftAppPassword
+    MicrosoftAppPassword: process.env.MicrosoftAppPassword,
+    MicrosoftAppType: process.env.MicrosoftAppType,
+    MicrosoftAppTenantId: process.env.MicrosoftAppTenantId
 });
 
 const botFrameworkAuthentication = createBotFrameworkAuthenticationFromConfiguration(null, credentialsFactory);

diff --git a/samples/javascript_nodejs/language-generation/20.custom-functions/package.json b/samples/javascript_nodejs/language-generation/20.custom-functions/package.json
@@ -16,9 +16,9 @@
         "url": "https://github.com"
     },
     "dependencies": {
-        "botbuilder": "~4.14.0",
-        "botbuilder-lg": "~4.14.0",
-        "adaptive-expressions": "~4.14.0",
+        "botbuilder": "~4.15.0-rc0",
+        "botbuilder-lg": "~4.15.0-rc0",
+        "adaptive-expressions": "~4.15.0-rc0",
         "dotenv": "^8.2.0",
         "restify": "~8.5.1"
     },