Fix refresh

QuestCraftPlusPlus · Sep 22, 2024 · 724e13c · 724e13c
1 parent e4175cc
commit 724e13c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/src/main/java/pojlib/API.java b/src/main/java/pojlib/API.java
@@ -217,8 +217,8 @@ public static void login(Activity activity)
             API.profileImage = MinecraftAccount.getSkinFaceUrl(API.currentAcc);
             API.profileName = API.currentAcc.username;
             return;
-        } else if(acc != null && acc.expiresOn > System.currentTimeMillis()) {
-            currentAcc = LoginHelper.refreshAccount(acc);
+        } else if(acc != null && acc.expiresOn < System.currentTimeMillis()) {
+            currentAcc = LoginHelper.refreshAccount(activity);
             if(currentAcc == null) {
                 LoginHelper.login(activity);
             } else {

diff --git a/src/main/java/pojlib/account/LoginHelper.java b/src/main/java/pojlib/account/LoginHelper.java
@@ -1,6 +1,7 @@
 package pojlib.account;
 
 import android.app.Activity;
+import android.util.Log;
 
 import com.microsoft.aad.msal4j.DeviceCode;
 import com.microsoft.aad.msal4j.DeviceCodeFlowParameters;
@@ -25,6 +26,7 @@
 
 import pojlib.API;
 import pojlib.util.Constants;
+import pojlib.util.GsonUtils;
 import pojlib.util.Logger;
 import pojlib.util.MSAException;
 
@@ -61,9 +63,9 @@ public class LoginHelper {
         SCOPES.add("XboxLive.offline_access");
     }
 
-    public static MinecraftAccount refreshAccount(MinecraftAccount acc) {
+    public static MinecraftAccount refreshAccount(Activity activity) {
         Set<IAccount> accountsInCache = pca.getAccounts().join();
-            IAccount account = accountsInCache.iterator().next();
+        IAccount account = accountsInCache.iterator().next();
 
         IAuthenticationResult result;
         try {
@@ -73,12 +75,11 @@ public static MinecraftAccount refreshAccount(MinecraftAccount acc) {
                             .build();
 
             result = pca.acquireTokenSilently(silentParameters).join();
-            result.expiresOnDate().getTime();
-
-            acc.expiresOn = result.expiresOnDate().getTime();
-            acc.accessToken = Msa.acquireXBLToken(result.accessToken());
+            MinecraftAccount acc = new Msa(activity).performLogin(result.accessToken());
+            GsonUtils.objectToJsonFile(activity.getFilesDir() + "/accounts/account.json", acc);
             return acc;
         } catch (Exception ex) {
+            Logger.getInstance().appendToLog("Couldn't refresh token! " + ex);
             return null;
         }
     }
@@ -95,7 +96,7 @@ public static void login(Activity activity) {
                     Thread.sleep(20);
                 }
                 try {
-                    API.currentAcc = MinecraftAccount.login(activity, activity.getFilesDir() + "/accounts", res.accessToken(), res.expiresOnDate().getTime());
+                    API.currentAcc = MinecraftAccount.login(activity, activity.getFilesDir() + "/accounts", res.accessToken());
                 } catch (IOException | JSONException | MSAException e) {
                     Logger.getInstance().appendToLog("Unable to load account! | " + e);
                 }

diff --git a/src/main/java/pojlib/account/MinecraftAccount.java b/src/main/java/pojlib/account/MinecraftAccount.java
@@ -24,11 +24,9 @@ public class MinecraftAccount {
     public long expiresOn;
     public final String userType = "msa";
 
-    public static MinecraftAccount login(Activity activity, String gameDir, String msToken, long expiresOn) throws MSAException, IOException, JSONException {
-        String mcToken = Msa.acquireXBLToken(msToken);
+    public static MinecraftAccount login(Activity activity, String gameDir, String msToken) throws MSAException, IOException, JSONException {
         Msa instance = new Msa(activity);
-        MinecraftAccount account = instance.performLogin(mcToken);
-        account.expiresOn = expiresOn;
+        MinecraftAccount account = instance.performLogin(msToken);
 
         GsonUtils.objectToJsonFile(gameDir + "/account.json", account);
         return account;

diff --git a/src/main/java/pojlib/account/Msa.java b/src/main/java/pojlib/account/Msa.java
@@ -47,16 +47,17 @@ public class Msa {
     public String mcToken;
     public static String mcUuid;
     public static boolean doesOwnGame;
-    public long expiresAt;
     private Activity activity;
+    private long mcExpiresOn;
 
     public Msa(Activity currentActivity) {
         this.activity = currentActivity;
     }
 
     /** Performs a full login, calling back listeners appropriately  */
-    public MinecraftAccount performLogin(String xblToken) throws MSAException {
+    public MinecraftAccount performLogin(String msToken) throws MSAException {
         try {
+            String xblToken = acquireXBLToken(msToken);
             String[] xsts = acquireXsts(xblToken);
             if(xsts == null) {
                 return null;
@@ -71,7 +72,7 @@ public MinecraftAccount performLogin(String xblToken) throws MSAException {
                 acc.accessToken = mcToken;
                 acc.username = mcName;
                 acc.uuid = mcUuid;
-                acc.expiresOn = expiresAt;
+                acc.expiresOn = mcExpiresOn;
             } else {
                 Logger.getInstance().appendToLog("MicrosoftLogin | Unknown Error occurred.");
                 throw new MSAException("MicrosoftLogin | Unknown Error occurred.");
@@ -176,8 +177,8 @@ private void acquireMinecraftToken(String xblUhs, String xblXsts) throws IOExcep
         if(conn.getResponseCode() >= 200 && conn.getResponseCode() < 300) {
             JSONObject jo = new JSONObject(FileUtil.read(conn.getInputStream()));
             conn.disconnect();
-            expiresAt = System.currentTimeMillis() + (jo.getInt("expires_in") * 1000L);
             mcToken = jo.getString("access_token");
+            mcExpiresOn = System.currentTimeMillis() + (jo.getInt("expires_in") * 1000L);
         }else{
             throw getResponseThrowable(conn);
         }

diff --git a/src/main/java/pojlib/util/json/MinecraftInstances.java b/src/main/java/pojlib/util/json/MinecraftInstances.java
@@ -48,7 +48,7 @@ public static class Instance {
 
         public List<String> generateLaunchArgs(MinecraftAccount account) {
             String[] mcArgs = {"--username", account.username, "--version", versionName, "--gameDir", gameDir,
-                    "--assetsDir", assetsDir, "--assetIndex", assetIndex, "--uuid", account.uuid,
+                    "--assetsDir", assetsDir, "--assetIndex", assetIndex, "--uuid", account.uuid.replace("-", ""),
                     "--accessToken", account.accessToken, "--userType", account.userType, "--versionType", "release"};
 
             List<String> allArgs = new ArrayList<>(Arrays.asList("-cp", classpath));