Commit25c80c0

authored

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

2 parents60f6ed7 +005d25d commit25c80c0Copy full SHA for 25c80c0

File tree

+18

-10

lines changed

templates/typescript
- generator-bot-virtualassistant/generators/app/templates/sample-assistant/src
  - index.ts
- samples/sample-assistant/src
  - index.ts

+18

-10

lines changed

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -77,12 +77,16 @@ const credentialProvider: SimpleCredentialProvider = new SimpleCredentialProvide`
`77`	`77`	`// Register the skills configuration class.`
`78`	`78`	`constskillsConfig:SkillsConfiguration=newSkillsConfiguration(appsettings.botFrameworkSkillsasIEnhancedBotFrameworkSkill[],appsettings.skillHostEndpoint);`
`79`	`79`
	`80`	`+letauthenticationConfiguration=newAuthenticationConfiguration();`
	`81`	`+`
`80`	`82`	`// Register AuthConfiguration to enable custom claim validation.`
`81`		`-constallowedCallers:string[]=[...skillsConfig.skills.values()].map(skill=>skill.appId);`
`82`		`-constauthenticationConfiguration=newAuthenticationConfiguration(`
`83`		`-undefined,`
`84`		`-allowedCallersClaimsValidator(allowedCallers)`
`85`		`-);`
	`83`	`+if(skillsConfig.skills.size>0){`
	`84`	`+constallowedCallers:string[]=[...skillsConfig.skills.values()].map(skill=>skill.appId);`
	`85`	`+authenticationConfiguration=newAuthenticationConfiguration(`
	`86`	`+undefined,`
	`87`	`+allowedCallersClaimsValidator(allowedCallers)`
	`88`	`+);`
	`89`	`+}`
`86`	`90`
`87`	`91`	`// Configure telemetry`
`88`	`92`	`consttelemetryClient:BotTelemetryClient=getTelemetryClient(settings);`

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -77,12 +77,16 @@ const credentialProvider: SimpleCredentialProvider = new SimpleCredentialProvide`
`77`	`77`	`// Register the skills configuration class.`
`78`	`78`	`constskillsConfig:SkillsConfiguration=newSkillsConfiguration(appsettings.botFrameworkSkillsasIEnhancedBotFrameworkSkill[],appsettings.skillHostEndpoint);`
`79`	`79`
	`80`	`+letauthenticationConfiguration=newAuthenticationConfiguration();`
	`81`	`+`
`80`	`82`	`// Register AuthConfiguration to enable custom claim validation.`
`81`		`-constallowedCallers:string[]=[...skillsConfig.skills.values()].map(skill=>skill.appId);`
`82`		`-constauthenticationConfiguration=newAuthenticationConfiguration(`
`83`		`-undefined,`
`84`		`-allowedCallersClaimsValidator(allowedCallers)`
`85`		`-);`
	`83`	`+if(skillsConfig.skills.size>0){`
	`84`	`+constallowedCallers:string[]=[...skillsConfig.skills.values()].map(skill=>skill.appId);`
	`85`	`+authenticationConfiguration=newAuthenticationConfiguration(`
	`86`	`+undefined,`
	`87`	`+allowedCallersClaimsValidator(allowedCallers)`
	`88`	`+);`
	`89`	`+}`
`86`	`90`
`87`	`91`	`// Configure telemetry`
`88`	`92`	`consttelemetryClient:BotTelemetryClient=getTelemetryClient(settings);`

Comments

(0)