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

HMCL-dev#2908) This reverts commit 8678c0d.
MoeNetwork · Mar 9, 2024 · eadfff3 · eadfff3
1 parent cb4cd69
commit eadfff3
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/microsoft/MicrosoftAccount.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/microsoft/MicrosoftAccount.java
@@ -84,16 +84,20 @@ public String getIdentifier() {
 
     @Override
     public AuthInfo logIn() throws AuthenticationException {
-        if (!authenticated || !service.validate(session.getNotAfter(), session.getTokenType(), session.getAccessToken())) {
-            MicrosoftSession acquiredSession = service.refresh(session);
-            if (!Objects.equals(acquiredSession.getProfile().getId(), session.getProfile().getId())) {
-                throw new ServerResponseMalformedException("Selected profile changed");
+        if (!authenticated) {
+            if (service.validate(session.getNotAfter(), session.getTokenType(), session.getAccessToken())) {
+                authenticated = true;
+            } 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();