PojavLauncherTeam/PojavLauncher_iOS
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[WIP] Mojang auth

Browse Source
This commit is contained in:
Duy Tran Khanh committed 2021-02-10 20:58:43 +07:00
1 parent c2e4e993ab
commit aef99100ef
15 files changed
+178 -129
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

JavaApp/src/main/java/net/kdt/pojavlaunch/PLaunchApp.java
+3 -11
View File
@@ -15,7 +15,6 @@ public class PLaunchApp {
private static float currProgress, maxProgress;
public static JMinecraftVersionList mVersionList;
public static volatile MinecraftAccount mAccount;
public static volatile JMinecraftVersionList.Version mVersion;
public static boolean mIsAssetsProcessing = false;
@@ -24,8 +23,7 @@ public class PLaunchApp {
try {
File mcDir = new File("/var/mobile/Documents/minecraft");
mcDir.mkdirs();
File pojavDir = new File("/var/mobile/Documents/.pojavlauncher/accounts");
pojavDir.mkdirs();
new File(DIR_ACCOUNT_NEW).mkdirs();
if (!new File(mcDir, "config_ver.txt").exists()) {
Tools.write(mcDir.getAbsolutePath() + "/config_ver.txt", "1.16.5");
}
@@ -51,9 +49,9 @@ public class PLaunchApp {
System.out.println("Launching Minecraft " + mVersion.id);
try {
Tools.launchMinecraft(mAccount, mVersion);
Tools.launchMinecraft(AccountJNI.CURRENT_ACCOUNT, mVersion);
} catch (Throwable th) {
throw new RuntimeException(th);
Tools.showError(th);
}
}
@@ -78,10 +76,6 @@ public class PLaunchApp {
Thread.sleep(1000);
} catch (InterruptedException e) {}
// dummy account
MinecraftAccount acc = new MinecraftAccount();
acc.selectedVersion = mcver;
new File(Tools.DIR_HOME_VERSION + "/" + mcver).mkdirs();
JMinecraftVersionList.Version verInfo = null;
@@ -175,8 +169,6 @@ public class PLaunchApp {
e.printStackTrace();
}
mAccount = acc;
UIKit.launchMinecraftSurface(mVersion.arguments != null);
}).start();
JavaApp/src/main/java/net/kdt/pojavlaunch/PojavProfile.java.todo → JavaApp/src/main/java/net/kdt/pojavlaunch/PojavProfile.java
+36 -35
View File
@@ -9,28 +9,36 @@ import net.kdt.pojavlaunch.value.MinecraftAccount;
public class PojavProfile
{
private static String PROFILE_PREF = "pojav_profile";
private static String PROFILE_PREF_FILE = "file";
private static String PROFILE_PREF_TEMP_CONTENT = "tempContent";
private static SharedPreferences getPrefs(Context ctx) {
return ctx.getSharedPreferences(PROFILE_PREF, Context.MODE_PRIVATE);
}
public static MinecraftAccount getCurrentProfileContent(Context ctx) throws IOException, JsonSyntaxException {
MinecraftAccount build = MinecraftAccount.load(getCurrentProfileName(ctx));
if (build == null) {
return getTempProfileContent(ctx);
private static final File currAccFile;
static {
try {
File currAccFile = new File(Tools.DIR_APP_DATA, "curr_account.txt");
currAccFile.getParentFile().mkdir();
// currAccFile.createNewFile();
} catch (IOException e) {
e.printStackTrace();
}
return build;
}
}
public static MinecraftAccount getCurrentProfileContent() throws IOException, JsonSyntaxException {
MinecraftAccount build = MinecraftAccount.load(getCurrentProfileName());
if (build == null) {
return getTempProfileContent();
}
return MinecraftAccount.load(getCurrentProfileName());
}
/*
public static MinecraftAccount getTempProfileContent(Context ctx) {
return MinecraftAccount.parse(getPrefs(ctx).getString(PROFILE_PREF_TEMP_CONTENT, ""));
}
public static String getCurrentProfileName(Context ctx) {
String name = getPrefs(ctx).getString(PROFILE_PREF_FILE, "");
*/
public static String getCurrentProfileName() {
String name = "";
try {
name = Tools.read(currAccFile.getAbsolutePath());
} catch (IOException e) {
e.printStackTrace();
}
// A dirty fix
if (!name.isEmpty() && name.startsWith(Tools.DIR_ACCOUNT_NEW) && name.endsWith(".json")) {
name = name.substring(0, name.length() - 5).replace(Tools.DIR_ACCOUNT_NEW, "").replace(".json", "");
@@ -39,43 +47,36 @@ public class PojavProfile
return name;
}
public static boolean setCurrentProfile(Context ctx, Object obj) {
SharedPreferences.Editor pref = getPrefs(ctx).edit();
public static boolean setCurrentProfile(Object obj) {
try {
if (obj instanceof MinecraftAccount) {
/*
try {
MinecraftAccount.saveTempAccount((MinecraftAccount) obj);
} catch (IOException e) {
Tools.showError(ctx, e);
}
*/
throw new UnsupportedOperationException("Temp account is not supported yet");
} else if (obj instanceof String) {
String acc = (String) obj;
pref.putString(PROFILE_PREF_FILE, acc);
Tools.write(currAccFile.getAbsolutePath(), acc);
MinecraftAccount.clearTempAccount();
} else if (obj == null) {
pref.putString(PROFILE_PREF_FILE, "");
} else {
throw new IllegalArgumentException("Profile must be MinecraftAccount.class, String.class or null");
}
} finally {
return pref.commit();
} catch (IOException e) {
e.printStackTrace();
}
}
public static boolean isFileType(Context ctx) {
return new File(Tools.DIR_ACCOUNT_NEW + "/" + PojavProfile.getCurrentProfileName(ctx) + ".json").exists();
public static boolean isFileType() {
return new File(Tools.DIR_ACCOUNT_NEW + "/" + getCurrentProfileName() + ".json").exists();
}
public static void launch(Activity ctx, Object o) {
PojavProfile.setCurrentProfile(ctx, o);
Intent intent = new Intent(ctx, PojavV2ActivityManager.getLauncherRemakeVer(ctx)); //MCLauncherActivity.class);
ctx.startActivity(intent);
}
public static void updateTokens(final Activity ctx, final String name, RefreshListener listen) throws Exception {
new RefreshTokenTask(ctx, listen).execute(Tools.DIR_ACCOUNT_NEW + "/" + name + ".json");
public static void updateTokens(final String name, RefreshListener listen) throws Exception {
new RefreshTokenTask(listen).run(name);
}
}
JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java
+7 -4
View File
@@ -31,12 +31,12 @@ public final class Tools
public static String DIR_DATA = "/Applications/PojavLauncher.app";
public static String CURRENT_ARCHITECTURE;
// New since 3.3.1
public static String DIR_ACCOUNT_NEW;
public static String DIR_ACCOUNT_OLD;
public static final String DIR_GAME_HOME = "/var/mobile/Documents";
public static final String DIR_GAME_NEW = DIR_GAME_HOME + "/minecraft";
public static final String DIR_APP_DATA = DIR_GAME_HOME + "/.pojavlauncher";
public static final String DIR_ACCOUNT_NEW = DIR_APP_DATA + "/accounts";
// New since 3.0.0
public static String DIR_HOME_JRE = "/usr/lib/jvm/java-16-openjdk";
public static String DIRNAME_HOME_JRE = "lib";
@@ -94,7 +94,7 @@ public final class Tools
System.out.println("It went past main(). Should not reach here!");
} catch (Throwable th) {
throw new RuntimeException(th);
showError(th);
}
}).start();
@@ -406,6 +406,9 @@ public final class Tools
pw.flush();
System.err.println(sw.toString());
UIKit.showError(title, sw.toString(), exitIfOk);
/*
Platform.getPlatform().runOnUIThread(() -> {
WindowAlertController alertController = new WindowAlertController(title, sw.toString(), UIAlertControllerStyle.Alert);
JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/InvalidateTokenTask.java.todo → JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/InvalidateTokenTask.java
+6 -19
View File
@@ -8,37 +8,24 @@ import java.util.*;
import net.kdt.pojavlaunch.*;
import net.kdt.pojavlaunch.value.*;
public class InvalidateTokenTask extends AsyncTask<String, Void, Throwable> {
public class InvalidateTokenTask {
private YggdrasilAuthenticator authenticator = new YggdrasilAuthenticator();
//private Gson gson = new Gson();
private MinecraftAccount profilePath;
private Context ctx;
private String path;
public InvalidateTokenTask(Context ctx) {
this.ctx = ctx;
}
private String name;
@Override
public Throwable doInBackground(String... args) {
path = args[0];
public Throwable run(String name) {
this.name = name;
try {
this.profilePath = MinecraftAccount.load(args[0]);
this.profilePath = MinecraftAccount.load(name);
this.authenticator.invalidate(profilePath.accessToken,
UUID.fromString(profilePath.isMicrosoft ? profilePath.profileId : profilePath.clientToken /* should be? */));
new File(Tools.DIR_ACCOUNT_NEW, name + ".json").delete();
return null;
} catch (Throwable e) {
return e;
}
}
@Override
public void onPostExecute(Throwable result) {
if (result != null) {
Tools.showError(ctx, result);
}
new File(path).delete();
}
}
JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/LoginTask.java.todo → JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/LoginTask.java
+3 -15
View File
@@ -6,17 +6,11 @@ import java.io.*;
import java.util.*;
import net.kdt.pojavlaunch.*;
public class LoginTask extends AsyncTask<String, Void, String[]>
{
public class LoginTask {
private YggdrasilAuthenticator authenticator = new YggdrasilAuthenticator();
//private String TAG = "MojangAuth-login";
private LoginListener listener;
public LoginTask setLoginListener(LoginListener listener) {
this.listener = listener;
return this;
}
private UUID getRandomUUID() {
return UUID.randomUUID();
}
@@ -29,12 +23,12 @@ public class LoginTask extends AsyncTask<String, Void, String[]>
}
@Override
protected String[] doInBackground(String[] args) {
protected String[] run(String username, String password) {
ArrayList<String> str = new ArrayList<String>();
str.add("ERROR");
try{
try{
AuthenticateResponse response = authenticator.authenticate(args[0], args[1], getRandomUUID());
AuthenticateResponse response = authenticator.authenticate(username, password, getRandomUUID());
if (response.selectedProfile == null) {
str.add("Can't login a demo account!\n");
} else {
@@ -59,10 +53,4 @@ public class LoginTask extends AsyncTask<String, Void, String[]>
}
return str.toArray(new String[0]);
}
@Override
protected void onPostExecute(String[] result) {
listener.onLoginDone(result);
super.onPostExecute(result);
}
}
JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/RefreshTokenTask.java.todo → JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/RefreshTokenTask.java
+3 -35
View File
@@ -1,41 +1,19 @@
package net.kdt.pojavlaunch.authenticator.mojang;
import android.content.*;
import android.os.*;
import com.google.gson.*;
import java.util.*;
import net.kdt.pojavlaunch.*;
import net.kdt.pojavlaunch.authenticator.mojang.yggdrasil.*;
import android.app.*;
import net.kdt.pojavlaunch.value.*;
public class RefreshTokenTask extends AsyncTask<String, Void, Throwable> {
public class RefreshTokenTask {
private YggdrasilAuthenticator authenticator = new YggdrasilAuthenticator();
//private Gson gson = new Gson();
private RefreshListener listener;
private MinecraftAccount profilePath;
private Context ctx;
private ProgressDialog build;
public RefreshTokenTask(Context ctx, RefreshListener listener) {
this.ctx = ctx;
this.listener = listener;
}
@Override
public void onPreExecute() {
build = new ProgressDialog(ctx);
build.setMessage(ctx.getString(R.string.global_waiting));
build.setProgressStyle(ProgressDialog.STYLE_SPINNER);
build.setCancelable(false);
build.show();
}
@Override
public Throwable doInBackground(String... args) {
public Throwable run(String name) {
try {
this.profilePath = MinecraftAccount.load(args[0]);
this.profilePath = MinecraftAccount.load(name);
int responseCode = 400;
responseCode = this.authenticator.validate(profilePath.accessToken).statusCode;
if (responseCode >= 200 && responseCode < 300) {
@@ -61,15 +39,5 @@ public class RefreshTokenTask extends AsyncTask<String, Void, Throwable> {
return e;
}
}
@Override
public void onPostExecute(Throwable result) {
build.dismiss();
if (result == null) {
listener.onSuccess(null);
} else {
listener.onFailed(result);
}
}
}
JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/AccountJNI.java
+67
View File
@@ -0,0 +1,67 @@
package net.kdt.pojavlaunch.uikit;
import net.kdt.pojavlaunch.PojavProfile;
import net.kdt.pojavlaunch.authenticator.mojang.*;
import net.kdt.pojavlaunch.value.MinecraftAccount;
public class AccountJNI {
public static final int TYPE_SELECTACC = 0;
public static final int TYPE_MICROSOFT = 0;
public static final int TYPE_MOJANG = 0;
public static final int TYPE_OFFLINE = 0;
public static volatile MinecraftAccount CURRENT_ACCOUNT;
// Call back about account credentials for login
public static boolean loginAccount(int type,
String username, // Mojang or offline username
String password, // Mojang password or Microsoft token
) {
try {
switch (type) {
case TYPE_SELECTACC:
PojavProfile.updateTokens(username);
CURRENT_ACCOUNT = MinecraftAccount.load(username);
return true;
case TYPE_MICROSOFT:
// TODO
break;
case TYPE_MOJANG:
String[] retArr = new LoginTask().run(username, password);
if (!retArr[0].equals("NORMAL")) {
StringBuilder full = new StringBuilder();
for (int i = 1; i < retArr.length; i++) {
full.append(retArr[i] + "\n");
}
UIKit.showError("Error", full.toString());
return false;
} else {
CURRENT_ACCOUNT = new MinecraftAccount();
CURRENT_ACCOUNT.accessToken = retArr[1];
CURRENT_ACCOUNT.clientToken = retArr[2];
CURRENT_ACCOUNT.profileId = retArr[3];
CURRENT_ACCOUNT.username = retArr[4];
CURRENT_ACCOUNT.save();
return true;
}
break;
case TYPE_OFFLINE:
CURRENT_ACCOUNT = new MinecraftAccount();
CURRENT_ACCOUNT.username = username;
CURRENT_ACCOUNT.save();
return true;
}
} catch (Throwable th) {
Tools.showError(th);
}
return false;
}
static {
// System.loadLibrary("pojavexec");
}
}
JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/UIKit.java
+2
View File
@@ -76,6 +76,8 @@ public class UIKit {
public static native int launchUI(String[] uiArgs);
// public static native void runOnUIThread(UIKitCallback callback);
public static native void showError(String title, String message, boolean exitIfOk);
private static native void updateMCGuiScale(int scale);
// Update progress