Skip to content
This repository has been archived by the owner on Jun 30, 2022. It is now read-only.

[Botskills] Add msaAppId property to skillManifest model #2187

Merged
merged 2 commits into from
Aug 28, 2019
Merged

[Botskills] Add msaAppId property to skillManifest model #2187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7124d1
Add 'msaAppId' to skillManifest model (#1983)
DiegoCardozo94 Aug 8, 2019
73dad99
Fix tests
Batta32 Aug 22, 2019
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
1 change: 1 addition & 0 deletions tools/botskills/src/models/skillManifest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
export interface ISkillManifest {
id: string;
name: string;
msaAppId: string;
endpoint: string;
description: string;
suggestedAction: string;
Expand Down
4 changes: 2 additions & 2 deletions tools/botskills/test/authentication.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ describe("The authentication util", function() {

const warningList = configuration.logger.getWarning();
strictEqual(warningList[warningList.length - 1], `For more information on setting up the authentication configuration manually go to:
https://github.com/microsoft/botframework-solutions/blob/master/docs/howto/assistant/linkedaccounts.md#authentication-configuration`);
https://aka.ms/vamanualauthsteps`);
strictEqual(warningList[warningList.length - 2], `There's no Azure Active Directory v2 authentication connection in your Skills manifest. You must configure one of the following connection types MANUALLY in the Azure Portal:
Google`);
});
Expand Down Expand Up @@ -171,7 +171,7 @@ https://github.com/microsoft/botframework-solutions/blob/master/docs/howto/assis

const warningList = configuration.logger.getWarning();
strictEqual(warningList[warningList.length - 1], `For more information on setting up the authentication configuration manually go to:
https://github.com/microsoft/botframework-solutions/blob/master/docs/howto/assistant/linkedaccounts.md#authentication-configuration`);
https://aka.ms/vamanualauthsteps`);
strictEqual(warningList[warningList.length - 2], `You must configure one of the following connection types MANUALLY in the Azure Portal:
Azure Active Directory v2`);
strictEqual(warningList[warningList.length - 3], `There was an error while executing the following command:\n\taz ad app show --id \nMocked function throws an Error`)
Expand Down