Add Ely.by authentication support

Test User · Test User · commit e9354948a596 · 2025-04-24T21:09:41.000+03:00
diff --git a/Natives/AccountListViewController.m b/Natives/AccountListViewController.m
@@ -1,6 +1,7 @@
 #import <AuthenticationServices/AuthenticationServices.h>
 
 #import "authenticator/BaseAuthenticator.h"
+#import "authenticator/ElyByAuthenticator.h"
 #import "AccountListViewController.h"
 #import "AFNetworking.h"
 #import "LauncherPreferences.h"
@@ -144,6 +145,10 @@ - (void)actionAddAccount:(UITableViewCell *)sender {
         [self actionLoginMicrosoft:sender];
     }];
     [picker addAction:actionMicrosoft];
+    UIAlertAction *actionElyBy = [UIAlertAction actionWithTitle:localize(@"login.option.elyby", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        [self actionLoginElyBy:sender];
+    }];
+    [picker addAction:actionElyBy];
     UIAlertAction *actionLocal = [UIAlertAction actionWithTitle:localize(@"login.option.local", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         [self actionLoginLocal:sender];
     }];
@@ -192,6 +197,47 @@ - (void)actionLoginLocal:(UIView *)sender {
     [self presentViewController:controller animated:YES completion:nil];
 }
 
