updating starter project

Author: Jim Crowley

starter-project/.eslintrc.js

@@ -3,8 +3,11 @@ module.exports = {
     'browser': true,
     'node': true,
   },
-  'extends': 'airbnb/legacy',
-  'rules':{
+  'extends': 'airbnb/legacy',  
+  "parserOptions": {
+    "ecmaVersion": 6
+  },
+  'rules': {
     'prefer-template': 0,
     'comma-dangle': 0,
     'func-names': 0,
@@ -13,7 +16,6 @@ module.exports = {
     'no-param-reassign': 0,
     'no-use-before-define': 0,
     'no-console': 0,
-    'linebreak-style': 0,
-	'no-unused-vars':0 //for empty functions in the starter project
+    'linebreak-style': 0
   }
 };

starter-project/app.js

@@ -3,16 +3,53 @@
  * See LICENSE in the project root for license information.
  */
 // application dependencies
-var express = require('express');
-var session = require('express-session');
-var path = require('path');
-var favicon = require('serve-favicon');
-var logger = require('morgan');
-var cookieParser = require('cookie-parser');
-var bodyParser = require('body-parser');
-var routes = require('./routes/index');
+const express = require('express');
+const session = require('express-session');
+const path = require('path');
+const favicon = require('serve-favicon');
+const logger = require('morgan');
+const cookieParser = require('cookie-parser');
+const bodyParser = require('body-parser');
+const routes = require('./routes/index');
+const passport = require('passport');
+const OIDCStrategy = require('passport-azure-ad').OIDCStrategy;
+const uuid = require('uuid');
+const config = require('./utils/config.js');
 
-var app = express();
+const app = express();
+
+// **IMPORTANT
+// Note that production apps will need to create a self-signed cert and use a secure server,
+// and change dev settings marked 'For development only' in app.js and config.js.
+// Below is an example after you have the key cert pair:
+// const https = require('https');
+// const certConfig = {
+//  key: fs.readFileSync('./utils/cert/server.key', 'utf8'),
+//  cert: fs.readFileSync('./utils/cert/server.crt', 'utf8')
+// };
+// const server = https.createServer(certConfig, app);
+
+// authentication setup
+const callback = (iss, sub, profile, accessToken, refreshToken, done) => {
+  done(null, {
+    profile,
+    accessToken,
+    refreshToken
+  });
+};
+
+passport.use(new OIDCStrategy(config.creds, callback));
+
+const users = {};
+passport.serializeUser((user, done) => {
+  const id = uuid.v4();
+  users[id] = user;
+  done(null, id);
+});
+passport.deserializeUser((id, done) => {
+  const user = users[id];
+  done(null, user);
+});
 
 // view engine setup
 app.set('views', path.join(__dirname, 'views'));
@@ -27,23 +64,24 @@ app.use(cookieParser());
 // see https://github.com/expressjs/session
 app.use(session({
   secret: '12345QWERTY-SECRET',
-  name: 'nodecookie',
+  name: 'graphNodeCookie',
   resave: false,
-  saveUninitialized: false
+  saveUninitialized: false,
+  //cookie: {secure: true} // For development only
 }));
 app.use(express.static(path.join(__dirname, 'public')));
-
+app.use(passport.initialize());
+app.use(passport.session());
 app.use('/', routes);
 
+// error handlers
 // catch 404 and forward to error handler
 app.use(function (req, res, next) {
-  var err = new Error('Not Found');
+  const err = new Error('Not Found');
   err.status = 404;
   next(err);
 });
 
-// error handlers
-
 // development error handler
 // will print stacktrace
 if (app.get('env') === 'development') {
@@ -66,4 +104,4 @@ app.use(function (err, req, res) {
   });
 });
 
-module.exports = app;
+module.exports = app;

starter-project/authHelper.js

@@ -4,22 +4,22 @@
  * Module dependencies.
  */
 
-var app = require('../app');
-var debug = require('debug')('o365-nodejs-unified-api-connect:server');
-var http = require('http');
+const app = require('../app');
+const debug = require('debug')('nodejs-microsoft-graph-connect:server');
+const http = require('http');
 
 /**
  * Get port from environment and store in Express.
  */
 
