Merge branch 'fy2019q4-refresh' of git://github.com/juliemturner/msgraph-training-reactspa

Author: andrewconnell

02 Create AzureAD Application.pptx

@@ -3,16 +3,16 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^5.7.2",
-    "@microsoft/microsoft-graph-client": "^1.5.2",
+    "@fortawesome/fontawesome-free": "^5.8.2",
+    "@microsoft/microsoft-graph-client": "^1.6.0",
     "bootstrap": "^4.3.1",
     "moment": "^2.24.0",
-    "msal": "^0.2.4",
-    "react": "^16.8.4",
-    "react-dom": "^16.8.4",
-    "react-router-dom": "^4.3.1",
-    "react-scripts": "2.1.5",
-    "reactstrap": "^7.1.0"
+    "msal": "^1.0.0",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6",
+    "react-router-dom": "^5.0.0",
+    "react-scripts": "^3.0.1",
+    "reactstrap": "^8.0.0"
   },
   "scripts": {
     "start": "react-scripts start",

demos/01-create-app/graph-tutorial/package-lock.json

@@ -3,16 +3,16 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^5.7.2",
-    "@microsoft/microsoft-graph-client": "^1.5.2",
+    "@fortawesome/fontawesome-free": "^5.8.2",
+    "@microsoft/microsoft-graph-client": "^1.6.0",
     "bootstrap": "^4.3.1",
     "moment": "^2.24.0",
-    "msal": "^0.2.4",
-    "react": "^16.8.4",
-    "react-dom": "^16.8.4",
-    "react-router-dom": "^4.3.1",
-    "react-scripts": "2.1.5",
-    "reactstrap": "^7.1.0"
+    "msal": "^1.0.0",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6",
+    "react-router-dom": "^5.0.0",
+    "react-scripts": "^3.0.1",
+    "reactstrap": "^8.0.0"
   },
   "scripts": {
     "start": "react-scripts start",

demos/01-create-app/graph-tutorial/package.json

@@ -13,9 +13,18 @@ class App extends Component {
   constructor(props) {
     super(props);
 
-    this.userAgentApplication = new UserAgentApplication(config.appId, null, null);
+    this.userAgentApplication = new UserAgentApplication({
+        auth: {
+            clientId: config.appId,
+            redirectUri: "http://localhost:3000",
+        },
+        cache: {
+            cacheLocation: "localStorage",
+            storeAuthStateInCookie: true
+        }
+    });
 
-    var user = this.userAgentApplication.getUser();
+    var user = this.userAgentApplication.getAccount();
 
     this.state = {
       isAuthenticated: (user !== null),
@@ -65,7 +74,11 @@ class App extends Component {
 
   async login() {
     try {
-      await this.userAgentApplication.loginPopup(config.scopes);
+      await this.userAgentApplication.loginPopup(
+        {
+          scopes: config.scopes,
+          prompt: "select_account",
+      });
       await this.getUserProfile();
     }
     catch(err) {
@@ -89,7 +102,9 @@ class App extends Component {
       // will just return the cached token. Otherwise, it will
       // make a request to the Azure OAuth endpoint to get a token
 
-      var accessToken = await this.userAgentApplication.acquireTokenSilent(config.scopes);
+      var accessToken = await this.userAgentApplication.acquireTokenSilent({
+        scopes: config.scopes
+      });
 
       if (accessToken) {
         // Get the user's profile from Graph

demos/02-add-aad-auth/graph-tutorial/package-lock.json

@@ -6,7 +6,7 @@ function getAuthenticatedClient(accessToken) {
     // Use the provided access token to authenticate
     // requests
     authProvider: (done) => {
-      done(null, accessToken);
+      done(null, accessToken.accessToken);
     }
   });