+- (void)actionLoginElyBy:(UIView *)sender {
+    UIAlertController *controller = [UIAlertController alertControllerWithTitle:localize(@"Sign in", nil) message:localize(@"login.option.elyby", nil) preferredStyle:UIAlertControllerStyleAlert];
+    [controller addTextFieldWithConfigurationHandler:^(UITextField *textField) {
+        textField.placeholder = localize(@"login.alert.field.username", nil);
+        textField.clearButtonMode = UITextFieldViewModeWhileEditing;
+        textField.borderStyle = UITextBorderStyleRoundedRect;
+    }];
+    [controller addTextFieldWithConfigurationHandler:^(UITextField *textField) {
+        textField.placeholder = localize(@"login.alert.field.password", nil);
+        textField.clearButtonMode = UITextFieldViewModeWhileEditing;
+        textField.borderStyle = UITextBorderStyleRoundedRect;
+        textField.secureTextEntry = YES;
+    }];
+    [controller addAction:[UIAlertAction actionWithTitle:localize(@"OK", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+        NSArray *textFields = controller.textFields;
+        UITextField *usernameField = textFields[0];
+        UITextField *passwordField = textFields[1];
+        
+        if (usernameField.text.length == 0 || passwordField.text.length == 0) {
+            controller.message = localize(@"login.error.fields.empty", nil);
+            [self presentViewController:controller animated:YES completion:nil];
+            return;
+        }
+        
+        self.modalInPresentation = YES;
+        self.tableView.userInteractionEnabled = NO;
+        [self addActivityIndicatorTo:sender];
+        
+        ElyByAuthenticator *auth = [[ElyByAuthenticator alloc] initWithInput:usernameField.text];
+        auth.authData[@"password"] = passwordField.text;
+        
+        id callback = ^(id status, BOOL success) {
+            [self callbackMicrosoftAuth:status success:success forCell:sender];
+        };
+        
+        [auth loginWithCallback:callback];
+    }]];
+    [controller addAction:[UIAlertAction actionWithTitle:localize(@"Cancel", nil) style:UIAlertActionStyleCancel handler:nil]];
+    [self presentViewController:controller animated:YES completion:nil];
+}
+
 - (void)actionLoginMicrosoft:(UITableViewCell *)sender {
     NSURL *url = [NSURL URLWithString:@"https://login.live.com/oauth20_authorize.srf?client_id=00000000402b5328&response_type=code&scope=service%3A%3Auser.auth.xboxlive.com%3A%3AMBI_SSL&redirect_url=https%3A%2F%2Flogin.live.com%2Foauth20_desktop.srf"];
 
diff --git a/Natives/authenticator/BaseAuthenticator.h b/Natives/authenticator/BaseAuthenticator.h
@@ -26,3 +26,6 @@ typedef void(^Callback)(id status, BOOL success);
 + (void)clearTokenDataOfProfile:(NSString *)profile;
 
 @end
+
+@interface ElyByAuthenticator : BaseAuthenticator
+@end
diff --git a/Natives/authenticator/BaseAuthenticator.m b/Natives/authenticator/BaseAuthenticator.m
@@ -1,5 +1,6 @@
 #import <Security/Security.h>
 #import "BaseAuthenticator.h"
+#import "ElyByAuthenticator.h"
 #import "../LauncherPreferences.h"
 #import "../ios_uikit_bridge.h"
 #import "../utils.h"
@@ -31,6 +32,9 @@ + (id)loadSavedName:(NSString *)name {
 
     if ([authData[@"expiresAt"] longValue] == 0) {
         return [[LocalAuthenticator alloc] initWithData:authData];
+    } else if (authData[@"clientToken"] != nil) {
+        // Если есть clientToken, значит это аккаунт ely.by
+        return [[ElyByAuthenticator alloc] initWithData:authData];
     } else { 
         return [[MicrosoftAuthenticator alloc] initWithData:authData];
     }
@@ -58,6 +62,7 @@ - (BOOL)saveChanges {
     NSError *error;
 
     [self.authData removeObjectForKey:@"input"];
+    [self.authData removeObjectForKey:@"password"];
 
     NSString *newPath = [NSString stringWithFormat:@"%s/accounts/%@.json", getenv("POJAV_HOME"), self.authData[@"username"]];
     if (self.authData[@"oldusername"] != nil && ![self.authData[@"username"] isEqualToString:self.authData[@"oldusername"]]) {
diff --git a/Natives/authenticator/ElyByAuthenticator.h b/Natives/authenticator/ElyByAuthenticator.h
@@ -0,0 +1,5 @@
+#import "BaseAuthenticator.h"
+
+@interface ElyByAuthenticator : BaseAuthenticator
+
+@end 
diff --git a/Natives/authenticator/ElyByAuthenticator.m b/Natives/authenticator/ElyByAuthenticator.m
@@ -0,0 +1,101 @@
+#import "AFNetworking.h"
+#import "ElyByAuthenticator.h"
+#import "../ios_uikit_bridge.h"
+#import "../utils.h"
+
+@implementation ElyByAuthenticator
+
+- (void)loginWithCallback:(Callback)callback {
+    callback(localize(@"login.ely.progress.auth", nil), YES);
+    
+    NSString *username = self.authData[@"input"];
+    NSString *password = self.authData[@"password"];
+    
+    if (username == nil || password == nil) {
+        callback(@"Username or password is missing", NO);
+        return;
+    }
+    
+    NSDictionary *data = @{
+        @"username": username,
+        @"password": password,
+        @"clientToken": [[NSUUID UUID] UUIDString]
+    };
+    
+    AFHTTPSessionManager *manager = AFHTTPSessionManager.manager;
+    manager.requestSerializer = AFJSONRequestSerializer.serializer;
+    
+    [manager POST:@"https://authserver.ely.by/auth/authenticate" parameters:data headers:nil progress:nil success:^(NSURLSessionDataTask *task, NSDictionary *response) {
+        // Обработка успешного ответа
+        self.authData[@"accessToken"] = response[@"accessToken"];
+        self.authData[@"clientToken"] = response[@"clientToken"];
+        self.authData[@"username"] = response[@"selectedProfile"][@"name"];
+        self.authData[@"uuid"] = response[@"selectedProfile"][@"id"];
+        self.authData[@"profileId"] = response[@"selectedProfile"][@"id"];
+        
+        // Форматирование UUID с дефисами
+        NSString *uuid = response[@"selectedProfile"][@"id"];
+        if (uuid.length == 32) { // Если UUID без дефисов
+            self.authData[@"profileId"] = [NSString stringWithFormat:@"%@-%@-%@-%@-%@",
+                [uuid substringWithRange:NSMakeRange(0, 8)],
+                [uuid substringWithRange:NSMakeRange(8, 4)],
+                [uuid substringWithRange:NSMakeRange(12, 4)],
+                [uuid substringWithRange:NSMakeRange(16, 4)],
+                [uuid substringWithRange:NSMakeRange(20, 12)]
+            ];
+        }
+        
+        // Установка URL аватара
+        self.authData[@"profilePicURL"] = [NSString stringWithFormat:@"https://mc-heads.net/head/%@/120", self.authData[@"profileId"]];
+        
+        // Время истечения токена (24 часа)
+        self.authData[@"expiresAt"] = @((long)[NSDate.date timeIntervalSince1970] + 86400);
+        
+        // Сохраняем изменения
+        callback(nil, [self saveChanges]);
+        
+    } failure:^(NSURLSessionDataTask *task, NSError *error) {
+        NSData *errorData = error.userInfo[AFNetworkingOperationFailingURLResponseDataErrorKey];
+        if (errorData) {
+            NSDictionary *errorDict = [NSJSONSerialization JSONObjectWithData:errorData options:kNilOptions error:nil];
+            callback(errorDict[@"errorMessage"] ?: error.localizedDescription, NO);
+        } else {
+            callback(error.localizedDescription, NO);
+        }
+    }];
+}
+
+- (void)refreshTokenWithCallback:(Callback)callback {
+    callback(localize(@"login.ely.progress.refresh", nil), YES);
+    
+    NSDictionary *data = @{
+        @"accessToken": self.authData[@"accessToken"],
+        @"clientToken": self.authData[@"clientToken"]
+    };
+    
+    AFHTTPSessionManager *manager = AFHTTPSessionManager.manager;
+    manager.requestSerializer = AFJSONRequestSerializer.serializer;
+    
+    [manager POST:@"https://authserver.ely.by/auth/refresh" parameters:data headers:nil progress:nil success:^(NSURLSessionDataTask *task, NSDictionary *response) {
+        // Обновляем токены
+        self.authData[@"accessToken"] = response[@"accessToken"];
+        self.authData[@"clientToken"] = response[@"clientToken"];
+        
+        // Время истечения токена (24 часа)
+        self.authData[@"expiresAt"] = @((long)[NSDate.date timeIntervalSince1970] + 86400);
+        
+        // Сохраняем изменения
+        callback(nil, [self saveChanges]);
+        
+    } failure:^(NSURLSessionDataTask *task, NSError *error) {
+        NSData *errorData = error.userInfo[AFNetworkingOperationFailingURLResponseDataErrorKey];
+        if (errorData) {
+            NSDictionary *errorDict = [NSJSONSerialization JSONObjectWithData:errorData options:kNilOptions error:nil];
+            callback(errorDict[@"errorMessage"] ?: error.localizedDescription, NO);
+        } else {
+            callback(error.localizedDescription, NO);
+        }
+    }];
+}
+
+@end 
diff --git a/Natives/resources/en.lproj/Localizable.strings b/Natives/resources/en.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 
 "init.migrateDir" = "The PojavLauncher data directory is now %@. All of your existing data has been moved to the new location.";
 
-"java.error.missing_main_class" = "%@ is missing main class attribute. If this is a mod, put it into the “mods” folder of your selected instance.";
+"java.error.missing_main_class" = "%@ is missing main class attribute. If this is a mod, put it into the "mods" folder of your selected instance.";
 "java.error.missing_runtime" = "%@ requires Java %d or later to run. Please install it first and specify it in Manage Runtimes.";
 
 "launcher.mcl.downloading_file" = "Downloading %@";
@@ -84,6 +84,8 @@
 "login.error.username.outOfRange" = "Username must be at least 3 characters and a maximum of 16 characters";
 
 "login.alert.field.username" = "Username";
+"login.alert.field.password" = "Password";
+"login.error.fields.empty" = "Username or password is empty";
 
 "login.jit.checking" = "Checking for JIT";
 "login.jit.enabled" = "JIT has been enabled";
@@ -98,6 +100,7 @@
 "login.option.select" = "Select account";
 "login.option.demo" = "Demo account";
 "login.option.microsoft" = "Microsoft account";
+"login.option.elyby" = "Ely.by account";
 "login.option.local" = "Local account";
 
 "login.warn.title.legacy_device" = "The next release of PojavLauncher will not be compatible with this device.";
@@ -233,7 +236,7 @@
 "preference.manage_runtime.header.default" = "Preferred Java version";
 "preference.manage_runtime.default.1165" = "1.16.5 and older";
 "preference.manage_runtime.default.117" = "1.17 and newer";
-"preference.manage_runtime.footer.default" = "Minecraft 1.16.5 and older may run with a newer Java version, however compatibility with mods is not guaranteed. External runtimes can be placed in the “java_runtimes” folder. Changing Java version for “Execute .jar” only takes effect if the installer does not expect a newer Java version.";
+"preference.manage_runtime.footer.default" = "Minecraft 1.16.5 and older may run with a newer Java version, however compatibility with mods is not guaranteed. External runtimes can be placed in the "java_runtimes" folder. Changing Java version for "Execute .jar" only takes effect if the installer does not expect a newer Java version.";
 "preference.manage_runtime.footer.java8" = "This is the default version for Minecraft 1.16.5 and older.";
 "preference.manage_runtime.footer.java17" = "This is the default version for Minecraft 1.17 and newer.";
 "preference.manage_runtime.header.invalid" = "Invalid runtimes";
@@ -253,7 +256,7 @@
 "preference.title.custom_env" = "Environment variables";
 "preference.detail.custom_env" = "This option is under construction. Create and edit custom_env.txt in the meantime.";
 
-"preference.title.debug_skip_wait_jit" = "Skip \"Waiting for JIT\" dialog";
+"preference.title.debug_skip_wait_jit" = "Skip "Waiting for JIT" dialog";
 "preference.detail.debug_skip_wait_jit" = "This does not allow you to launch without JIT, instead this skips debugger check, because check fails on certain jailbreaks.";
 "preference.title.debug_ipad_ui" = "Unlock iPadOS UI";
 "preference.detail.debug_ipad_ui" = "Unlock iPad-exclusive UI (alert, keyboard, etc.) if enabled or iPhone UI if disabled.";
@@ -324,3 +327,6 @@
 "controller_configurator.section.footer.menu_mappings" = "Bindings when the mouse is not locked, such as on the title screen or in the pause menu.";
 "controller_configurator.section.controller_style" = "Controller type";
 "controller_configurator.section.footer.controller_style" = "Show different controller button names in this configurator.";
+
+"login.ely.progress.auth" = "Authenticating with Ely.by...";
+"login.ely.progress.refresh" = "Refreshing Ely.by token...";

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +#import "BaseAuthenticator.h"
++
 +@interface ElyByAuthenticator : BaseAuthenticator
++
 +@end