Completed the add MS Graph step

Author: jasonjoh

demo/graph-tutorial/app.js

@@ -70,7 +70,7 @@ async function signInComplete(iss, sub, profile, accessToken, refreshToken, para
   let oauthToken = oauth2.accessToken.create(params);
 
   // Save the profile and tokens in user storage
-  users[profile.oid] = { profile, accessToken };
+  users[profile.oid] = { profile, oauthToken };
   return done(null, users[profile.oid]);
 }
 // </SignInCompleteSnippet>
@@ -95,6 +95,7 @@ passport.use(new OIDCStrategy(
 var indexRouter = require('./routes/index');
 var usersRouter = require('./routes/users');
 var authRouter = require('./routes/auth');
+var calendarRouter = require('./routes/calendar');
 var graph = require('./graph');
 
 var app = express();
@@ -134,6 +135,15 @@ app.use(function(req, res, next) {
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'hbs');
 
+// <FormatDateSnippet>
+var hbs = require('hbs');
+var moment = require('moment');
+// Helper to format date/time sent by Graph
+hbs.registerHelper('eventDateTime', function(dateTime){
+  return moment(dateTime).format('M/D/YY h:mm A');
+});
+// </FormatDateSnippet>
+
 app.use(logger('dev'));
 app.use(express.json());
 app.use(express.urlencoded({ extended: false }));
@@ -157,6 +167,7 @@ app.use(function(req, res, next) {
 
 app.use('/', indexRouter);
 app.use('/auth', authRouter);
+app.use('/calendar', calendarRouter);
 app.use('/users', usersRouter);
 
 // catch 404 and forward to error handler

demo/graph-tutorial/graph.js

@@ -10,7 +10,21 @@ module.exports = {
 
     const user = await client.api('/me').get();
     return user;
+  },
+
+  // <GetEventsSnippet>
+  getEvents: async function(accessToken) {
+    const client = getAuthenticatedClient(accessToken);
+
+    const events = await client
+      .api('/me/events')
+      .select('subject,organizer,start,end')
+      .orderby('createdDateTime DESC')
+      .get();
+
+    return events;
   }
+  // </GetEventsSnippet>
 };
 
 function getAuthenticatedClient(accessToken) {

demo/graph-tutorial/routes/calendar.js

@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+var express = require('express');
+var router = express.Router();
+var tokens = require('../tokens.js');
+var graph = require('../graph.js');
+
+/* GET /calendar */
+// <GetRouteSnippet>
+router.get('/',
+  async function(req, res) {
+    if (!req.isAuthenticated()) {
+      // Redirect unauthenticated requests to home page
+      res.redirect('/')
+    } else {
+      let params = {
+        active: { calendar: true }
+      };
+
+      // Get the access token
+      var accessToken;
+      try {
+        accessToken = await tokens.getAccessToken(req);
+      } catch (err) {
+        req.flash('error_msg', {
+          message: 'Could not get access token. Try signing out and signing in again.',
+          debug: JSON.stringify(err)
+        });
+      }
+
+      if (accessToken && accessToken.length > 0) {
+        try {
+          // Get the events
+          var events = await graph.getEvents(accessToken);
+          params.events = events.value;
+        } catch (err) {
+          req.flash('error_msg', {
+            message: 'Could not fetch events',
+            debug: JSON.stringify(err)
+          });
+        }
+      } else {
+        req.flash('error_msg', 'Could not get an access token');
+      }
+
+      res.render('calendar', params);
+    }
+  }
+);
+// </GetRouteSnippet>
+
+module.exports = router;

demo/graph-tutorial/views/calendar.hbs

@@ -0,0 +1,26 @@
+<!-- Copyright (c) Microsoft Corporation.
+     Licensed under the MIT License. -->
+
+<!-- <LayoutSnippet> -->
+<h1>Calendar</h1>
+<table class="table">
+  <thead>
+    <tr>
+      <th scope="col">Organizer</th>
+      <th scope="col">Subject</th>
+      <th scope="col">Start</th>
+      <th scope="col">End</th>
+    </tr>
+  </thead>
+  <tbody>
+    {{#each events}}
+      <tr>
+        <td>{{this.organizer.emailAddress.name}}</td>
+        <td>{{this.subject}}</td>
+        <td>{{eventDateTime this.start.dateTime}}</td>
+        <td>{{eventDateTime this.end.dateTime}}</td>
+      </tr>
+    {{/each}}
+  </tbody>
+</table>
+<!-- </LayoutSnippet> -->

tutorial/04-add-aad-auth.md

@@ -242,7 +242,7 @@ However, storing just the access token doesn't allow you to check expiration or
 
 1. Replace the existing `signInComplete` function with the following.
 
-    :::code language="javascript" source="../demo/graph-tutorial/app.js" id="SignInCompleteSnippet" highlight="17-18":::
+    :::code language="javascript" source="../demo/graph-tutorial/app.js" id="SignInCompleteSnippet" highlight="17-18, 21":::
 
 1. Replace the existing callback route in  `./routes/auth.js` with the following.