lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "auth: Always check token.exp when launch game (#2642)" (#2908)

Browse Source 
This reverts commit 8678c0dcf2.
This commit is contained in:
Glavo
2024-03-09 20:25:59 +08:00
committed by GitHub
parent cb4cd696a0
commit eadfff349a
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
HMCLCore/src/main/java/org/jackhuang/hmcl/auth/microsoft/MicrosoftAccount.java
View File

@@ -84,16 +84,20 @@ public class MicrosoftAccount extends OAuthAccount {
@Override @Override
public AuthInfo logIn() throws AuthenticationException { public AuthInfo logIn() throws AuthenticationException {
if (!authenticated || !service.validate(session.getNotAfter(), session.getTokenType(), session.getAccessToken())) { if (!authenticated) {
MicrosoftSession acquiredSession = service.refresh(session); if (service.validate(session.getNotAfter(), session.getTokenType(), session.getAccessToken())) {
if (!Objects.equals(acquiredSession.getProfile().getId(), session.getProfile().getId())) { authenticated = true;
throw new ServerResponseMalformedException("Selected profile changed"); } else {
MicrosoftSession acquiredSession = service.refresh(session);
if (!Objects.equals(acquiredSession.getProfile().getId(), session.getProfile().getId())) {
throw new ServerResponseMalformedException("Selected profile changed");
}
session = acquiredSession;
authenticated = true;
invalidate();
} }
session = acquiredSession;
authenticated = true;
invalidate();
} }
return session.toAuthInfo(); return session.toAuthInfo();