further improvements

Author: derisen

CHANGELOG.md

@@ -9,3 +9,5 @@
 * Corrected README.md.
 * Added login with redirect.
 * Authentication decoupled from access token request.
+
+## 3/06/2020

JavaScriptSPA/api.js

@@ -17,18 +17,4 @@ function callApiWithAccessToken(endpoint, token) {
       }).catch(error => {
         logMessage("Error calling the Web api:\n" + error);
       });
-}
-
-//calls the resource API with the token
-function callApi() {
-  getTokenPopup(tokenRequest)
-      .then(tokenResponse => {
-          console.log('access_token acquired at: ' + new Date().toString());
-          try {
-            logMessage("Request made to Web API:")
-            callApiWithAccessToken(apiConfig.webApi, tokenResponse.accessToken);
-          } catch(err) {
-            console.log(err);
-          }
-      });
 }

JavaScriptSPA/apiConfig.js

@@ -2,9 +2,4 @@
 const apiConfig = {
     b2cScopes: ["https://fabrikamb2c.onmicrosoft.com/helloapi/demo.read"],
     webApi: "https://fabrikamb2chello.azurewebsites.net/hello"
-  };
-
-// request to acquire a token for resource access
-const tokenRequest = {
-    scopes: apiConfig.b2cScopes
-};
+  };

JavaScriptSPA/authConfig.js

@@ -13,4 +13,9 @@ const msalConfig = {
 // request to sign-in (returns an idToken)
 const loginRequest = {
     scopes: ["openid", "profile"],
+};
+
+// request to acquire a token for resource access
+const tokenRequest = {
+    scopes: apiConfig.b2cScopes
 };

JavaScriptSPA/authPopup.js

@@ -36,4 +36,18 @@ function getTokenPopup(request) {
           console.log(error);
         });
     });
+}
+
+//calls the resource API with the token
+function passTokenToApi() {
+  getTokenPopup(tokenRequest)
+      .then(tokenResponse => {
+          console.log('access_token acquired at: ' + new Date().toString());
+          try {
+            logMessage("Request made to Web API:")
+            callApiWithAccessToken(apiConfig.webApi, tokenResponse.accessToken);
+          } catch(err) {
+            console.log(err);
+          }
+      });
 }

JavaScriptSPA/authRedirect.js

@@ -60,7 +60,7 @@ return myMSALObj.acquireTokenSilent(request)
 
 
 // calls the resource API with the token
-function callApi() {
+function passTokenToAPI() {
   if (accessToken === null || accessToken === undefined) {
     getTokenRedirect(tokenRequest);
   } else {