-var port = normalizePort(process.env.PORT || '3000');
+const port = normalizePort(process.env.PORT || '3000');
 app.set('port', port);
 
 /**
  * Create HTTP server.
  */
 
-var server = http.createServer(app);
+const server = http.createServer(app);
 
 /**
  * Listen on provided port, on all network interfaces.
@@ -34,7 +34,7 @@ server.on('listening', onListening);
  */
 
 function normalizePort(val) {
-  var port = parseInt(val, 10);
+  const port = parseInt(val, 10);
 
   if (isNaN(port)) {
     // named pipe
@@ -58,7 +58,7 @@ function onError(error) {
     throw error;
   }
 
-  var bind = typeof port === 'string'
+  const bind = typeof port === 'string'
     ? 'Pipe ' + port
     : 'Port ' + port;
 
@@ -82,9 +82,10 @@ function onError(error) {
  */
 
 function onListening() {
-  var addr = server.address();
-  var bind = typeof addr === 'string'
+  const addr = server.address();
+  const bind = typeof addr === 'string'
     ? 'pipe ' + addr
     : 'port ' + addr.port;
-  debug('Listening on ' + bind);
-}
+  debug('Listening on ' + bind); 
+  console.log('\r\nListening on ' + bind);
+}

starter-project/bin/www

@@ -1,7 +1,7 @@
 {
-  "name": "o365-nodejs-microsoft-graph-connect",
-  "version": "1.0.0",
-  "description": "Connecting to Office 365 is the first step every Node.js app must take to start working with Office 365 services and data. This sample shows how to connect and then call one endpoint through the Microsoft Graph API.",
+  "name": "nodejs-microsoft-graph-connect",
+  "version": "2.0.0",
+  "description": "Connecting to Microsoft Graph is the first step every Node.js app must take to start working with the Microsoft Graph API. This sample shows how to connect and call Microsoft Graph",
   "private": true,
   "scripts": {
     "start": "mocha ./tests/confTest.js && node ./bin/www",
@@ -10,34 +10,36 @@
     "automatedTest": "mocha ./tests/automatedTest.js --timeout 20000"
   },
   "keywords": [
-    "o365",
+    "graph",
     "microsoft",
     "nodejs",
     "unified"
   ],
-  "author": "PatSol",
+  "author": "DevEd",
   "license": "MIT",
   "dependencies": {
-    "body-parser": "~1.13.2",
-    "cookie-parser": "~1.3.5",
-    "cookie-session": "^1.2.0",
-    "debug": "~2.2.0",
-    "express": "~4.13.1",
-    "express-session": "^1.11.3",
-    "hbs": "~3.1.0",
-    "morgan": "~1.6.1",
-    "node-uuid": "^1.4.7",
-    "oauth": "^0.9.14",
-    "serve-favicon": "~2.3.0"
+    "body-parser": "~1.17.1",
+    "cookie-parser": "~1.4.3",
+    "debug": "~2.6.3",
+    "eslint-plugin-import": "^2.2.0",
+    "eslint-plugin-react": "^6.10.3",
+    "express": "~4.15.2",
+    "express-session": "^1.15.2",
+    "hbs": "~4.0.1",
+    "morgan": "~1.8.1",
+    "passport": "^0.3.2",
+    "passport-azure-ad": "^3.0.5",
+    "serve-favicon": "~2.4.2",
+    "superagent": "^3.5.2",
+    "uuid": "^3.0.1"
   },
   "devDependencies": {
-    "eslint": "^2.3.0",
-    "eslint-config-airbnb": "^6.1.0",
-    "eslint-plugin-import": "^1.10.2",
-    "eslint-plugin-react": "^4.2.1",
-    "gulp": "^3.9.0",
-    "gulp-nodemon": "^2.0.4",
-    "mocha": "^2.4.5",
-    "selenium-webdriver": "^2.53.3"
+    "eslint": "^3.19.0",
+    "eslint-config-airbnb": "^14.1.0",
+    "eslint-plugin-jsx-a11y": "^4.0.0",
+    "gulp": "^3.9.1",
+    "gulp-nodemon": "^2.2.1",
+    "mocha": "^3.2.0",
+    "selenium-webdriver": "^3.3.0"
   }
-}
+}