Handle attachments. Enable/disable public folder.

hinojosachapel · May 23, 2021 · 28e0cf3 · 28e0cf3
1 parent 8e9aea1
commit 28e0cf3
Show file tree

Hide file tree

Showing 15 changed files with 63 additions and 26 deletions.
diff --git a/javascript_nodejs/.vscode/launch.json b/javascript_nodejs/.vscode/launch.json
@@ -5,10 +5,16 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "type": "node",
+            "type": "pwa-node",
             "request": "launch",
             "name": "dev",
-            "program": "${workspaceFolder}/src/index.js"
+            "program": "${workspaceFolder}/src/index.js",
+            "trace": true,
+            "sourceMaps": true,
+            "resolveSourceMapLocations": [
+                "${workspaceFolder}/**",
+                "!**/node_modules/**"
+            ]
         }
     ]
 }
diff --git a/javascript_nodejs/README.md b/javascript_nodejs/README.md
@@ -46,7 +46,8 @@
       "databaseId": "<YOUR_DATABASE_ID>",
       "containerId": "<YOUR_COLLECTION_ID>"
     },
-    "publicResourcesUrl": "http://localhost:3978"
+    "publicResourcesUrl": "http://localhost:3978",
+    "allowPublicFolder": "true"
   }
   ```
 

diff --git a/javascript_nodejs/package.json b/javascript_nodejs/package.json
@@ -6,8 +6,8 @@
     "license": "MIT",
     "main": "index.js",
     "scripts": {
-        "start": "node ./index.js",
-        "watch": "nodemon ./index.js",
+        "start": "node ./src/index.js",
+        "watch": "nodemon ./src/index.js",
         "lint": "./node_modules/.bin/eslint .",
         "test": "echo \"Error: no test specified\" && exit 1"
     },

diff --git a/javascript_nodejs/src/dialogs/main/index.js b/javascript_nodejs/src/dialogs/main/index.js
@@ -129,6 +129,13 @@ class MainDialog extends ComponentDialog {
         let turnResult = DIALOG_TURN_RESULT_DEFAULT;
         const utterance = (dc.context.activity.text || '').trim().toLowerCase();
 
+        // Look for attachments. Only answer if no text message.
+        if (utterance.length === 0 && dc.context.activity.attachments && dc.context.activity.attachments.length > 0) {
+            // The user sent an attachment and the bot should handle the incoming attachment.
+            await dc.context.sendActivity(localizer.gettext(locale, 'attachmentResponse'));
+            return DIALOG_TURN_RESULT_DEFAULT;
+        }
+
         // Handle commands
         if (utterance === localizer.gettext(locale, 'restartCommand').toLowerCase()) {
             let userData = new UserData();

diff --git a/javascript_nodejs/src/dialogs/shared/utils.js b/javascript_nodejs/src/dialogs/shared/utils.js
@@ -77,7 +77,7 @@ class Utils {
         }
 
         return {
-            value: 'yes',
+            value: title,
             action: {
                 type: 'imBack',
                 title: title,
@@ -104,7 +104,7 @@ class Utils {
         }
 
         return {
-            value: 'no',
+            value: title,
             action: {
                 type: 'imBack',
                 title: title,

diff --git a/javascript_nodejs/src/index.js b/javascript_nodejs/src/index.js
@@ -93,10 +93,12 @@ server.listen(process.env.port || process.env.PORT || 3978, () => {
     console.log('\nGet more info at: https://github.com/microsoft/BotFramework-Emulator/wiki/Getting-Started');
 });
 
-// Serve static files
-server.get('/public/*', restify.plugins.serveStatic({
-    directory: __dirname
-}));
+if (appsettings.allowPublicFolder === 'true') {
+    // Serve static files
+    server.get('/public/*', restify.plugins.serveStatic({
+        directory: __dirname
+    }));
+}
 
 // Listen for incoming activities and route them to your bot main dialog.
 server.post('/api/messages', (req, res) => {

diff --git a/javascript_nodejs/src/locales/en-US.json b/javascript_nodejs/src/locales/en-US.json
@@ -125,6 +125,7 @@
 		]
 	},
 	"readyPrompt": "What can I do for you? \r (Choose one or type your own question)",
+	"attachmentResponse": "Thanks! 👍",
 	"profanity": "That hurt my feelings. 😓 If you are stuck, just type \"**help**\" and I'll tell you some hints.",
 	"restartCommand": "Restart"
 }
diff --git a/javascript_nodejs/src/public/webchat.html b/javascript_nodejs/src/public/webchat.html
@@ -4,7 +4,7 @@
     <title>Coreplus Chatbot</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta charset="UTF-8" />
-    <script src="https://cdn.botframework.com/botframework-webchat/master/webchat.js"></script>
+    <script crossorigin="anonymous" src="https://cdn.botframework.com/botframework-webchat/latest/webchat.js"></script>
     <style>
       html, body { height: 100% }
       body { margin: 0 }

diff --git a/typescript_nodejs/.vscode/launch.json b/typescript_nodejs/.vscode/launch.json
@@ -5,9 +5,9 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "type": "node",
+            "type": "pwa-node",
             "request": "launch",
-            "name": "dev Typescript",         
+            "name": "dev Typescript",
             "args": [
                 "src/index.ts"
             ],
@@ -16,14 +16,23 @@
                 "ts-node/register"
             ],
             "cwd": "${workspaceFolder}",
-            "protocol": "inspector",
-            "internalConsoleOptions": "openOnSessionStart"           
+            "internalConsoleOptions": "openOnSessionStart",
+            "resolveSourceMapLocations": [
+                "${workspaceFolder}/**",
+                "!**/node_modules/**"
+            ]
         },
         {
-            "type": "node",
+            "type": "pwa-node",
             "request": "launch",
             "name": "dev JavaScript",
-            "program": "${workspaceFolder}/build/index.js"
+            "program": "${workspaceFolder}/build/index.js",
+            "trace": true,
+            "sourceMaps": true,
+            "resolveSourceMapLocations": [
+                "${workspaceFolder}/**",
+                "!**/node_modules/**"
+            ]
         }
     ]
 }
diff --git a/typescript_nodejs/README.md b/typescript_nodejs/README.md
@@ -47,7 +47,8 @@
       "databaseId": "<YOUR_DATABASE_ID>",
       "containerId": "<YOUR_COLLECTION_ID>"
     },
-    "publicResourcesUrl": "http://localhost:3978"
+    "publicResourcesUrl": "http://localhost:3978",
+    "allowPublicFolder": "true"
   }
   ```
 

