deleting policies.js, moving callAPI to api.js

derisen · derisen · commit 0362d84fa31c · 2020-02-28T16:15:09.000-08:00
diff --git a/JavaScriptSPA/api.js b/JavaScriptSPA/api.js
@@ -17,4 +17,18 @@ 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);
+          }
+      });
 }
diff --git a/JavaScriptSPA/authConfig.js b/JavaScriptSPA/authConfig.js
@@ -1,7 +1,7 @@
 const msalConfig = {
     auth: {
-        clientId: "e760cab2-b9a1-4c0d-86fb-ff7084abd902", //This is your client ID
-        authority: "https://fabrikamb2c.b2clogin.com/fabrikamb2c.onmicrosoft.com/" + b2cPolicies.signUpSignIn, //This is your tenant info
+        clientId: "e760cab2-b9a1-4c0d-86fb-ff7084abd902",
+        authority: "https://fabrikamb2c.b2clogin.com/fabrikamb2c.onmicrosoft.com/b2c_1_susi",
         validateAuthority: false
     },
     cache: {
diff --git a/JavaScriptSPA/authPopup.js b/JavaScriptSPA/authPopup.js
@@ -36,18 +36,4 @@ function getTokenPopup(request) {
           console.log(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);
-          }
-      });
 }
diff --git a/JavaScriptSPA/authRedirect.js b/JavaScriptSPA/authRedirect.js
@@ -3,6 +3,7 @@
 const myMSALObj = new Msal.UserAgentApplication(msalConfig);
 
 let accessToken;
+
 // Register Callbacks for Redirect flow
 myMSALObj.handleRedirectCallback(authRedirectCallBack);
 
diff --git a/JavaScriptSPA/index.html b/JavaScriptSPA/index.html
@@ -20,13 +20,17 @@
 </head>
 
 <body>
+
+  <!-- Navbar -->
   <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
     <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" onclick="signIn()">Sign In</button>
         <button type="button" id="signOut" class="btn btn-success" onclick="logout()" style="display:none">Sign Out</button>
     </div>
   </nav>
+
+  <!-- Content -->
   <div class="card">
     <h5 class="card-header text-center">Getting an access token with Azure AD B2C and calling a Web API</h5>
     <div class="card-body text-center">
@@ -42,12 +46,10 @@ <h5 id="label" class="card-title">Sign-in with Microsoft Azure AD B2C</h5>
   <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>
 
   <!-- importing app scripts -->
-  <script type="text/javascript" src="./policies.js"></script>
   <script type="text/javascript" src="./authConfig.js"></script>
   <script type="text/javascript" src="./apiConfig.js"></script>
   <script type="text/javascript" src="./ui.js"></script>
-
-  <!-- replace with authRedirect if you would like to use redirect flow -->
+  <!-- replace next with authRedirect if you would like to use redirect flow -->
   <script type="text/javascript" src="./authPopup.js"></script>
   <script type="text/javascript" src="./api.js"></script>
 </body>
diff --git a/JavaScriptSPA/policies.js b/JavaScriptSPA/policies.js
diff --git a/JavaScriptSPA/ui.js b/JavaScriptSPA/ui.js
@@ -1,9 +1,7 @@
 // UI elements to work with
 const signInButton = document.getElementById('signIn');
 const signOutButton = document.getElementById('signOut');
-
 const callWebApiButton = document.getElementById('callApiButton');
-
 const label = document.getElementById('label');
 const response = document.getElementById("response");
 
