decoupling login from access token request

derisen · derisen · commit 24e5cf4e0c2e · 2020-02-21T16:59:33.000-08:00
diff --git a/JavaScriptSPA/api.js b/JavaScriptSPA/api.js
@@ -10,13 +10,11 @@ function callApiWithAccessToken(endpoint, accessToken) {
         headers: headers
       };
   
-    console.log('request made to Web API at: ' + new Date().toString());
     
     fetch(endpoint, options)
       .then(response => response.json())
       .then(response => {
-        console.log('web API responded at: ' + new Date().toString());
-        logMessage("web API returned:\n" + JSON.stringify(response));
+        logMessage("Web API returned:\n" + JSON.stringify(response));
       }).catch(error => {
         logMessage("Error calling the Web api:\n" + error);
       });
@@ -26,7 +24,9 @@ function callApiWithAccessToken(endpoint, accessToken) {
 function callApi() {
   getTokenPopup(tokenRequest)
       .then(tokenResponse => {
+        console.log(tokenResponse)
           try {
+            logMessage("\nRequest made to Web API:\n")
             callApiWithAccessToken(apiConfig.webApi, tokenResponse.accessToken);
           } catch(err) {
             console.log(err);
diff --git a/JavaScriptSPA/apiConfig.js b/JavaScriptSPA/apiConfig.js
@@ -4,11 +4,6 @@ const apiConfig = {
     webApi: "https://fabrikamb2chello.azurewebsites.net/hello"
   };
 
-// request to sign-in (returns an idToken)
-const loginRequest = {
-    scopes: apiConfig.b2cScopes
-};
-
 // request to acquire a token for resource access
 const tokenRequest = {
     scopes: apiConfig.b2cScopes
diff --git a/JavaScriptSPA/auth.js b/JavaScriptSPA/auth.js
@@ -27,7 +27,7 @@ function authRedirectCallBack(error, response) {
       if (response.tokenType === "id_token" && myMSALObj.getAccount() && !myMSALObj.isCallback(window.location.hash)) {
         console.log('id_token acquired at: ' + new Date().toString());
         updateUI();
-        getTokenRedirect(loginRequest);
+        getTokenRedirect(tokenRequest);
       } else if (response.tokenType === "access_token") {
         console.log('access_token acquired at: ' + new Date().toString());
       } else {
@@ -36,7 +36,7 @@ function authRedirectCallBack(error, response) {
     }
   }
 
-// Redirect: once login is successful and redirects with tokens, call Graph API
+// Redirect: once login is successful and redirects with tokens, update UI
 if (myMSALObj.getAccount() && !myMSALObj.isCallback(window.location.hash)) {
     // avoid duplicate code execution on page load in case of iframe and Popup window.
     updateUI();
@@ -50,6 +50,7 @@ function signIn(method) {
   if (signInType === "Popup") {
     myMSALObj.loginPopup(loginRequest)
       .then(loginResponse => {  
+        console.log(loginResponse);
         console.log('id_token acquired at: ' + new Date().toString());
         if (myMSALObj.getAccount()) {
           updateUI();
diff --git a/JavaScriptSPA/authConfig.js b/JavaScriptSPA/authConfig.js
@@ -8,4 +8,9 @@ const msalConfig = {
         cacheLocation: "localStorage",
         storeAuthStateInCookie: true
     }
+};
+
+// request to sign-in (returns an idToken)
+const loginRequest = {
+    scopes: ["openid", "profile"],
 };
diff --git a/JavaScriptSPA/index.html b/JavaScriptSPA/index.html
@@ -21,7 +21,7 @@
 
 <body>
   <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
-    <a class="navbar-brand" href="/">MS Identity Platform</a>
+    <a class="navbar-brand" href="/">Azure AD B2C</a>
     <div class="btn-group ml-auto dropleft">
         <button type="button" id="SignIn" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
           Sign In
diff --git a/JavaScriptSPA/ui.js b/JavaScriptSPA/ui.js
@@ -23,5 +23,5 @@ function updateUI() {
 // debug helper
 function logMessage(s) {
     document.getElementById("response")
-        .appendChild(document.createTextNode('\n\n' + s));
+        .appendChild(document.createTextNode('\n' + s));
 }

Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,5 @@ function updateUI() {`
`23`	`23`	`// debug helper`
`24`	`24`	`function logMessage(s) {`
`25`	`25`	`document.getElementById("response")`
`26`		`- .appendChild(document.createTextNode('\n\n' + s));`
	`26`	`+ .appendChild(document.createTextNode('\n' + s));`
`27`	`27`	`}`