[Botskills] Fix authentication issue and other minor ones (#1293)

* Fix issue with auth connect * Update packages * Fix issue with disconnect (luisgen) * Add messages for assistantSkillsFile.skills * Add validation for assistantSkillsFile.skills * Update package version
microsoft · May 6, 2019 · 04f1174 · 04f1174
1 parent 1fb3b57
commit 04f1174
Show file tree

Hide file tree

Showing 8 changed files with 914 additions and 171 deletions.
diff --git a/lib/typescript/botskills/package-lock.json b/lib/typescript/botskills/package-lock.json
diff --git a/lib/typescript/botskills/package.json b/lib/typescript/botskills/package.json
@@ -1,6 +1,6 @@
 {
   "name": "botskills",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Skill command line tool for manipulating Microsoft Bot Framework skills",
   "main": "lib/botskills.js",
   "bin": {

diff --git a/lib/typescript/botskills/src/botskills-disconnect.ts b/lib/typescript/botskills/src/botskills-disconnect.ts
@@ -63,6 +63,7 @@ if (csAndTsValidationResult) {
     );
     process.exit(1);
 }
+const projectLanguage: string = args.cs ? 'cs' : 'ts';
 
 // skillId validation
 if (!args.skillId) {
@@ -72,6 +73,7 @@ if (!args.skillId) {
 
 const configuration: Partial<IDisconnectConfiguration> = {
     skillId: args.skillId,
+    lgLanguage: projectLanguage,
     logger: logger
 };
 

diff --git a/lib/typescript/botskills/src/functionality/connectSkill.ts b/lib/typescript/botskills/src/functionality/connectSkill.ts
@@ -158,7 +158,7 @@ export async function connectSkill(configuration: IConnectConfiguration): Promis
     // Take VA Skills configurations
     //tslint:disable-next-line: no-var-requires non-literal-require
     const assistantSkillsFile: ISkillFIle = require(configuration.skillsFile);
-    const assistantSkills: ISkillManifest[] = assistantSkillsFile.skills;
+    const assistantSkills: ISkillManifest[] = assistantSkillsFile.skills || [];
 
     // Check if the skill is already connected to the assistant
     if (assistantSkills.find((assistantSkill: ISkillManifest) => assistantSkill.id === skillManifest.id)) {

diff --git a/lib/typescript/botskills/src/functionality/disconnectSkill.ts b/lib/typescript/botskills/src/functionality/disconnectSkill.ts
@@ -59,7 +59,7 @@ async function updateDispatch(configuration: IDisconnectConfiguration): Promise<
 
     const luisgenCmd: string[] = ['luisgen'];
     luisgenCmd.push(join(configuration.dispatchFolder, dispatchJsonFile));
-    luisgenCmd.push(...[`-${configuration.language}`, '"DispatchLuis"']);
+    luisgenCmd.push(...[`-${configuration.lgLanguage}`, '"DispatchLuis"']);
     luisgenCmd.push(...['-o', configuration.lgOutFolder]);
     await runCommand(luisgenCmd, `Executing luisgen for the ${configuration.dispatchName} file`);
 }
@@ -72,7 +72,7 @@ export async function disconnectSkill(configuration: IDisconnectConfiguration):
     // Take VA Skills configurations
     //tslint:disable-next-line: no-var-requires non-literal-require
     const assistantSkillsFile: ISkillFIle = require(configuration.skillsFile);
-    const assistantSkills: ISkillManifest[] = assistantSkillsFile.skills;
+    const assistantSkills: ISkillManifest[] = assistantSkillsFile.skills || [];
 
     // Check if the skill is present in the assistant
     const skillToRemove: ISkillManifest | undefined = assistantSkills.find((assistantSkill: ISkillManifest) =>

diff --git a/lib/typescript/botskills/src/functionality/listSkill.ts b/lib/typescript/botskills/src/functionality/listSkill.ts
@@ -16,8 +16,12 @@ export async function listSkill(configuration: IListConfiguration): Promise<bool
         //tslint:disable-next-line:non-literal-require
         const assistantSkillsFile: ISkillFIle = require(configuration.skillsFile);
         if (!assistantSkillsFile) {
+            logger.warning(`Impossible to get skills from "${configuration.skillsFile}" file.  Format not compatible.`);
+
             return false;
         } else if (!assistantSkillsFile.skills) {
+            logger.message('There are no Skills connected to the assistant.');
+
             return false;
         }
         const assistantSkills: ISkillManifest[] = assistantSkillsFile.skills;

diff --git a/lib/typescript/botskills/src/models/disconnectConfiguration.ts b/lib/typescript/botskills/src/models/disconnectConfiguration.ts
@@ -15,5 +15,6 @@ export interface IDisconnectConfiguration {
     dispatchFolder: string;
     lgOutFolder: string;
     dispatchName: string;
+    lgLanguage: string;
     logger?: ILogger;
 }
diff --git a/lib/typescript/botskills/src/utils/authenticationUtils.ts b/lib/typescript/botskills/src/utils/authenticationUtils.ts
@@ -160,8 +160,8 @@ export async function authenticate(configuration: IConnectConfiguration, manifes
             const scopeManifest: IScopeManifest[] = createScopeManifest(scopes);
 
             // get the information of the app
-            let azureAppShowCmd: string = `az ad app show`;
-            azureAppShowCmd += `--id ${appSettings.microsoftAppId}`;
+            let azureAppShowCmd: string = `az ad app show `;
+            azureAppShowCmd += `--id ${appSettings.microsoftAppId} `;
             const azureAppShowResult: string = await tryExecute('az', extractArgs(azureAppShowCmd));
             const azureAppReplyUrls: IAppShowReplyUrl = JSON.parse(azureAppShowResult);