moving to func pack

Author: Gavin Barron

.eslintrc.json

@@ -0,0 +1,23 @@
+{
+    "root": true,
+    "extends": "eslint:recommended",
+    "parserOptions": {
+        "ecmaVersion": 7,
+        "sourceType": "module"
+    },
+    "env": {
+        "node": true,
+        "mocha": true
+    },
+    "rules": {
+        "no-console": 1,
+        "no-extra-parens": "error",
+        "array-bracket-newline": ["error", "consistent"],
+        "brace-style": ["warn", "1tbs", { "allowSingleLine": true }],
+        "no-trailing-spaces": "error",
+        "no-whitespace-before-property": 1,
+        "space-before-blocks": ["error", "always"],
+        "keyword-spacing": ["error", { "before": true, "after": true }],
+        "arrow-spacing": "error"
+    }
+}

.gitignore

@@ -1,6 +1,26 @@
 
-*.js.map
-package-lock.json
-**/node_modules/
 bin
-obj
+obj
+csx
+.vs
+edge
+Publish
+.vscode
+node_modules
+
+*.user
+*.suo
+*.cscfg
+*.Cache
+project.lock.json
+
+/packages
+/TestResults
+
+/tools/NuGet.exe
+/App_Data
+/secrets
+/data
+.secrets
+appsettings.json
+local.settings.json

AcceptMeeting/function.json

@@ -5,7 +5,7 @@
       "type": "queueTrigger",
       "direction": "in",
       "queueName": "accept-meeting",
-      "connection": "travlerbotvkzmzc_STORAGE"
+      "connection": "AzureWebJobsStorage"
     }
   ],
   "disabled": false

AcceptMeeting/index.js

@@ -1,69 +1,21 @@
-const https = require('https');
+const GraphHelper = require('../common/graphHelper');
 
 module.exports = function (context, myQueueItem) {
     context.log('Starting accept call');
 
-    /**
-     * Generates a POST request (of Content-type ```application/json```)
-     * @param {string} path the path, relative to the host, to which this request will be sent
-     * @param {string} token the access token with which the request should be authenticated
-     * @param {string} data the data which will be 'POST'ed
-     * @param {callback} callback
-     */
-    function postData (path, token, data, callback) {
-        var self = this;
-        const options = {
-            host: 'graph.microsoft.com',
-            path: path,
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                Authorization: 'Bearer ' + token,
-                'Content-Length': data.length
-            }
-        };
-
-        const req = https.request(options, res => {
-            let responseData = '';
-            context.log('In response');
-            
-            res.on('data', chunk => {
-                // context.log('got data');
-                (responseData += chunk);
-            });
-            res.on('end', () => {
-                // context.log('data end');
-                // context.log(res.statusCode);
-                // context.log(responseData);
-                // context.log(JSON.parse(responseData));
-                if (res.statusCode === 201) callback(null, JSON.parse(responseData));
-                else callback(JSON.parse(responseData), null);
-            });
-        });
-
-        req.write(data);
-        req.end();
-        context.log('Made request');
-        
-        req.on('error', error => {
-        context.log('Bad error');
-            callback(error, null)
-        });
-    }
-
     const acceptData = {
-        comment: '',
+        comment: 'Accepted via the TravelTime Bot',
         sendResponse: true
     };
     const data = JSON.stringify(acceptData);
     context.log(`Accept call ${data}`);
 
