Merge pull request #40 from microsoftgraph/dependencies-cleanup

Dependencies cleanup

Author: baywet

.eslintrc.js

@@ -13,6 +13,8 @@ module.exports = {
     "prefer-arrow-callback": 0,
     "new-cap": 0,
     "no-param-reassign": 0,
-    "no-use-before-define": 0
+    "no-use-before-define": 0,
+    "linebreak-style": 0,
+    "no-plusplus": 0
   }
 };

.github/workflows/nodejs.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x]
+        node-version: [10.x, 12.x]
 
     steps:
     - uses: actions/checkout@v2
@@ -26,6 +26,7 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - run: npm ci
     - run: npm run build --if-present
-    - run: npm test
-      env:
-        CI: true
+    - run: npm run lint
+    # - run: npm test
+    #   env:
+    #     CI: true

NOTICES.md

@@ -15,9 +15,3 @@ morgan, Copyright (c) by Douglas Christopher Wilson, is available under [The MIT
 serve-favicon, Copyright (c) by Douglas Christopher Wilson, is available under [The MIT License](https://raw.githubusercontent.com/expressjs/serve-favicon/master/LICENSE).
 
 socket.io, Copyright (c) by Automattic, is available under [The MIT License](https://raw.githubusercontent.com/socketio/socket.io/master/LICENSE).
-
-gulp, Copyright (c) by Fractal, is available under [The MIT License](https://raw.githubusercontent.com/gulpjs/gulp/master/LICENSE).
-
-gulp-nodemon, Copyright (c) by Jackson Gariety, is available under [The BSD 2-clause "Simplified" License](http://spdx.org/licenses/BSD-2-Clause).
-
-gulp-plumber, Copyright (c) by Vsevolod Strukchinsky, is available under [The MIT License](https://raw.githubusercontent.com/floatdrop/gulp-plumber/master/LICENSE).

README.md

@@ -14,7 +14,7 @@ extensions:
 ---
 # Microsoft Graph Webhooks Sample for Node.js
 
-[![Build Status](https://travis-ci.org/microsoftgraph/nodejs-webhooks-rest-sample.svg)](https://travis-ci.org/microsoftgraph/nodejs-webhooks-rest-sample)
+![Build status](https://github.com/microsoftgraph/nodejs-webhooks-rest-sample/workflows/Node.js%20CI/badge.svg?branch=master)
 
 ## Table Of Contents. ##
 * [Introduction](#introduction)

babel.config.json

@@ -0,0 +1,7 @@
+{
+  "compact": false,
+  "ignore": [
+    ".tmp"
+  ],
+  "presets": ["@babel/env"]
+}

gulpfile.js

@@ -9,10 +9,10 @@ const resource = 'https://graph.microsoft.com/';
  * @return {string} a fully formed uri with which authentication can be completed.
  */
 export function getAuthUrl() {
-  return adalConfiguration.authority + '/oauth2/authorize' +
-    '?client_id=' + adalConfiguration.clientID +
-    '&response_type=code' +
-    '&redirect_uri=' + adalConfiguration.redirectUri;
+  return adalConfiguration.authority + '/oauth2/authorize'
+    + '?client_id=' + adalConfiguration.clientID
+    + '&response_type=code'
+    + '&redirect_uri=' + adalConfiguration.redirectUri;
 }
 
 /**

helpers/authHelper.js

@@ -10,17 +10,16 @@ const sqlite3 = sql.verbose();
 export function createDatabase() {
   const dbExists = fs.existsSync(dbFile);
   const db = new sqlite3.Database(dbFile);
-  const createSubscriptionStatement =
-    'CREATE TABLE Subscription (' +
-    'UserId TEXT NOT NULL, ' +
-    'SubscriptionId TEXT NOT NULL, ' +
-    'AccessToken TEXT NOT NULL, ' +
-    'Resource TEXT NOT NULL, ' +
-    'ChangeType TEXT NOT NULL, ' +
-    'ClientState TEXT NOT NULL, ' +
-    'NotificationUrl TEXT NOT NULL, ' +
-    'SubscriptionExpirationDateTime TEXT NOT NULL' +
-    ')';
+  const createSubscriptionStatement = 'CREATE TABLE Subscription ('
+    + 'UserId TEXT NOT NULL, '
+    + 'SubscriptionId TEXT NOT NULL, '
+    + 'AccessToken TEXT NOT NULL, '
+    + 'Resource TEXT NOT NULL, '
+    + 'ChangeType TEXT NOT NULL, '
+    + 'ClientState TEXT NOT NULL, '
+    + 'NotificationUrl TEXT NOT NULL, '
+    + 'SubscriptionExpirationDateTime TEXT NOT NULL'
+    + ')';
 
   db.serialize(() => {
     if (!dbExists) {
@@ -38,19 +37,18 @@ export function createDatabase() {
 
 export function getSubscription(subscriptionId, callback) {
   const db = new sqlite3.Database(dbFile);
-  const getUserDataStatement =
-    'SELECT ' +
-    'UserId as userId, ' +
-    'SubscriptionId as subscriptionId, ' +
-    'AccessToken as accessToken, ' +
-    'Resource as resource, ' +
-    'ChangeType as changeType, ' +
-    'ClientState as clientState, ' +
-    'NotificationUrl as notificationUrl, ' +
-    'SubscriptionExpirationDateTime as subscriptionExpirationDateTime ' +
-    'FROM Subscription ' +
-    'WHERE SubscriptionId = $subscriptionId ' +
-    'AND SubscriptionExpirationDateTime > datetime(\'now\')';
+  const getUserDataStatement = 'SELECT '
+    + 'UserId as userId, '
+    + 'SubscriptionId as subscriptionId, '
+    + 'AccessToken as accessToken, '
+    + 'Resource as resource, '
+    + 'ChangeType as changeType, '
+    + 'ClientState as clientState, '
+    + 'NotificationUrl as notificationUrl, '
+    + 'SubscriptionExpirationDateTime as subscriptionExpirationDateTime '
+    + 'FROM Subscription '
+    + 'WHERE SubscriptionId = $subscriptionId '
+    + 'AND SubscriptionExpirationDateTime > datetime(\'now\')';
 
   db.serialize(() => {
     db.get(
@@ -65,12 +63,11 @@ export function getSubscription(subscriptionId, callback) {
 
 export function saveSubscription(subscriptionData, callback) {
   const db = new sqlite3.Database(dbFile);
-  const insertStatement =
-    'INSERT INTO Subscription ' +
-    '(UserId, SubscriptionId, AccessToken, Resource, ChangeType, ' +
-    'ClientState, NotificationUrl, SubscriptionExpirationDateTime) ' +
-    'VALUES ($userId, $subscriptionId, $accessToken, $resource, $changeType, ' +
-    '$clientState, $notificationUrl, $subscriptionExpirationDateTime)';
+  const insertStatement = 'INSERT INTO Subscription '
+    + '(UserId, SubscriptionId, AccessToken, Resource, ChangeType, '
+    + 'ClientState, NotificationUrl, SubscriptionExpirationDateTime) '
+    + 'VALUES ($userId, $subscriptionId, $accessToken, $resource, $changeType, '
+    + '$clientState, $notificationUrl, $subscriptionExpirationDateTime)';
 
   db.serialize(() => {
     db.run(
@@ -92,9 +89,8 @@ export function saveSubscription(subscriptionData, callback) {
 
 export function deleteSubscription(subscriptionId, callback) {
   const db = new sqlite3.Database(dbFile);
-  const deleteStatement =
-    'DELETE FROM Subscription WHERE ' +
-    'SubscriptionId = $subscriptionId';
+  const deleteStatement = 'DELETE FROM Subscription WHERE '
+    + 'SubscriptionId = $subscriptionId';
 
   db.serialize(() => {
     db.run(

helpers/dbHelper.js

@@ -24,7 +24,7 @@ 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);
@@ -50,16 +50,16 @@ export function getData(path, token, callback) {
     method: 'GET',
     headers: {
       'Content-Type': 'application/json',
-      Accept: 'application/json;odata.metadata=minimal;' +
-              'odata.streaming=true;IEEE754Compatible=false',
+      Accept: 'application/json;odata.metadata=minimal;'
+              + 'odata.streaming=true;IEEE754Compatible=false',
       Authorization: 'Bearer ' + token
     }
   };
 
   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);
@@ -91,8 +91,6 @@ 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));
   });
 

helpers/requestHelper.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-import { app } from '../app';
-import { createDatabase } from '../helpers/dbHelper';
+import { app } from './app';
+import { createDatabase } from './helpers/dbHelper';
 
 createDatabase();