[TypeScript][Skill Sample] Add manifest endpoint (#1511)

* Add manifest endpoint * Update template with manifest endpoint
microsoft · Jun 10, 2019 · 14ed4dd · 14ed4dd
1 parent ed41689
commit 14ed4dd
Show file tree

Hide file tree

Showing 9 changed files with 162 additions and 83 deletions.
diff --git a/...sistant-Template/typescript/generator-botbuilder-assistant/generators/skill/src/copier.js b/...sistant-Template/typescript/generator-botbuilder-assistant/generators/skill/src/copier.js
@@ -70,6 +70,10 @@ class Copier {
       path.join(`src`, `bots`, `_dialogBot.ts`),
       path.join(`src`, `bots`, `dialogBot.ts`)
     );
+    templateFiles.set(
+      path.join(`src`, `_manifestTemplate.json`),
+      path.join(`src`, `manifestTemplate.json`)
+    );
     templateFiles.set(
       path.join(`src`, `dialogs`, `_mainDialog.ts`),
       path.join(`src`, `dialogs`, `mainDialog.ts`)

diff --git a/...cript/generator-botbuilder-assistant/generators/skill/templates/customSkill/_package.json b/...cript/generator-botbuilder-assistant/generators/skill/templates/customSkill/_package.json
@@ -27,7 +27,7 @@
         "botbuilder-azure": "^4.4.0",
         "botbuilder-core": "^4.4.0",
         "botbuilder-dialogs": "^4.4.0",
-        "botbuilder-skills": "^4.4.6",
+        "botbuilder-skills": "^1.0.0-preview64",
         "botbuilder-solutions": "^4.4.6",
         "botframework-config": "^4.4.0",
         "botframework-connector": "^4.4.0",

diff --git a/...or-botbuilder-assistant/generators/skill/templates/customSkill/src/_manifestTemplate.json b/...or-botbuilder-assistant/generators/skill/templates/customSkill/src/_manifestTemplate.json
@@ -0,0 +1,26 @@
+{
+  "id": "<%= skillName %>",
+  "name": "<%= skillName %>",
+  "description": "This is the description of the <%= skillName %>",
+  "iconUrl": "",
+  "authenticationConnections": [],
+  "actions": [
+    {
+      "id": "<%= skillName %>_Sample",
+      "definition": {
+        "description": "Trigger <%= skillName %>",
+        "slots": [],
+        "triggers": {
+          "utteranceSources": [
+            {
+              "locale": "en",
+              "source": [
+                "<%= skillName %>#Sample"
+              ]
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/...script/generator-botbuilder-assistant/generators/skill/templates/customSkill/src/index.ts b/...script/generator-botbuilder-assistant/generators/skill/templates/customSkill/src/index.ts
@@ -21,8 +21,9 @@ import {
 import {
     IAuthenticationConnection,
     ISkillManifest,
+    manifestGenerator,
     SkillContext,
-    SkillHttpAdapter} from 'botbuilder-skills';
+    SkillHttpAdapter } from 'botbuilder-skills';
 import {
     ICognitiveModelConfiguration,
     IOAuthConnection,
@@ -31,6 +32,7 @@ import {
     ResponseManager} from 'botbuilder-solutions';
 import i18next from 'i18next';
 import i18nextNodeFsBackend from 'i18next-node-fs-backend';
+import { join } from 'path';
 import * as restify from 'restify';
 import { CustomSkillAdapter } from './adapters/customSkillAdapter';
 import { DefaultAdapter } from './adapters/defaultAdapter';
@@ -193,6 +195,10 @@ server.post('/api/skill/messages', (req: restify.Request, res: restify.Response)
     });
 });
 
+const manifestPath: string = join(__dirname, 'manifestTemplate.json');
+server.use(restify.plugins.queryParser());
+server.get('/api/skill/manifest', manifestGenerator(manifestPath, botSettings));
+
 // This method creates a MultiProviderAuthDialog based on a skill manifest.
 function buildAuthDialog(skill: ISkillManifest, settings: Partial<IBotSettings>): MultiProviderAuthDialog|undefined {
     if (skill.authenticationConnections !== undefined && skill.authenticationConnections.length > 0) {

diff --git a/...tor-botbuilder-assistant/generators/skill/templates/customSkill/src/manifestTemplate.json b/...tor-botbuilder-assistant/generators/skill/templates/customSkill/src/manifestTemplate.json
diff --git a/templates/Virtual-Assistant-Template/typescript/samples/sample-skill/package-lock.json b/templates/Virtual-Assistant-Template/typescript/samples/sample-skill/package-lock.json
diff --git a/templates/Virtual-Assistant-Template/typescript/samples/sample-skill/package.json b/templates/Virtual-Assistant-Template/typescript/samples/sample-skill/package.json
@@ -27,7 +27,7 @@
         "botbuilder-azure": "^4.4.0",
         "botbuilder-core": "^4.4.0",
         "botbuilder-dialogs": "^4.4.0",
-        "botbuilder-skills": "^4.4.6",
+        "botbuilder-skills": "^1.0.0-preview64",
         "botbuilder-solutions": "^4.4.6",
         "botframework-config": "^4.4.0",
         "botframework-connector": "^4.4.0",

diff --git a/templates/Virtual-Assistant-Template/typescript/samples/sample-skill/src/index.ts b/templates/Virtual-Assistant-Template/typescript/samples/sample-skill/src/index.ts
@@ -21,8 +21,9 @@ import {
 import {
     IAuthenticationConnection,
     ISkillManifest,
+    manifestGenerator,
     SkillContext,
-    SkillHttpAdapter} from 'botbuilder-skills';
+    SkillHttpAdapter } from 'botbuilder-skills';
 import {
     ICognitiveModelConfiguration,
     IOAuthConnection,
@@ -31,6 +32,7 @@ import {
     ResponseManager} from 'botbuilder-solutions';
 import i18next from 'i18next';
 import i18nextNodeFsBackend from 'i18next-node-fs-backend';
+import { join } from 'path';
 import * as restify from 'restify';
 import { CustomSkillAdapter } from './adapters/customSkillAdapter';
 import { DefaultAdapter } from './adapters/defaultAdapter';
@@ -193,6 +195,10 @@ server.post('/api/skill/messages', (req: restify.Request, res: restify.Response)
     });
 });
 
+const manifestPath: string = join(__dirname, 'manifestTemplate.json');
+server.use(restify.plugins.queryParser());
+server.get('/api/skill/manifest', manifestGenerator(manifestPath, botSettings));
+
 // This method creates a MultiProviderAuthDialog based on a skill manifest.
 function buildAuthDialog(skill: ISkillManifest, settings: Partial<IBotSettings>): MultiProviderAuthDialog|undefined {
     if (skill.authenticationConnections !== undefined && skill.authenticationConnections.length > 0) {

diff --git a/...ates/Virtual-Assistant-Template/typescript/samples/sample-skill/src/manifestTemplate.json b/...ates/Virtual-Assistant-Template/typescript/samples/sample-skill/src/manifestTemplate.json
@@ -1,37 +1,26 @@
 {
-    "id": "",
-    "name": "",
-    "description": "",
-    "iconUrl": "",
-    "authenticationConnections": [
-      {
-        "id": "",
-        "serviceProviderId": "",
-        "scopes": ""
-      }
-    ],
-    "actions": [
-      {
-        "id": "",
-        "definition": {
-          "description": "",
-          "slots": [
+  "id": "sampleSkill",
+  "name": "Sample Skill",
+  "description": "This is the description of the sample skill",
+  "iconUrl": "",
+  "authenticationConnections": [],
+  "actions": [
+    {
+      "id": "sampleSkill_Sample",
+      "definition": {
+        "description": "Trigger sample skill",
+        "slots": [],
+        "triggers": {
+          "utteranceSources": [
             {
-              "name": "",
-              "types": [ "string" ]
+              "locale": "en",
+              "source": [
+                "sample-skill#Sample"
+              ]
             }
-          ],
-          "triggers": {
-            "utteranceSources": [
-              {
-                "locale": "en",
-                "source": [
-                  "luisModel#intent"
-                ]
-              }
-            ]
-          }
+          ]
         }
       }
-    ]
+    }
+  ]
 }