|
68 | 68 | }).catch(function (error) { |
69 | 69 | console.log(error); |
70 | 70 | // Call acquireTokenPopup (popup window) in case of acquireTokenSilent failure due to consent or interaction required ONLY |
71 | | - if (error.errorMessage.indexOf("consent_required") !== -1 || error.errorMessage.indexOf("interaction_required") !== -1 || error.errorMessage.indexOf("login_required") !== -1) { |
| 71 | + if (requiresInteraction(error.errorMessage)) { |
72 | 72 | myMSALObj.acquireTokenPopup(tokenRequest).then(function (tokenResponse) { |
73 | 73 | callMSGraph(applicationConfig.graphEndpoint, tokenResponse.accessToken, graphAPICallback); |
74 | 74 | }).catch(function (error) { |
|
97 | 97 | function showWelcomeMessage() { |
98 | 98 | var divWelcome = document.getElementById('WelcomeMessage'); |
99 | 99 | divWelcome.innerHTML = 'Welcome ' + myMSALObj.getAccount().userName + "to Microsoft Graph API"; |
100 | | - console.log(myMSALObj.getAccount()); |
101 | 100 | var loginbutton = document.getElementById('SignIn'); |
102 | 101 | loginbutton.innerHTML = 'Sign Out'; |
103 | 102 | loginbutton.setAttribute('onclick', 'signOut();'); |
|
111 | 110 | scopes: applicationConfig.graphScopes |
112 | 111 | }; |
113 | 112 | myMSALObj.acquireTokenSilent(tokenRequest).then(function (tokenResponse) { |
114 | | - console.log(tokenResponse.scopes); |
115 | 113 | callMSGraph(applicationConfig.graphEndpoint, tokenResponse.accessToken, graphAPICallback); |
116 | 114 | }).catch(function (error) { |
117 | 115 | console.log(error); |
118 | 116 | //Call acquireTokenRedirect in case of acquireToken Failure |
119 | | - if (error.errorMessage.indexOf("consent_required") !== -1 || error.errorMessage.indexOf("interaction_required") !== -1 || error.errorMessage.indexOf("login_required") !== -1) { |
| 117 | + if (requiresInteraction(error.errorMessage)) { |
120 | 118 | myMSALObj.acquireTokenRedirect(tokenRequest); |
121 | 119 | } |
122 | 120 | }); |
|
134 | 132 | console.log(error); |
135 | 133 | } |
136 | 134 |
|
137 | | - |
| 135 | + function requiresInteraction(errorMessage) { |
| 136 | + return errorMessage.indexOf("consent_required") !== -1 || |
| 137 | + errorMessage.indexOf("interaction_required") !== -1 || |
| 138 | + errorMessage.indexOf("login_required") !== -1; |
| 139 | + } |
138 | 140 | // Browser check variables |
139 | 141 | var ua = window.navigator.userAgent; |
140 | 142 | var msie = ua.indexOf('MSIE '); |
|
153 | 155 | } |
154 | 156 | else { |
155 | 157 | document.getElementById("SignIn").onclick = function () { |
156 | | - let tokenRequest = { |
| 158 | + let redirectTokenRequest = { |
157 | 159 | scopes: applicationConfig.graphScopes |
158 | 160 | }; |
159 | | - myMSALObj.loginRedirect(tokenRequest); |
| 161 | + myMSALObj.loginRedirect(redirectTokenRequest); |
160 | 162 | }; |
161 | 163 |
|
162 | 164 | if (myMSALObj.getAccount() && !myMSALObj.isCallback(window.location.hash)) {// avoid duplicate code execution on page load in case of iframe and popup window. |
|
0 commit comments