Upstream/VIAaaS
1
0
Fork 0
mirror of https://github.com/ViaVersion/VIAaaS.git synced 2025-01-08 19:38:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

use localStorage for msa, fix loginRequest

Browse Source
This commit is contained in:
creeper123123321 2022-04-23 05:12:37 -03:00
parent 1244c7b7a0
commit 007ff302b9
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/resources/web/js/page.js
View File

@ -481,7 +481,7 @@ class MicrosoftAccount extends McAccount {
refresh() {
super.refresh();
return getTokenPopup(this.msUser, loginRequest)
return getTokenPopup(this.msUser, getLoginRequest())
.then(response => fetch("https://user.auth.xboxlive.com/user/authenticate", {
method: "post",
body: JSON.stringify({
@ -586,7 +586,9 @@ function loginMc(user, pass) {
$("#form_add_mc input").val("");
}
const loginRequest = {scopes: ["XboxLive.signin"], prompt: "select_account"};
function getLoginRequest() {
return {scopes: ["XboxLive.signin"]};
}
let redirectUrl = "https://viaversion.github.io/VIAaaS/src/main/resources/web/";
if (location.hostname === "localhost" || whitelistedOrigin.includes(location.origin)) {
redirectUrl = location.origin + location.pathname;
@ -599,7 +601,7 @@ const msalConfig = {
redirectUri: redirectUrl,
},
cache: {
cacheLocation: "sessionStorage",
cacheLocation: "localStorage",
storeAuthStateInCookie: false,
}
};
@ -607,7 +609,9 @@ const msalConfig = {
const myMSALObj = new msal.PublicClientApplication(msalConfig);
function loginMs() {
myMSALObj.loginRedirect(loginRequest);
let req = getLoginRequest();
req.prompt = "select_account";
myMSALObj.loginRedirect(req);
}
$(() => myMSALObj.handleRedirectPromise().then((resp) => {
@ -627,6 +631,7 @@ $(() => myMSALObj.handleRedirectPromise().then((resp) => {
function getTokenPopup(username, request) {
request.account = myMSALObj.getAccountByUsername(username);
request.loginHint = username;
return myMSALObj.acquireTokenSilent(request).catch(error => {
console.warn("silent token acquisition fails.");
if (error instanceof msal.InteractionRequiredAuthError) {