Merge pull request microsoft#76 from southworkscom/node-botbuilder-up…

…dates [Node] Update to botbuilder 3.7.0
DotBotShotDead · Mar 7, 2017 · 34bc9f6 · 34bc9f6
2 parents 3e420ef + 27b9eba
commit 34bc9f6
Show file tree

Hide file tree

Showing 24 changed files with 45 additions and 41 deletions.
diff --git a/Node/cards-CarouselCards/package.json b/Node/cards-CarouselCards/package.json
@@ -21,7 +21,7 @@
     "url": "https://github.com/Microsoft/BotBuilder-Samples.git"
   },
   "dependencies": {
-    "botbuilder": "^3.6.0",
+    "botbuilder": "^3.7.0",
     "restify": "^4.3.0",
     "dotenv-extended": "^1.0.4"
   }

diff --git a/Node/cards-RichCards/package.json b/Node/cards-RichCards/package.json
@@ -21,7 +21,7 @@
     "url": "https://github.com/Microsoft/BotBuilder-Samples.git"
   },
   "dependencies": {
-    "botbuilder": "^3.6.0",
+    "botbuilder": "^3.7.0",
     "restify": "^4.3.0",
     "dotenv-extended": "^1.0.4"
   }

diff --git a/Node/core-AppInsights/package.json b/Node/core-AppInsights/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "applicationinsights": "^0.17.2",
-    "botbuilder": "^3.6.0",
+    "botbuilder": "^3.7.0",
     "dotenv-extended": "^1.0.4",
     "restify": "^4.3.0"
   }

diff --git a/Node/core-ChannelData/package.json b/Node/core-ChannelData/package.json
@@ -21,7 +21,7 @@
     "url": "https://github.com/Microsoft/BotBuilder-Samples.git"
   },
   "dependencies": {
-    "botbuilder": "^3.6.0",
+    "botbuilder": "^3.7.0",
     "dotenv-extended": "^1.0.4",
     "restify": "^4.3.0"
   }

diff --git a/Node/core-CreateNewConversation/package.json b/Node/core-CreateNewConversation/package.json
@@ -21,7 +21,7 @@
     "url": "https://github.com/Microsoft/BotBuilder-Samples.git"
   },
   "dependencies": {
-    "botbuilder": "^3.6.0",
+    "botbuilder": "^3.7.0",
     "restify": "^4.3.0",
     "dotenv-extended": "^1.0.4"
   }

diff --git a/Node/core-CustomState/package.json b/Node/core-CustomState/package.json
@@ -21,7 +21,7 @@
     "url": "https://github.com/Microsoft/BotBuilder-Samples.git"
   },
   "dependencies": {
-    "botbuilder": "^3.6.0",
+    "botbuilder": "^3.7.0",
     "botbuilder-azure": "^3.0.2",
     "dotenv-extended": "^1.0.4",
     "restify": "^4.3.0"

diff --git a/Node/core-DirectLine/DirectLineBot/package.json b/Node/core-DirectLine/DirectLineBot/package.json
@@ -21,7 +21,7 @@
     "url": "https://github.com/Microsoft/BotBuilder-Samples.git"
   },
   "dependencies": {
-    "botbuilder": "^3.6.0",
+    "botbuilder": "^3.7.0",
     "dotenv-extended": "^1.0.4",
     "restify": "^4.3.0"
   }

diff --git a/Node/core-GetConversationMembers/README.md b/Node/core-GetConversationMembers/README.md
@@ -63,13 +63,13 @@ var connectorApiClient = new Swagger({
 });
 ````
 
