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

Rewrote the Mojang authentication HTTP post

Browse Source
This commit is contained in:
Duy Tran Khanh committed 2021-02-20 16:17:35 +07:00
1 parent 3d951903c2
commit ad25e21b64
4 files changed
+106 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/AccountJNI.java
+17 -8
View File
@@ -4,6 +4,7 @@ import net.kdt.pojavlaunch.PojavProfile;
import net.kdt.pojavlaunch.Tools;
import net.kdt.pojavlaunch.authenticator.microsoft.MicrosoftAuthTask;
import net.kdt.pojavlaunch.authenticator.mojang.LoginTask;
import net.kdt.pojavlaunch.authenticator.mojang.yggdrasil.*;
import net.kdt.pojavlaunch.value.MinecraftAccount;
public class AccountJNI {
@@ -16,32 +17,40 @@ public class AccountJNI {
// 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
String data, // One of:
// Offline username
// Mojang json response
// Microsoft token
) {
try {
switch (type) {
case TYPE_SELECTACC:
CURRENT_ACCOUNT = MinecraftAccount.load(username);
CURRENT_ACCOUNT = MinecraftAccount.load(data);
if (CURRENT_ACCOUNT.isMicrosoft) {
CURRENT_ACCOUNT = new MicrosoftAuthTask().run("true", CURRENT_ACCOUNT.msaRefreshToken);
} else if (CURRENT_ACCOUNT.accessToken.length() > 5) {
PojavProfile.updateTokens(username);
PojavProfile.updateTokens(data);
}
CURRENT_ACCOUNT = MinecraftAccount.load(username);
CURRENT_ACCOUNT = MinecraftAccount.load(data);
break;
case TYPE_MICROSOFT:
CURRENT_ACCOUNT = new MicrosoftAuthTask().run("false", password);
CURRENT_ACCOUNT = new MicrosoftAuthTask().run("false", data);
break;
case TYPE_MOJANG:
CURRENT_ACCOUNT = new LoginTask().run(username, password);
AuthenticateResponse response = Tools.GLOBAL_GSON.fromJson(data, AuthenticateResponse.class);
CURRENT_ACCOUNT = new MinecraftAccount();
CURRENT_ACCOUNT.accessToken = response.accessToken;
CURRENT_ACCOUNT.clientToken = response.clientToken.toString();
CURRENT_ACCOUNT.profileId = response.selectedProfile.id;
CURRENT_ACCOUNT.username = response.selectedProfile.name;
CURRENT_ACCOUNT.save();
break;
case TYPE_OFFLINE:
CURRENT_ACCOUNT = new MinecraftAccount();
CURRENT_ACCOUNT.username = username;
CURRENT_ACCOUNT.username = data;
CURRENT_ACCOUNT.save();
break;
}
Natives/LoginViewController.m
+65 -13
View File
@@ -7,6 +7,7 @@
#import "LauncherViewController.h"
#import "LoginViewController.h"
#include "ios_uikit_bridge.h"
#include "utils.h"
#define TYPE_SELECTACC 0
@@ -14,20 +15,19 @@
#define TYPE_MOJANG 2
#define TYPE_OFFLINE 3
void loginAccountInput(UINavigationController *controller, int type, const char* username_c, const char* password_c) {
void loginAccountInput(UINavigationController *controller, int type, const char* data_c) {
JNIEnv *env;
(*runtimeJavaVMPtr)->AttachCurrentThread(runtimeJavaVMPtr, &env, NULL);
jstring username = (*env)->NewStringUTF(env, username_c);
jstring password = (*env)->NewStringUTF(env, password_c);
jstring data = (*env)->NewStringUTF(env, data_c);
jclass clazz = (*env)->FindClass(env, "net/kdt/pojavlaunch/uikit/AccountJNI");
assert(clazz);
jmethodID method = (*env)->GetStaticMethodID(env, clazz, "loginAccount", "(ILjava/lang/String;Ljava/lang/String;)Z");
jmethodID method = (*env)->GetStaticMethodID(env, clazz, "loginAccount", "(ILjava/lang/String;)Z");
assert(method);
jboolean result = (*env)->CallStaticBooleanMethod(env, clazz, method, type, username, password);
jboolean result = (*env)->CallStaticBooleanMethod(env, clazz, method, type, data);
(*runtimeJavaVMPtr)->DetachCurrentThread(runtimeJavaVMPtr);
@@ -148,18 +148,14 @@ void loginAccountInput(UINavigationController *controller, int type, const char*
const char *username = [usernameField.text UTF8String];
if (type == TYPE_MOJANG) {
UITextField *passwordField = textFields[1];
const char *password = [passwordField.text UTF8String];
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(void){
loginAccountInput(self.navigationController, TYPE_MOJANG, username, password);
});
[self loginMojangWithUsername:usernameField.text password:((UITextField *) textFields[1]).text];
} else {
if (usernameField.text.length < 3 || usernameField.text.length > 16) {
controller.message = @"Username must be at least 3 characters and maximum 16 characters";
[self presentViewController:controller animated:YES completion:nil];
} else {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(void){
loginAccountInput(self.navigationController, TYPE_OFFLINE, username, "");
loginAccountInput(self.navigationController, TYPE_OFFLINE, username);
});
}
}
@@ -199,7 +195,63 @@ void loginAccountInput(UINavigationController *controller, int type, const char*
NSURL *url = [dict objectForKey:@"url"];
NSArray *components = [[url absoluteString] componentsSeparatedByString:@"?code="];
// NSLog(@"URL returned = %@", components[1]);
loginAccountInput(self.navigationController, TYPE_MICROSOFT, "", [components[1] UTF8String]);
loginAccountInput(self.navigationController, TYPE_MICROSOFT, [components[1] UTF8String]);
}
-(void)loginMojangWithUsername:(NSString*)input_username password:(NSString*)input_password {
NSString *input_uuid = [[NSUUID UUID] UUIDString];
NSURLSession *session = [NSURLSession sharedSession];
NSURL *url = [NSURL URLWithString:@"https://authserver.mojang.com/authenticate"];
NSMutableURLRequest *request =
[[NSMutableURLRequest alloc] initWithURL:[NSURL
URLWithString:@"https://authserver.mojang.com/authenticate"]];
[request setHTTPMethod:@"POST"];
[request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
NSString *jsonString = [NSString stringWithFormat:@"{\"agent\": {\"name\": \"Minecraft\", \"version\": 1}, \"username\": \"%@\", \"password\": \"%@\", \"clientToken\": \"%@\"}", input_username, input_password, input_uuid];
// NSLog(jsonString);
[request setValue:[NSString stringWithFormat:@"%d",
[jsonString length]] forHTTPHeaderField:@"Content-length"];
[request setHTTPBody:[jsonString dataUsingEncoding:NSUTF8StringEncoding]];
NSURLSessionDataTask *postDataTask = [session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *) response;
long statusCode = (long)[httpResponse statusCode];
NSString *dataStr = [NSString stringWithUTF8String:[data bytes]];
// NSLog(@"status=%ld, data=%@, response=%@, error=%@", statusCode, dataStr, httpResponse, error);
NSError *jsonError = nil;
NSArray *jsonArray = [NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:&error];
if (jsonError != nil) {
NSLog(@"Error parsing JSON: %@", jsonError.localizedDescription);
showDialog(self, @"Error parsing JSON", jsonError.localizedDescription);
} else if (statusCode == 200) {
NSArray *selectedProfile = [jsonArray valueForKey:@"selectedProfile"];
if (selectedProfile == nil) {
// NSLog(@"DBG: can't login demo account!");
showDialog(self, @"Error", @"Can't login a demo account!");
} else {
/*
NSString *out_accessToken = [jsonArray valueForKey:@"accessToken"];
NSString *out_clientToken = [jsonArray valueForKey:@"clientToken"];
NSString *out_profileID = [selectedProfile valueForKey:@"id"];
NSString *out_username = [selectedProfile valueForKey:@"name"];
NSLog(@"DBG: Login succeed: %@, %@, %@, %@", out_accessToken, out_clientToken, out_profileID, out_username);
*/
loginAccountInput(self.navigationController, TYPE_MOJANG, [dataStr UTF8String]);
}
} else {
NSString *err_title = [jsonArray valueForKey:@"error"];
NSString *err_msg = [jsonArray valueForKey:@"errorMessage"];
// NSLog(@"DBG Error: %@: %@", err_title, err_msg);
showDialog(self, err_title, err_msg);
}
}];
[postDataTask resume];
}
@end
@@ -271,7 +323,7 @@ NSMutableArray *accountList;
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
NSString *str = [accountList objectAtIndex:indexPath.row];
loginAccountInput(self.navigationController, TYPE_SELECTACC, [str UTF8String], "");
loginAccountInput(self.navigationController, TYPE_SELECTACC, [str UTF8String]);
}
- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath {
Natives/ios_uikit_bridge.h
+2
View File
@@ -1,6 +1,8 @@
#pragma once
#import <UIKit/UIKit.h>
#include "jni.h"
void showDialog(UIViewController *viewController, NSString* title, NSString* message);
jboolean UIKit_updateProgress(float progress, const char* message);
void UIKit_launchMinecraftSurfaceVC();
void UIKit_setButtonSkippable();
Natives/ios_uikit_bridge.m
+22 -1
View File
@@ -1,4 +1,3 @@
#import <UIKit/UIKit.h>
#import "AppDelegate.h"
#import "SceneDelegate.h"
@@ -10,6 +9,28 @@
jboolean skipDownloadAssets;
void internal_showDialog(UIViewController *viewController, NSString* title, NSString* message) {
UIAlertController* alert = [UIAlertController alertControllerWithTitle:title
message:message
preferredStyle:UIAlertControllerStyleAlert];
UIAlertAction* okAction = [UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault
handler:^(UIAlertAction * action) {}];
[alert addAction:okAction];
[viewController presentViewController:alert animated:YES completion:nil];
}
void showDialog(UIViewController *viewController, NSString* title, NSString* message) {
if ([NSThread isMainThread] == YES) {
internal_showDialog(viewController, title, message);
} else {
dispatch_async(dispatch_get_main_queue(), ^{
internal_showDialog(viewController, title, message);
});
}
}
JNIEXPORT void JNICALL Java_net_kdt_pojavlaunch_uikit_UIKit_showError(JNIEnv* env_unused, jclass clazz, jstring title, jstring message, jboolean exitIfOk) {
dispatch_async(dispatch_get_main_queue(), ^{
JNIEnv *env;