From e7124d1011a8fac10cefc819c9538a465f548c80 Mon Sep 17 00:00:00 2001 From: Diego Cardozo <42946572+DiegoCardozo94@users.noreply.github.com> Date: Wed, 7 Aug 2019 22:04:35 -0300 Subject: [PATCH 1/2] Add 'msaAppId' to skillManifest model (#1983) --- tools/botskills/src/models/skillManifest.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/botskills/src/models/skillManifest.ts b/tools/botskills/src/models/skillManifest.ts index cdecdca87b..8ea8686f3c 100644 --- a/tools/botskills/src/models/skillManifest.ts +++ b/tools/botskills/src/models/skillManifest.ts @@ -6,6 +6,7 @@ export interface ISkillManifest { id: string; name: string; + msaAppId: string; endpoint: string; description: string; suggestedAction: string; From 73dad993a42779a2915e34f97b213f3c664347c6 Mon Sep 17 00:00:00 2001 From: Martin Battaglino Date: Thu, 22 Aug 2019 15:23:40 -0300 Subject: [PATCH 2/2] Fix tests --- tools/botskills/test/authentication.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/botskills/test/authentication.test.js b/tools/botskills/test/authentication.test.js index a7a426ce1b..9d54a3886a 100644 --- a/tools/botskills/test/authentication.test.js +++ b/tools/botskills/test/authentication.test.js @@ -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`); }); @@ -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`)