[feat] Session Token login option (#5998)

Author: greentippedammo

src/main/java/meteordevelopment/meteorclient/gui/screens/accounts/AccountInfoScreen.java

@@ -10,6 +10,7 @@
 import meteordevelopment.meteorclient.gui.widgets.containers.WHorizontalList;
 import meteordevelopment.meteorclient.gui.widgets.pressable.WButton;
 import meteordevelopment.meteorclient.systems.accounts.Account;
+import meteordevelopment.meteorclient.systems.accounts.AccountType;
 import meteordevelopment.meteorclient.systems.accounts.TokenAccount;
 import meteordevelopment.meteorclient.utils.render.color.Color;
 
@@ -28,11 +29,14 @@ public void initWidgets() {
         TokenAccount e = (TokenAccount) account;
         WHorizontalList l = add(theme.horizontalList()).expandX().widget();
 
+        String tokenLabel = account.getType() + " token:";
+        if (account.getType() == AccountType.Session) tokenLabel = "";
+
         WButton copy = theme.button("Copy");
         copy.action = () -> mc.keyboard.setClipboard(e.getToken());
 
-        l.add(theme.label("TheAltening token:"));
-        l.add(theme.label(e.getToken()).color(Color.GRAY)).pad(5);
+        l.add(theme.label(tokenLabel));
+        l.add(theme.label(account.getType() == AccountType.Session ? "Click to copy Token" : e.getToken()).color(Color.GRAY)).pad(5);
         l.add(copy);
     }
 }

src/main/java/meteordevelopment/meteorclient/gui/screens/accounts/AccountsScreen.java

@@ -37,6 +37,7 @@ public void initWidgets() {
 
         addButton(l, "Cracked", () -> mc.setScreen(new AddCrackedAccountScreen(theme, this)));
         addButton(l, "Altening", () -> mc.setScreen(new AddAlteningAccountScreen(theme, this)));
+        addButton(l, "Session", () -> mc.setScreen(new AddSessionAccountScreen(theme, this)));
         addButton(l, "Microsoft", () -> mc.setScreen(new AddMicrosoftAccountScreen(theme, this)));
     }
 

src/main/java/meteordevelopment/meteorclient/gui/screens/accounts/AddSessionAccountScreen.java

@@ -0,0 +1,39 @@
+/*
+ * This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client).
+ * Copyright (c) Meteor Development.
+ */
+
+package meteordevelopment.meteorclient.gui.screens.accounts;
+
+import meteordevelopment.meteorclient.gui.GuiTheme;
+import meteordevelopment.meteorclient.gui.widgets.containers.WTable;
+import meteordevelopment.meteorclient.gui.widgets.input.WTextBox;
+import meteordevelopment.meteorclient.systems.accounts.types.SessionAccount;
+
+public class AddSessionAccountScreen extends AddAccountScreen {
+    public AddSessionAccountScreen(GuiTheme theme, AccountsScreen parent) {
+        super(theme, "Add Session Account", parent);
+    }
+
+    @Override
+    public void initWidgets() {
+        WTable t = add(theme.table()).widget();
+
+        // Access token
+        t.add(theme.label("Access Token: "));
+        WTextBox token = t.add(theme.textBox("")).minWidth(400).expandX().widget();
+        token.setFocused(true);
+        t.row();
+
+        // Add
+        add = t.add(theme.button("Add")).expandX().widget();
+        add.action = () -> {
+            if (!token.get().isEmpty()) {
+                SessionAccount account = new SessionAccount(token.get());
+                AccountsScreen.addAccount(this, parent, account);
+            }
+        };
+
+        enterAction = add.action;
+    }
+}

src/main/java/meteordevelopment/meteorclient/systems/accounts/AccountType.java

@@ -8,5 +8,6 @@
 public enum AccountType {
     Cracked,
     Microsoft,
-    TheAltening
+    TheAltening,
+    Session
 }

src/main/java/meteordevelopment/meteorclient/systems/accounts/Accounts.java

@@ -9,6 +9,7 @@
 import meteordevelopment.meteorclient.systems.Systems;
 import meteordevelopment.meteorclient.systems.accounts.types.CrackedAccount;
 import meteordevelopment.meteorclient.systems.accounts.types.MicrosoftAccount;
