sasheg/launcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

СУКА ЛАСТ ФИКСЫ ДЛЯ ПРОХОДОК (логин работает)

Browse Source
This commit is contained in:
Sashegdev
2026-04-08 20:22:47 +00:00
parent 2b6cb6b3ad
commit a3f9871d6e
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
launcher/src/main/java/me/sashegdev/zernmc/launcher/auth/AuthManager.java
+22 -11
View File
@@ -50,11 +50,11 @@ public class AuthManager {
try { try {
String body = GSON.toJson(new LoginRequest(username, password)); String body = GSON.toJson(new LoginRequest(username, password));
System.out.println(ZAnsi.cyan("[AUTH] Отправка запроса: " + endpoint)); //System.out.println(ZAnsi.cyan("[AUTH] Отправка запроса: " + endpoint));
SimpleHttpResponse resp = post(endpoint, body); SimpleHttpResponse resp = post(endpoint, body);
System.out.println(ZAnsi.cyan("[AUTH] Ответ: HTTP " + resp.statusCode())); //System.out.println(ZAnsi.cyan("[AUTH] Ответ: HTTP " + resp.statusCode()));
if (resp.statusCode() == 200) { if (resp.statusCode() == 200) {
session = GSON.fromJson(resp.body(), AuthSession.class); session = GSON.fromJson(resp.body(), AuthSession.class);
@@ -67,7 +67,7 @@ public class AuthManager {
return AuthResult.fail(extractError(resp.body())); return AuthResult.fail(extractError(resp.body()));
} }
} catch (Exception e) { } catch (Exception e) {
System.err.println(ZAnsi.red("[AUTH] Исключение: " + e.getMessage())); //System.err.println(ZAnsi.red("[AUTH] Исключение: " + e.getMessage()));
e.printStackTrace(); e.printStackTrace();
return AuthResult.fail("Ошибка соединения: " + e.getMessage()); return AuthResult.fail("Ошибка соединения: " + e.getMessage());
} }
@@ -138,7 +138,7 @@ public class AuthManager {
private static SimpleHttpResponse post(String endpoint, String jsonBody) throws Exception { private static SimpleHttpResponse post(String endpoint, String jsonBody) throws Exception {
String fullUrl = ZHttpClient.getBaseUrl() + endpoint; String fullUrl = ZHttpClient.getBaseUrl() + endpoint;
java.net.HttpURLConnection conn = null; java.net.HttpURLConnection conn = null;
try { try {
java.net.URL url = java.net.URI.create(fullUrl).toURL(); java.net.URL url = java.net.URI.create(fullUrl).toURL();
@@ -147,28 +147,34 @@ public class AuthManager {
conn.setRequestProperty("Content-Type", "application/json; charset=utf-8"); conn.setRequestProperty("Content-Type", "application/json; charset=utf-8");
conn.setRequestProperty("Accept", "application/json"); conn.setRequestProperty("Accept", "application/json");
conn.setRequestProperty("User-Agent", "ZernMC-Launcher/1.0"); conn.setRequestProperty("User-Agent", "ZernMC-Launcher/1.0");
// Добавляем токен авторизации, если есть сессия
if (session != null && session.accessToken != null) {
conn.setRequestProperty("Authorization", "Bearer " + session.accessToken);
}
conn.setDoOutput(true); conn.setDoOutput(true);
conn.setConnectTimeout(15000); conn.setConnectTimeout(15000);
conn.setReadTimeout(15000); conn.setReadTimeout(15000);
try (java.io.OutputStream os = conn.getOutputStream()) { try (java.io.OutputStream os = conn.getOutputStream()) {
byte[] input = jsonBody.getBytes(StandardCharsets.UTF_8); byte[] input = jsonBody.getBytes(StandardCharsets.UTF_8);
os.write(input, 0, input.length); os.write(input, 0, input.length);
} }
int statusCode = conn.getResponseCode(); int statusCode = conn.getResponseCode();
java.io.InputStream is = (statusCode >= 200 && statusCode < 300) java.io.InputStream is = (statusCode >= 200 && statusCode < 300)
? conn.getInputStream() ? conn.getInputStream()
: conn.getErrorStream(); : conn.getErrorStream();
String responseBody; String responseBody;
try (java.util.Scanner scanner = new java.util.Scanner(is, StandardCharsets.UTF_8.name())) { try (java.util.Scanner scanner = new java.util.Scanner(is, StandardCharsets.UTF_8.name())) {
responseBody = scanner.useDelimiter("\\A").hasNext() ? scanner.next() : ""; responseBody = scanner.useDelimiter("\\A").hasNext() ? scanner.next() : "";
} }
return new SimpleHttpResponse(statusCode, responseBody); return new SimpleHttpResponse(statusCode, responseBody);
} finally { } finally {
if (conn != null) conn.disconnect(); if (conn != null) conn.disconnect();
} }
@@ -208,14 +214,19 @@ public class AuthManager {
try { try {
String json = "{\"pass_code\":\"" + passCode.toUpperCase() + "\"}"; String json = "{\"pass_code\":\"" + passCode.toUpperCase() + "\"}";
SimpleHttpResponse resp = post("/auth/pass/activate", json); SimpleHttpResponse resp = post("/auth/pass/activate", json);
System.out.println(ZAnsi.cyan("[AUTH] Активация проходки: HTTP " + resp.statusCode()));
if (resp.statusCode() == 200) { if (resp.statusCode() == 200) {
return "Проходка успешно активирована!"; return "Проходка успешно активирована!";
} else if (resp.statusCode() == 401) {
return "Ошибка: Требуется авторизация. Перезайдите в аккаунт.";
} else { } else {
String error = extractError(resp.body()); String error = extractError(resp.body());
return "Ошибка: " + error; return "Ошибка: " + error;
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
return "Ошибка соединения: " + e.getMessage(); return "Ошибка соединения: " + e.getMessage();
} }
} }