Merge pull request #12 from Hongbo-Miao/master

chore: simplify the app

Author: Jim Crowley

app.js

@@ -1,11 +1,5 @@
-/*
- * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
- * See LICENSE in the project root for license information.
- */
-
 import express from 'express';
 import path from 'path';
-import favicon from 'serve-favicon';
 import logger from 'morgan';
 import bodyParser from 'body-parser';
 
@@ -22,7 +16,6 @@ app.locals.ENV_DEVELOPMENT = (env === 'development');
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'jade');
 
-app.use(favicon(__dirname + '/public/img/favicon.ico'));
 app.use(logger('dev'));
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({ extended: true }));
@@ -52,15 +45,15 @@ if (app.get('env') === 'development') {
       title: 'error'
     });
   });
-}
-
-// production error handler
-// no stacktraces leaked to user
-app.use((err, req, res) => {
-  res.status(err.status || 500);
-  res.render('error', {
-    message: err.message,
-    error: { },
-    title: 'error'
+} else {
+  // production error handler
+  // no stacktraces leaked to user
+  app.use((err, req, res) => {
+    res.status(err.status || 500);
+    res.render('error', {
+      message: err.message,
+      error: { },
+      title: 'error'
+    });
   });
-});
+}

gulpfile.js

@@ -1,8 +1,3 @@
-/*
- * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
- * See LICENSE in the project root for license information.
- */
-
 var gulp = require('gulp');
 var nodemon = require('gulp-nodemon');
 var plumber = require('gulp-plumber'); // eslint-disable-line no-unused-vars

helpers/authHelper.js

@@ -1,9 +1,5 @@
-/*
- * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
- * See LICENSE in the project root for license information.
- */
-
 import { AuthenticationContext } from 'adal-node';
+
 import { adalConfiguration } from '../constants';
 
 const resource = 'https://graph.microsoft.com/';
@@ -22,7 +18,6 @@ export function getAuthUrl() {
 /**
  * Gets a token for a given resource.
  * @param {string} code An authorization code returned from a client.
- * @param {string} res A URI that identifies the resource for which the token is valid.
  * @param {AcquireTokenCallback} callback The callback function.
  */
 export function getTokenFromCode(code, callback) {
@@ -34,11 +29,8 @@ export function getTokenFromCode(code, callback) {
     adalConfiguration.clientID,
     adalConfiguration.clientSecret,
     (error, token) => {
-      if (error) {
-        callback(error, null);
-      } else {
-        callback(null, token);
-      }
+      if (error) callback(error, null);
+      else callback(null, token);
     }
   );
 }

helpers/dbHelper.js

@@ -1,8 +1,3 @@
-/*
- * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
- * See LICENSE in the project root for license information.
- */
-
 import fs from 'fs';
 import sql from 'sqlite3';
 
@@ -27,15 +22,13 @@ export function createDatabase() {
     'SubscriptionExpirationDateTime TEXT NOT NULL' +
     ')';
 
-  db.serialize(function createTable() {
+  db.serialize(() => {
     if (!dbExists) {
       db.run(
         createSubscriptionStatement,
         [],
-        function callback(error) {
-          if (error !== null) {
-            throw error;
-          }
+        error => {
+          if (error !== null) throw error;
         }
       );
     }
@@ -59,7 +52,7 @@ export function getSubscription(subscriptionId, callback) {
     'WHERE SubscriptionId = $subscriptionId ' +
     'AND SubscriptionExpirationDateTime > datetime(\'now\')';
 
-  db.serialize(function executeSelect() {
+  db.serialize(() => {
     db.get(
       getUserDataStatement,
       {
@@ -79,7 +72,7 @@ export function saveSubscription(subscriptionData, callback) {
     'VALUES ($userId, $subscriptionId, $accessToken, $resource, $changeType, ' +
     '$clientState, $notificationUrl, $subscriptionExpirationDateTime)';
 
-  db.serialize(function executeInsert() {
+  db.serialize(() => {
     db.run(
       insertStatement,
       {
@@ -103,12 +96,10 @@ export function deleteSubscription(subscriptionId, callback) {
     'DELETE FROM Subscription WHERE ' +
     'SubscriptionId = $subscriptionId';
 
-  db.serialize(function executeDelete() {
+  db.serialize(() => {
     db.run(
       deleteStatement,
-      {
-        $subscriptionId: subscriptionId
-      },
+      { $subscriptionId: subscriptionId },
       callback
     );
   });

helpers/requestHelper.js

@@ -1,8 +1,3 @@
-/*
- * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
- * See LICENSE in the project root for license information.
- */
-
 import https from 'https';
 
 const host = 'graph.microsoft.com';
@@ -28,24 +23,18 @@ export function postData(path, token, data, callback) {
 
   const req = https.request(options, res => {
     let subscriptionData = '';
-    res.on('data', chunk => {
-      subscriptionData += chunk;
-    });
+
+    res.on('data', chunk => (subscriptionData += chunk));
     res.on('end', () => {
-      if (res.statusCode === 201) {
-        callback(null, JSON.parse(subscriptionData));
-      } else {
-        callback(JSON.parse(subscriptionData), null);
-      }
+      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);
-  });
+  req.on('error', error => callback(error, null));
 }
 
 /**
@@ -69,24 +58,18 @@ export function getData(path, token, callback) {
 
   const req = https.request(options, res => {
     let endpointData = '';
-    res.on('data', chunk => {
-      endpointData += chunk;
-    });
+
+    res.on('data', chunk => (endpointData += chunk));
     res.on('end', () => {
-      if (res.statusCode === 200) {
-        callback(null, JSON.parse(endpointData));
-      } else {
-        callback(JSON.parse(endpointData), null);
-      }
+      if (res.statusCode === 200) callback(null, JSON.parse(endpointData));
+      else callback(JSON.parse(endpointData), null);
     });
   });
 
   req.write('');
   req.end();
 
-  req.on('error', error => {
-    callback(error, null);
-  });
+  req.on('error', error => callback(error, null));
 }
 
 /**
@@ -109,17 +92,11 @@ export function deleteData(path, token, callback) {
 
   const req = https.request(options, res => {
     let endpointData = '';
-    res.on('data', chunk => {
-      endpointData += chunk;
-    });
-    res.on('end', () => {
-      callback(null);
-    });
+    res.on('data', chunk => (endpointData += chunk));
+    res.on('end', () => callback(null));
   });
 
   req.end();
 
-  req.on('error', error => {
-    callback(error);
-  });
+  req.on('error', error => callback(error));
 }

helpers/socketHelper.js

@@ -1,8 +1,3 @@
-/*
- * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
- * See LICENSE in the project root for license information.
- */
-
 import express from 'express';
 import http from 'http';
 import io from 'socket.io';

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "o365-nodejs-webhook",
-  "version": "0.0.1",
+  "name": "microsoft-graph-webhook-nodejs",
+  "version": "1.0.0",
   "private": true,
   "scripts": {
     "start": "mocha ./tests/confTest.js && nodemon --exec babel-node --presets es2015 ./bin/www",

public/js/client.js public/client.jspublic/js/client.js renamed to public/client.js

@@ -1,8 +1,3 @@
-/*
- * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
- * See LICENSE in the project root for license information.
- */
-
 const socket = io.connect('http://localhost:3001'); // eslint-disable-line no-undef
 
 // Socket `notification_received` event handler.
@@ -42,11 +37,10 @@ document.getElementById('signOutButton').onclick = () => {
 function getQueryStringParameter(paramToRetrieve) {
   const params = document.URL.split('?')[1].split('&');
 
-  for (let i = 0; i < params.length; i = i + 1) {
+  for (let i = 0; i < params.length; i++) {
     const singleParam = params[i].split('=');
-    if (singleParam[0] === paramToRetrieve) {
-      return singleParam[1];
-    }
+
+    if (singleParam[0] === paramToRetrieve) return singleParam[1];
   }
   return null;
 }