diff --git a/typescript_nodejs/src/dialogs/main/index.ts b/typescript_nodejs/src/dialogs/main/index.ts
@@ -139,6 +139,13 @@ export class MainDialog extends ComponentDialog {
         let turnResult: DialogTurnResult = DIALOG_TURN_RESULT_DEFAULT;
         const utterance: string = (dc.context.activity.text || '').trim().toLowerCase();
 
+        // Look for attachments. Only answer if no text message.
+        if (utterance.length === 0 && dc.context.activity.attachments && dc.context.activity.attachments.length > 0) {
+            // The user sent an attachment and the bot should handle the incoming attachment.
+            await dc.context.sendActivity(localizer.gettext(locale, 'attachmentResponse'));
+            return DIALOG_TURN_RESULT_DEFAULT;
+        }
+
         // Handle commands
         if (utterance === localizer.gettext(locale, 'restartCommand').toLowerCase()) {
             const userData: UserData = new UserData();

diff --git a/typescript_nodejs/src/dialogs/shared/utils.ts b/typescript_nodejs/src/dialogs/shared/utils.ts
@@ -80,7 +80,7 @@ export class Utils {
         }
 
         return {
-            value: 'yes',
+            value: title,
             action: {
                 type: 'imBack',
                 title: title,
@@ -107,7 +107,7 @@ export class Utils {
         }
 
         return {
-            value: 'no',
+            value: title,
             action: {
                 type: 'imBack',
                 title: title,

diff --git a/typescript_nodejs/src/index.ts b/typescript_nodejs/src/index.ts
@@ -87,10 +87,12 @@ server.listen(process.env.port || process.env.PORT || 3978, (): void => {
     console.log('\nGet more info at: https://github.com/microsoft/BotFramework-Emulator/wiki/Getting-Started');
 });
 
-// Serve static files
-server.get('/public/*', restify.plugins.serveStatic({
-    directory: __dirname
-}));
+if (appsettings.allowPublicFolder === 'true') {
+    // Serve static files
+    server.get('/public/*', restify.plugins.serveStatic({
+        directory: __dirname
+    }));
+}
 
 // Listen for incoming activities and route them to your bot main dialog.
 server.post('/api/messages', (req: restify.Request, res: restify.Response) => {

diff --git a/typescript_nodejs/src/locales/en-US.json b/typescript_nodejs/src/locales/en-US.json
@@ -68,6 +68,7 @@
 		"cancel": ["cancel", "abort"]
 	},
 	"readyPrompt": "What can I do for you? \r (Choose one or type your own question)",
+	"attachmentResponse": "Thanks! 👍",
 	"profanity": "That hurt my feelings. 😓 If you are stuck, just type \"**help**\" and I'll tell you some hints.",
 	"restartCommand": "Restart"
 }
diff --git a/typescript_nodejs/src/public/webchat.html b/typescript_nodejs/src/public/webchat.html
@@ -4,7 +4,7 @@
     <title>Coreplus Chatbot</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta charset="UTF-8" />
-    <script src="https://cdn.botframework.com/botframework-webchat/master/webchat.js"></script>
+    <script crossorigin="anonymous" src="https://cdn.botframework.com/botframework-webchat/latest/webchat.js"></script>
     <style>
       html, body { height: 100% }
       body { margin: 0 }