-    postData(`/v1.0/${myQueueItem.meeting}/accept`, myQueueItem.accessToken, data, (error, data) => {
-        if(error){
+    GraphHelper.postData(`/v1.0/${myQueueItem.meeting}/accept`, myQueueItem.accessToken, data, (error, data) => {
+        if (error) {
             context.done(error);
             return;
         }
-        context.done();
+        context.done(null, data);
     });
 };
 

CalendarWebHookHandler/index.js

@@ -1,4 +1,3 @@
-
 const azureStorage = require('azure-storage');
 const cfg = require('../common/config')
 
@@ -16,21 +15,21 @@ module.exports = function (context, data) {
         return;
     }
 
-    const storageConnectionString = process.env.storageConnectionString || 'DefaultEndpointsProtocol=https;AccountName=travelerbot;AccountKey=b2cmbtSrWvJ2ebxO0PD1CQ+svlaxjUY3xtC8DdzJyeFXRGVgnsGhZkqU82rvgMiXE0ybEaWlTZpEsf/65drmNA==;EndpointSuffix=core.windows.net';
+    const storageConnectionString = process.env.AzureWebJobsStorage;
     const queueSvc = azureStorage.createQueueService(storageConnectionString);
     // Write incoming notifications onto a queue.
-    queueSvc.createQueueIfNotExists('hook-recieved', (err, result, response) => {
-        if (err){
+    queueSvc.createQueueIfNotExists('hook-recieved', err => {
+        if (err) {
             // this should be a log for the dev, not a message to the user
-            session.send('There was an error creating the hook-recieved queue: '+ err);
+            context.log('There was an error creating the hook-recieved queue: '+ err);
             context.done(err);
             return;
         }
         // enqueue a message to process the webhook request.
         const request = data.body;
         context.log(request);
         const notificationCount = request.value.length;
-        let processed = 0; 
+        let processed = 0;
         // web hook requests can contain multiple notifications
         for (let hook of request.value) {
             let msg = JSON.stringify(hook);
@@ -42,12 +41,11 @@ module.exports = function (context, data) {
                 // add a log entry so that this can be investigated
                 context.log('Unknown sender! Investigate the source of this message')
                 context.log(data);
-                context.res = { status: 202, body: 'All notifications processed' }; 
+                context.res = { status: 202, body: 'All notifications processed' };
                 context.done();
                 return;
-                break;
-            } 
-            queueSvc.createMessage('hook-recieved', queueMessageBuffer, (err, result, response) => {
+            }
+            queueSvc.createMessage('hook-recieved', queueMessageBuffer, (err, result) => {
                 processed++;
                 // fail on any message not getting queued properly
                 if (err) {
@@ -57,8 +55,8 @@ module.exports = function (context, data) {
                 }
                 context.log('webhook messge on put onto hook-recieved queue');
                 if (processed == notificationCount) {
-                    context.res = { status: 202, body: 'All notifications processed' }; 
-                    context.done();
+                    context.res = { status: 202, body: 'All notifications processed' };
+                    context.done(null, result);
                 }
             });
         }

CreateTravelBooking/function.json

@@ -5,7 +5,7 @@
       "type": "queueTrigger",
       "direction": "in",
       "queueName": "add-travel-meeting",
-      "connection": "travlerbotvkzmzc_STORAGE"
+      "connection": "AzureWebJobsStorage"
     }
   ],
   "disabled": false

CreateTravelBooking/index.js

@@ -1,45 +1,8 @@
-const https = require('https');
+const GraphHelper = require('../common/graphHelper');
 
 module.exports = function (context, myQueueItem) {
     context.log('Starting travel meeting booking');
-    
-    /**
-     * Generates a POST request (of Content-type ```application/json```)
-     * @param {string} path the path, relative to the host, to which this request will be sent
-     * @param {string} token the access token with which the request should be authenticated
-     * @param {string} data the data which will be 'POST'ed
-     * @param {callback} callback
-     */
-    function postData (path, token, data, callback) {
-        var self = this;
-        const options = {
-            host: 'graph.microsoft.com',
-            path: path,
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                Authorization: 'Bearer ' + token,
-                'Content-Length': data.length
-            }
-        };
 
-        const req = https.request(options, res => {
-            let subscriptionData = '';
-
-            res.on('data', chunk => (subscriptionData += chunk));
-            res.on('end', () => {
-                if (res.statusCode === 201) callback(null, JSON.parse(subscriptionData));
-                else callback(JSON.parse(subscriptionData), null);
-            });
-        });
-
-        req.write(data);
-        req.end();
-
-        req.on('error', error => callback(error, null));
-    }
-    context.log(myQueueItem.start);
-    context.log(myQueueItem.durationInMins)
     const start = new Date(myQueueItem.start);
     const MS_PER_MINUTE = 60000;
     const end = new Date(start.getTime() + myQueueItem.durationInMins * MS_PER_MINUTE).toISOString();
@@ -59,11 +22,11 @@ module.exports = function (context, myQueueItem) {
         }
     }
 
-    postData(`/v1.0/me/events`, myQueueItem.accessToken, JSON.stringify(meeting), (error, data) => {
-        if(error){
+    GraphHelper.postData(`/v1.0/me/events`, myQueueItem.accessToken, JSON.stringify(meeting), (error, data) => {
+        if (error) {
             context.done(error);
             return;
         }
-        context.done();
+        context.done(null, data);
     });
 };

PostDeployScripts/runGulp.cmd

@@ -5,7 +5,7 @@
       "type": "queueTrigger",
       "direction": "in",
       "queueName": "hook-recieved",
-      "connection": "travlerbotvkzmzc_STORAGE"
+      "connection": "AzureWebJobsStorage"
     },
     {
       "type": "http",