+import meteordevelopment.meteorclient.systems.accounts.types.SessionAccount;
 import meteordevelopment.meteorclient.systems.accounts.types.TheAlteningAccount;
 import meteordevelopment.meteorclient.utils.misc.NbtException;
 import meteordevelopment.meteorclient.utils.misc.NbtUtils;
@@ -77,6 +78,7 @@ public Accounts fromTag(NbtCompound tag) {
                     case Cracked ->     new CrackedAccount(null).fromTag(t);
                     case Microsoft ->   new MicrosoftAccount(null).fromTag(t);
                     case TheAltening -> new TheAlteningAccount(null).fromTag(t);
+                    case Session ->     new SessionAccount(null).fromTag(t);
                 };
             } catch (NbtException e) {
                 return null;

src/main/java/meteordevelopment/meteorclient/systems/accounts/types/CrackedAccount.java

@@ -34,7 +34,7 @@ public boolean login() {
 
     @Override
     public boolean equals(Object o) {
-        if (!(o instanceof CrackedAccount)) return false;
-        return ((CrackedAccount) o).getUsername().equals(this.getUsername());
+        if (!(o instanceof CrackedAccount account)) return false;
+        return account.getUsername().equals(this.getUsername());
     }
 }

src/main/java/meteordevelopment/meteorclient/systems/accounts/types/MicrosoftAccount.java

@@ -50,7 +50,7 @@ public boolean login() {
 
     @Override
     public boolean equals(Object o) {
-        if (!(o instanceof MicrosoftAccount)) return false;
-        return ((MicrosoftAccount) o).name.equals(this.name);
+        if (!(o instanceof MicrosoftAccount account)) return false;
+        return account.name.equals(this.name);
     }
 }

src/main/java/meteordevelopment/meteorclient/systems/accounts/types/SessionAccount.java

@@ -0,0 +1,90 @@
+/*
+ * This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client).
+ * Copyright (c) Meteor Development.
+ */
+
+package meteordevelopment.meteorclient.systems.accounts.types;
+
+import com.mojang.util.UndashedUuid;
+import meteordevelopment.meteorclient.MeteorClient;
+import meteordevelopment.meteorclient.systems.accounts.Account;
+import meteordevelopment.meteorclient.systems.accounts.AccountType;
+import meteordevelopment.meteorclient.systems.accounts.TokenAccount;
+import meteordevelopment.meteorclient.utils.network.Http;
+import net.minecraft.client.session.Session;
+import net.minecraft.nbt.NbtCompound;
+
+import java.util.Optional;
+
+public class SessionAccount extends Account<SessionAccount> implements TokenAccount {
+    private String accessToken;
+
+    public SessionAccount(String label) {
+        super(AccountType.Session, label);
+        accessToken = label;
+    }
+
+    @Override
+    public SessionAccount fromTag(NbtCompound tag) {
+        super.fromTag(tag);
+
+        accessToken = tag.getString("token", "");
+        return this;
+    }
+
+    @Override
+    public NbtCompound toTag() {
+        NbtCompound tag = super.toTag();
+        tag.putString("token", accessToken);
+        return tag;
+    }
+
+    @Override
+    public boolean fetchInfo() {
+        if (accessToken == null || accessToken.isBlank()) return false;
+
+        ProfileResponse profile;
+        try {
+            profile = Http.get("https://api.minecraftservices.com/minecraft/profile")
+                .bearer(accessToken)
+                .sendJson(ProfileResponse.class);
+        } catch (IllegalArgumentException e) {
+            MeteorClient.LOG.error("Invalid session account token", e);
+            return false;
+        }
+
+        if (profile == null || profile.id == null || profile.name == null) return false;
+
+        cache.username = profile.name;
+        cache.uuid = profile.id;
+
+        return true;
+    }
+
+    @Override
+    public boolean login() {
+        if (accessToken == null || accessToken.isBlank()) return false;
+
+        super.login();
+        cache.loadHead();
+
+        setSession(new Session(cache.username, UndashedUuid.fromStringLenient(cache.uuid), accessToken, Optional.empty(), Optional.empty()));
+        return true;
+    }
+
+    @Override
+    public String getToken() {
+        return accessToken;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof SessionAccount account2)) return false;
+        return account2.name.equals(this.name);
+    }
+
+    private static class ProfileResponse {
+        public String id;
+        public String name;
+    }
+}