update lib + code changes

Author: DarylThayil

JavaScriptSPA/index.html

@@ -19,10 +19,10 @@
     </div>
 <script>
     var applicationConfig = {
-        clientID: 'Enter_the_Application_Id_here', //This is your client ID
-        authority: "https://login.microsoftonline.com/Enter_the_Tenant_Info_Here",  //Default authority value is https://login.microsoftonline.com/common
-        graphScopes: ["user.read"],
-        graphEndpoint: "https://graph.microsoft.com/v1.0/me"
+        clientID: "245e9392-c666-4d51-8f8a-bfd9e55b2456",
+            authority: "https://login.microsoftonline.com/common",
+            graphScopes: ["user.read", "Mail.Send"],
+            graphEndpoint: "https://graph.microsoft.com/v1.0/me"
     };
 
     var config = {
@@ -68,7 +68,7 @@
         }).catch(function (error) {
             console.log(error);
             // Call acquireTokenPopup (popup window) in case of acquireTokenSilent failure due to consent or interaction required ONLY
-            if (error.errorMessage.indexOf("consent_required") !== -1 || error.errorMessage.indexOf("interaction_required") !== -1 || error.errorMessage.indexOf("login_required") !== -1) {
+            if (requiresInteraction(error.errorMessage)) {
                 myMSALObj.acquireTokenPopup(tokenRequest).then(function (tokenResponse) {
                     callMSGraph(applicationConfig.graphEndpoint, tokenResponse.accessToken, graphAPICallback);
                 }).catch(function (error) {
@@ -97,7 +97,6 @@
     function showWelcomeMessage() {
         var divWelcome = document.getElementById('WelcomeMessage');
         divWelcome.innerHTML = 'Welcome ' + myMSALObj.getAccount().userName + "to Microsoft Graph API";
-        console.log(myMSALObj.getAccount());
         var loginbutton = document.getElementById('SignIn');
         loginbutton.innerHTML = 'Sign Out';
         loginbutton.setAttribute('onclick', 'signOut();');
@@ -111,12 +110,11 @@
             scopes: applicationConfig.graphScopes
         };
         myMSALObj.acquireTokenSilent(tokenRequest).then(function (tokenResponse) {
-            console.log(tokenResponse.scopes);
             callMSGraph(applicationConfig.graphEndpoint, tokenResponse.accessToken, graphAPICallback);
         }).catch(function (error) {
             console.log(error);
             //Call acquireTokenRedirect in case of acquireToken Failure
-            if (error.errorMessage.indexOf("consent_required") !== -1 || error.errorMessage.indexOf("interaction_required") !== -1 || error.errorMessage.indexOf("login_required") !== -1) {
+            if (requiresInteraction(error.errorMessage)) {
                 myMSALObj.acquireTokenRedirect(tokenRequest);
             }
         });
@@ -134,7 +132,14 @@
         console.log(error);
     }
 
-
+    function requiresInteraction(errorMessage) {
+        if (!errorMessage || !errorMessage.length) {
+            return false;
+        }
+        return errorMessage.indexOf("consent_required") !== -1 ||
+            errorMessage.indexOf("interaction_required") !== -1 ||
+            errorMessage.indexOf("login_required") !== -1;
+    }
     // Browser check variables
     var ua = window.navigator.userAgent;
     var msie = ua.indexOf('MSIE ');
@@ -153,10 +158,10 @@
     }
     else {
         document.getElementById("SignIn").onclick = function () {
-            let tokenRequest = {
+            let redirectTokenRequest = {
                 scopes: applicationConfig.graphScopes
             };
-            myMSALObj.loginRedirect(tokenRequest);
+            myMSALObj.loginRedirect(redirectTokenRequest);
         };
 
         if (myMSALObj.getAccount() && !myMSALObj.isCallback(window.location.hash)) {// avoid duplicate code execution on page load in case of iframe and popup window.