-Once a message is received in a group conversation, we'll ask the API for its members. In order to call the REST API, we need to be authenticated using the bot's JWT token (see [app.js - addTokenToClient function](app.js#L85-95)) and then override the API's hostname using the channel's serviceUrl (see [app.js - client.setHost](app.js#L41-L43)).
-Then we call Swagger generated client (`client.Conversations.Conversations_GetConversationMembers`) and pass the response to a helper function that will print the members list to the conversation ([app.js - printMembersInChannel function](app.js#L97-L108)).
+Once a message is received in a group conversation, we'll ask the API for its members. In order to call the REST API, we need to be authenticated using the bot's JWT token (see [app.js - addTokenToClient function](app.js#L86-96)) and then override the API's hostname using the channel's serviceUrl (see [app.js - client.setHost](app.js#L41-L45)).
+Then we call Swagger generated client (`client.Conversations.Conversations_GetConversationMembers`) and pass the response to a helper function that will print the members list to the conversation ([app.js - printMembersInChannel function](app.js#L98-L109)).
 
 ````JavaScript
 // Helper methods
 
-// Inject the conenctor's JWT token into to the Swagger client
+// Inject the connector's JWT token into to the Swagger client
 function addTokenToClient(connector, clientPromise) {
     // ask the connector for the token. If it expired, a new token will be requested to the API
     var obtainToken = Promise.promisify(connector.getAccessToken.bind(connector));

diff --git a/Node/core-GetConversationMembers/app.js b/Node/core-GetConversationMembers/app.js
@@ -38,17 +38,18 @@ var bot = new builder.UniversalBot(connector, function (session) {
 
     // 1. inject the JWT from the connector to the client on every call
     addTokenToClient(connector, connectorApiClient).then(function (client) {
-        // 2. override API client host (api.botframework.com) with channel's serviceHost (e.g.: slack.botframework.com)
-        var serviceHost = url.parse(message.address.serviceUrl).host;
-        client.setHost(serviceHost);
+        // 2. override API client host and schema (https://api.botframework.com) with channel's serviceHost (e.g.: https://slack.botframework.com or http://localhost:NNNN)
+        var serviceUrl = url.parse(message.address.serviceUrl);
+        var serviceScheme = serviceUrl.protocol.split(':')[0];
+        client.setSchemes([serviceScheme]);
+        client.setHost(serviceUrl.host);
         // 3. GET /v3/conversations/{conversationId}/members
-        client.Conversations.Conversations_GetConversationMembers({ conversationId: conversationId })
+        return client.Conversations.Conversations_GetConversationMembers({ conversationId: conversationId })
             .then(function (res) {
                 printMembersInChannel(message.address, res.obj);
-            })
-            .catch(function (error) {
-                console.log('Error retrieving conversation members: ' + error.statusText);
             });
+    }).catch(function (error) {
+        console.log('Error retrieving conversation members', error);
     });
 });
 
@@ -82,7 +83,7 @@ bot.on('conversationUpdate', function (message) {
 
 // Helper methods
 
-// Inject the conenctor's JWT token into to the Swagger client
+// Inject the connector's JWT token into to the Swagger client
 function addTokenToClient(connector, clientPromise) {
     // ask the connector for the token. If it expired, a new token will be requested to the API
     var obtainToken = Promise.promisify(connector.getAccessToken.bind(connector));

diff --git a/Node/core-GetConversationMembers/package.json b/Node/core-GetConversationMembers/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "bluebird": "^3.4.7",
-    "botbuilder": "^3.6.0",
+    "botbuilder": "^3.7.0",
     "restify": "^4.3.0",
     "swagger-client": "^2.1.26",
     "dotenv-extended": "^1.0.4"

diff --git a/Node/core-MultiDialogs/package.json b/Node/core-MultiDialogs/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "bluebird": "^3.4.7",
-    "botbuilder": "^3.6.0",
+    "botbuilder": "^3.7.0",
     "restify": "^4.3.0",
     "dotenv-extended": "^1.0.4"
   }

diff --git a/Node/core-ReceiveAttachment/package.json b/Node/core-ReceiveAttachment/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "bluebird": "^3.4.7",
-    "botbuilder": "^3.6.0",
+    "botbuilder": "^3.7.0",
     "request": "^2.79.0",
     "request-promise": "^4.1.1",
     "restify": "^4.3.0",

diff --git a/Node/core-SendAttachment/README.md b/Node/core-SendAttachment/README.md
@@ -59,11 +59,11 @@ It does require a few more steps than the other methods, but leverages the chann
 0. Read (or generate) the content file and store it in a Buffer for encoding to base64 ([relevant code](./app.js#L131))
 1. Create a client to the Connector API ([relevant code](./app.js#L12-L17))
 2. Inject the Bot Connector's token into the Connector API client ([relevant code](./app.js#L151))
-3. Set the Connector API client service url to the Connector's ([relevant code](./app.js#L152-L155))
-4. Upload the base64 encoded payload to the conversations/attachments endpoint ([relevant code](./app.js#L157-L167))
-5. Use the returned attachmentId to generate the contentUrl ([relevant code](./app.js#L169-L173))
+3. Set the Connector API client service url to the Connector's ([relevant code](./app.js#L152-L156))
+4. Upload the base64 encoded payload to the conversations/attachments endpoint ([relevant code](./app.js#L158-L168))
+5. Use the returned attachmentId to generate the contentUrl ([relevant code](./app.js#L170-L174))
 
-This sample provides a [helper method](./app.js#L128-L176) you can use that encapsulates most of the previous steps.
+This sample provides a [helper method](./app.js#L128-L177) you can use that encapsulates most of the previous steps.
 
 ````JavaScript
 // read file content and upload

diff --git a/Node/core-SendAttachment/app.js b/Node/core-SendAttachment/app.js
@@ -130,7 +130,7 @@ function uploadAttachment(fileData, contentType, fileName, connector, connectorA
 
     var base64 = Buffer.from(fileData).toString('base64');
 
-    // Inject the conenctor's JWT token into to the Swagger client
+    // Inject the connector's JWT token into to the Swagger client
     function addTokenToClient(connector, clientPromise) {
         // ask the connector for the token. If it expired, a new token will be requested to the API
         var obtainToken = Promise.promisify(connector.addAccessToken.bind(connector));
@@ -149,10 +149,11 @@ function uploadAttachment(fileData, contentType, fileName, connector, connectorA
 
     // 1. inject the JWT from the connector to the client on every call
     return addTokenToClient(connector, connectorApiClient).then(function (client) {
-        // 2. override API client host (api.botframework.com) with channel's serviceHost (e.g.: slack.botframework.com)
+        // 2. override API client host and schema (https://api.botframework.com) with channel's serviceHost (e.g.: https://slack.botframework.com or http://localhost:NNNN)
         var serviceUrl = url.parse(baseServiceUrl);
-        var serviceHost = serviceUrl.host;
-        client.setHost(serviceHost);
+        var serviceScheme = serviceUrl.protocol.split(':')[0];
+        client.setSchemes([serviceScheme]);
+        client.setHost(serviceUrl.host);
 
         // 3. POST /v3/conversations/{conversationId}/attachments
         var uploadParameters = {

diff --git a/Node/core-SendAttachment/package.json b/Node/core-SendAttachment/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "bluebird": "^3.4.7",
-    "botbuilder": "^3.6.0",
+    "botbuilder": "^3.7.0",
     "restify": "^4.3.0",
     "swagger-client": "^2.1.32",
     "dotenv-extended": "^1.0.4"

diff --git a/Node/core-State/package.json b/Node/core-State/package.json
@@ -21,7 +21,7 @@
     "url": "https://github.com/Microsoft/BotBuilder-Samples.git"
   },
   "dependencies": {
-    "botbuilder": "^3.6.0",
+    "botbuilder": "^3.7.0",
     "restify": "^4.3.0",
     "dotenv-extended": "^1.0.4"
   }

diff --git a/Node/demo-ContosoFlowers/README.md b/Node/demo-ContosoFlowers/README.md
@@ -170,7 +170,7 @@ And this is how you can call the validator from your existing code:
 > It is worth noting that calling other dialogs within your library don't need to be prefixed with the library's id. It is only when crossing from one library context to another that you need to include the library name prefix on your `session.beginDialog()` calls.
 
 Another example of a reusable library is the [BotBuilder's Location picker control](https://github.com/Microsoft/BotBuilder-Location). Once the module is added to your project dependencies, you can register it with your bot and start using it.
-Checkout the [address dialog](bot/dialogs/address.js#L6-L29) to see its usage within Contoso Flowers.
+Checkout the [address dialog](bot/dialogs/address.js#L6-L30) to see its usage within Contoso Flowers.
 
 ````JavaScript
 var lib = new builder.Library('address');
@@ -186,6 +186,7 @@ lib.dialog('/', [
             prompt: 'What is your address?',
             useNativeControl: true,
             reverseGeocode: true,
+            skipConfirmationAsk: true,
             requiredFields:
                 locationDialog.LocationRequiredFields.streetAddress |
                 locationDialog.LocationRequiredFields.locality |

diff --git a/Node/demo-ContosoFlowers/bot/dialogs/address.js b/Node/demo-ContosoFlowers/bot/dialogs/address.js
@@ -19,6 +19,7 @@ lib.dialog('/', [
             prompt: promptMessage,
             useNativeControl: true,
             reverseGeocode: true,
+            skipConfirmationAsk: true,
             requiredFields:
                 locationDialog.LocationRequiredFields.streetAddress |
                 locationDialog.LocationRequiredFields.locality |

diff --git a/Node/demo-ContosoFlowers/package.json b/Node/demo-ContosoFlowers/package.json
@@ -23,14 +23,14 @@
   "dependencies": {
     "bluebird": "^3.4.7",
     "body-parser": "^1.15.2",
-    "botbuilder": "^3.6.0",
-    "botbuilder-location": "^1.0.3",
+    "botbuilder": "^3.7.0",
+    "botbuilder-location": "^1.1.0",
+    "dotenv-extended": "^1.0.4",
     "express": "^4.14.0",
     "geobing": "^0.1.3",
     "lodash": "^4.17.4",
     "pug": "^2.0.0-beta6",
     "serve-favicon": "^2.3.2",
-    "uuid": "^3.0.1",
-    "dotenv-extended": "^1.0.4"
+    "uuid": "^3.0.1"
   }
 }
diff --git a/Node/demo-Search/package.json b/Node/demo-Search/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "bluebird": "^3.4.7",
-    "botbuilder": "^3.6.0",
+    "botbuilder": "^3.7.0",
     "lodash": "^4.17.4",
     "lorem-ipsum": "^1.0.3",
     "node-uuid": "^1.4.7",

diff --git a/Node/intelligence-ImageCaption/package.json b/Node/intelligence-ImageCaption/package.json
@@ -21,7 +21,7 @@
     "url": "https://github.com/Microsoft/BotBuilder-Samples.git"
   },
   "dependencies": {
-    "botbuilder": "^3.6.0",
+    "botbuilder": "^3.7.0",
     "dotenv-extended": "^1.0.4",
     "needle": "^1.4.3",
     "request": "^2.79.0",

diff --git a/Node/intelligence-LUIS/package.json b/Node/intelligence-LUIS/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "bluebird": "^3.4.7",
-    "botbuilder": "^3.6.0",
+    "botbuilder": "^3.7.0",
     "dotenv-extended": "^1.0.4",
     "request": "^2.79.0",
     "restify": "^4.3.0"

diff --git a/Node/intelligence-SimilarProducts/package.json b/Node/intelligence-SimilarProducts/package.json
@@ -8,7 +8,7 @@
   "author": "Microsoft Corp.",
   "license": "MIT",
   "dependencies": {
-    "botbuilder": "^3.6.0",
+    "botbuilder": "^3.7.0",
     "dotenv-extended": "^1.0.4",
     "request": "^2.79.0",
     "restify": "^4.3.0",

diff --git a/Node/intelligence-SpeechToText/package.json b/Node/intelligence-SpeechToText/package.json
@@ -21,7 +21,7 @@
     "url": "https://github.com/Microsoft/BotBuilder-Samples.git"
   },
   "dependencies": {
-    "botbuilder": "^3.6.0",
+    "botbuilder": "^3.7.0",
     "dotenv-extended": "^1.0.4",
     "needle": "^1.4.3",
     "node-uuid": "^1.4.7",