Merge branch 'refresh-functions-v4' of https://github.com/Azure-Samples/Serverless-microservices-reference-architecture into refresh-functions-v4

Author: DanielLarsenNZ

test/settings.example.js

@@ -3,8 +3,8 @@ window.authClientId = 'a298b04d-dbe2-4fc8-8191-b64c1fd287e2';
 window.authAuthority = 'https://wviriyab2c.b2clogin.com/wviriyab2c.onmicrosoft.com/B2C_1_default-signin';
 window.knownAuthority = 'wviriyab2c.b2clogin.com';
 window.redirectUri = 'http://localhost:4280';
-window.loginScopes = ['https://wviriyab2c.onmicrosoft.com/a298b04d-dbe2-4fc8-8191-b64c1fd287e2/rideshare'];
-window.apiScopes = ['https://wviriyab2c.onmicrosoft.com/a298b04d-dbe2-4fc8-8191-b64c1fd287e2/rideshare'];
+window.loginScopes = ['https://wviriyab2c.onmicrosoft.com/509b5353-3a44-4d09-85ed-64bf2e30ccb8/rideshare'];
+window.apiScopes = ['https://wviriyab2c.onmicrosoft.com/509b5353-3a44-4d09-85ed-64bf2e30ccb8/rideshare'];
 window.authEnabled = true;
 
 

web/serverless-microservices-web/src/utils/Authentication.js

@@ -75,18 +75,18 @@ export class Authentication {
   getAccessToken() {
     _tokenRequest.account = this._publicClientApplication.getAccountByHomeId(_accountId);
     return this._publicClientApplication.acquireTokenSilent(_tokenRequest).then(
-      accessToken => {
-        if (accessToken.accessToken === null || accessToken.accessToken === "") {
-          return this._publicClientApplication.acquireTokenPopup(_tokenRequest).then(
-          accessToken => {
-            return accessToken.accessToken;
+      response => {
+        return response.accessToken;
+      },
+      error => {
+        return this._publicClientApplication.acquireTokenPopup(_tokenRequest).then(
+          response => {
+            return response.accessToken;
           },
           err => {
             console.error(err);
           }
         );
-        }
-        return accessToken.accessToken;
       }
     );
   }