Merge pull request #3830 from southworks/internal/feature/southworks/…

…virtual-assistant/allowedCallersClaimsValidator-issue [TypeScript][Virtual Assistant] Add claim's validation if the VA is not connected to Skills
microsoft · Jun 21, 2021 · 25c80c0 · 25c80c0
2 parents 60f6ed7 + 005d25d
commit 25c80c0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/...ipt/generator-bot-virtualassistant/generators/app/templates/sample-assistant/src/index.ts b/...ipt/generator-bot-virtualassistant/generators/app/templates/sample-assistant/src/index.ts
@@ -77,12 +77,16 @@ const credentialProvider: SimpleCredentialProvider = new SimpleCredentialProvide
 // Register the skills configuration class.
 const skillsConfig: SkillsConfiguration = new SkillsConfiguration(appsettings.botFrameworkSkills as IEnhancedBotFrameworkSkill[], appsettings.skillHostEndpoint);
 
+let authenticationConfiguration = new AuthenticationConfiguration();
+
 // Register AuthConfiguration to enable custom claim validation.
-const allowedCallers: string[] = [...skillsConfig.skills.values()].map(skill => skill.appId);
-const authenticationConfiguration = new AuthenticationConfiguration(
-    undefined,
-    allowedCallersClaimsValidator(allowedCallers)
-);
+if (skillsConfig.skills.size > 0) {
+    const allowedCallers: string[] = [...skillsConfig.skills.values()].map(skill => skill.appId);
+    authenticationConfiguration = new AuthenticationConfiguration(
+        undefined,
+        allowedCallersClaimsValidator(allowedCallers)
+    );
+}
 
 // Configure telemetry
 const telemetryClient: BotTelemetryClient = getTelemetryClient(settings);

diff --git a/templates/typescript/samples/sample-assistant/src/index.ts b/templates/typescript/samples/sample-assistant/src/index.ts
@@ -77,12 +77,16 @@ const credentialProvider: SimpleCredentialProvider = new SimpleCredentialProvide
 // Register the skills configuration class.
 const skillsConfig: SkillsConfiguration = new SkillsConfiguration(appsettings.botFrameworkSkills as IEnhancedBotFrameworkSkill[], appsettings.skillHostEndpoint);
 
+let authenticationConfiguration = new AuthenticationConfiguration();
+
 // Register AuthConfiguration to enable custom claim validation.
-const allowedCallers: string[] = [...skillsConfig.skills.values()].map(skill => skill.appId);
-const authenticationConfiguration = new AuthenticationConfiguration(
-    undefined,
-    allowedCallersClaimsValidator(allowedCallers)
-);
+if (skillsConfig.skills.size > 0) {
+    const allowedCallers: string[] = [...skillsConfig.skills.values()].map(skill => skill.appId);
+    authenticationConfiguration = new AuthenticationConfiguration(
+        undefined,
+        allowedCallersClaimsValidator(allowedCallers)
+    );
+}
 
 // Configure telemetry
 const telemetryClient: BotTelemetryClient = getTelemetryClient(settings);