Skip to content
This repository has been archived by the owner. It is now read-only.

Commit f74b0fc

Browse files
authored
Merge pull request #16 from Azure-Samples/qs
Update to use MSAL.js 1.0.0
2 parents 92e7fda + bd954c0 commit f74b0fc

File tree

2 files changed

+11
-27
lines changed

2 files changed

+11
-27
lines changed

JavaScriptSPA/index.html

+11-10
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>Quickstart for MSAL JS</title>
55
<script src="https://cdnjs.cloudflare.com/ajax/libs/bluebird/3.3.4/bluebird.min.js"></script>
6-
<script src="/msal-1.0.0-preview.4.min.js"></script>
6+
<script src="https://secure.aadcdn.microsoftonline-p.com/lib/1.0.0/js/msal.js"></script>
77
</head>
88

99
<body>
@@ -41,7 +41,8 @@
4141
var myMSALObj = new Msal.UserAgentApplication(msalConfig);
4242

4343
// Register Callbacks for redirect flow
44-
myMSALObj.handleRedirectCallbacks(acquireTokenRedirectCallBack, acquireTokenErrorRedirectCallBack);
44+
// myMSALObj.handleRedirectCallbacks(acquireTokenRedirectCallBack, acquireTokenErrorRedirectCallBack);
45+
myMSALObj.handleRedirectCallback(authRedirectCallBack);
4546

4647
function signIn() {
4748
myMSALObj.loginPopup(requestObj).then(function (loginResponse) {
@@ -115,18 +116,18 @@
115116
});
116117
}
117118

118-
function acquireTokenRedirectCallBack(response) {
119-
if (response.tokenType === "access_token") {
120-
callMSGraph(graphConfig.graphMeEndpoint, response.accessToken, graphAPICallback);
119+
function authRedirectCallBack(error, response) {
120+
if (error) {
121+
console.log(error);
121122
} else {
122-
console.log("token type is:" + response.tokenType);
123+
if (response.tokenType === "access_token") {
124+
callMSGraph(graphConfig.graphMeEndpoint, response.accessToken, graphAPICallback);
125+
} else {
126+
console.log("token type is:" + response.tokenType);
127+
}
123128
}
124129
}
125130

126-
function acquireTokenErrorRedirectCallBack(error) {
127-
console.log(error);
128-
}
129-
130131
function requiresInteraction(errorCode) {
131132
if (!errorCode || !errorCode.length) {
132133
return false;

JavaScriptSPA/msal-1.0.0-preview.4.min.js

-17
This file was deleted.

0 commit comments

Comments
 (0)