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

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

Browse Source 
* auth: Always check token.exp when launch game

fix #2048

* Remove wrong notAfter check
This commit is contained in:
Kevin Z
2024-01-12 20:53:47 -07:00
committed by GitHub
parent 2116cfd789
commit 8678c0dcf2
1 changed files with 9 additions and 13 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,20 +84,16 @@ public class MicrosoftAccount extends OAuthAccount {
@Override @Override
public AuthInfo logIn() throws AuthenticationException { public AuthInfo logIn() throws AuthenticationException {
if (!authenticated) { if (!authenticated || !service.validate(session.getNotAfter(), session.getTokenType(), session.getAccessToken())) {
if (service.validate(session.getNotAfter(), session.getTokenType(), session.getAccessToken())) { MicrosoftSession acquiredSession = service.refresh(session);
authenticated = true; if (!Objects.equals(acquiredSession.getProfile().getId(), session.getProfile().getId())) {
} else { throw new ServerResponseMalformedException("Selected profile changed");
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();