From e30e11930ab29c0bff31e1c45fe23be8217d6ada Mon Sep 17 00:00:00 2001 From: JoshOOOWAH <89082472387@yandex.ru> Date: Mon, 27 May 2019 23:21:10 +0500 Subject: [PATCH] clear --- .../ru/gravit/launchserver/LaunchServer.java | 2 +- .../launchserver/manangers/OAuthManager.java | 19 +++++++++-- Launcher/runtime/dialog/dialog.js | 10 ------ Launcher/runtime/dialog/styles.css | 2 +- .../launcher/events/request/LogEvent.java | 11 ++++++- .../request/OAuthConfirmRequestEvent.java | 33 ------------------- 6 files changed, 29 insertions(+), 48 deletions(-) delete mode 100644 LauncherAPI/src/main/java/ru/gravit/launcher/events/request/OAuthConfirmRequestEvent.java diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java index afb08b2d..769c6db6 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java @@ -739,7 +739,7 @@ private void generateConfigIfNotExists(boolean testEnv) throws IOException { newConfig.binaryName = "Launcher"; newConfig.whitelistRejectString = "Вас нет в белом списке"; newConfig.OAuthAppID = 0; - newConfig.OAuthAppSecret = null; + newConfig.OAuthAppSecret = ""; newConfig.netty = new NettyConfig(); newConfig.netty.fileServerEnabled = true; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/OAuthManager.java b/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/OAuthManager.java index 9e99c66c..1f0ddd31 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/OAuthManager.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/OAuthManager.java @@ -38,7 +38,7 @@ public void setEntry(Client client, ChannelHandlerContext ctx){ this.init = true; this.client = client; this.ctx = ctx; - LogHelper.subInfo("New Entry with IP " + IP()); + LogHelper.subDebug("New Entry with IP " + IP()); this.mTimer = new Timer(); this.mTimer.schedule(destroy, 300000L); } @@ -68,7 +68,7 @@ public String IP(){ public void run() { if(init == false) return; - LogHelper.info("cache purged, IP: " + IP()); + LogHelper.debug("cache purged, IP: " + IP()); init = false; mTimer = null; client = null; @@ -116,6 +116,21 @@ public static Entry getUnused(){ return null; } + public static Entry getEntry(String IP){ + for(int i = 0; i < 5; i++ ) + { + if(LaunchServer.server.cacheHandler.stageArea[i].isInit()) + if(LaunchServer.server.cacheHandler.stageArea[i].IP().equals(IP)) + return LaunchServer.server.cacheHandler.stageArea[i]; + } + try { + throw new OAuthException("Not found in cache"); + }catch (OAuthException e) { + e.printStackTrace(); + } + return null; + } + public static Entry[] newEntryArray(){ return new Entry[]{new Entry(), new Entry(), new Entry(), new Entry(), new Entry()}; } diff --git a/Launcher/runtime/dialog/dialog.js b/Launcher/runtime/dialog/dialog.js index 5da8e28d..2d9a3f7e 100644 --- a/Launcher/runtime/dialog/dialog.js +++ b/Launcher/runtime/dialog/dialog.js @@ -318,16 +318,6 @@ function doOAuth() { }); return result; }) - makeWaitAuth(function (result) { - FunctionalBridge.setAuthParams(result); - loginData = { pp: result.playerProfile , accessToken: result.accessToken, permissions: result.permissions, - auth_type: settings.auth}; - - overlay.hide(0, function () { - setCurrentScene(menuScene); - }); - return result; - }) }); } diff --git a/Launcher/runtime/dialog/styles.css b/Launcher/runtime/dialog/styles.css index 3ec129fc..3a1bb908 100644 --- a/Launcher/runtime/dialog/styles.css +++ b/Launcher/runtime/dialog/styles.css @@ -152,7 +152,7 @@ .auth { -fx-background-radius: 0; -fx-background-color: #5fd97a; -fx-text-fill: #ffffff; - -fx-pref-width: 200px; + -fx-pref-width: 145px; -fx-pref-height: 45px; -fx-effect: dropshadow(gaussian, rgba(23, 25, 29, 0.3), 15, 0, 0, 3); } diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/LogEvent.java b/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/LogEvent.java index c207eb72..8426bd6a 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/LogEvent.java +++ b/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/LogEvent.java @@ -1,9 +1,13 @@ package ru.gravit.launcher.events.request; import ru.gravit.launcher.LauncherNetworkAPI; +import ru.gravit.launcher.events.RequestEvent; import ru.gravit.launcher.request.ResultInterface; +import ru.gravit.utils.event.EventInterface; -public class LogEvent implements ResultInterface { +import java.util.UUID; + +public class LogEvent extends RequestEvent implements EventInterface { @Override public String getType() { return "log"; @@ -15,4 +19,9 @@ public String getType() { public LogEvent(String string) { this.string = string; } + + @Override + public UUID getUUID() { + return null; + } } diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/OAuthConfirmRequestEvent.java b/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/OAuthConfirmRequestEvent.java deleted file mode 100644 index 1d12e2a2..00000000 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/OAuthConfirmRequestEvent.java +++ /dev/null @@ -1,33 +0,0 @@ -package ru.gravit.launcher.events.request; - -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.RequestEvent; -import ru.gravit.utils.event.EventInterface; - -import java.util.UUID; - -public class OAuthConfirmRequestEvent extends RequestEvent implements EventInterface { - - private static final UUID uuid = UUID.fromString("77e1bfd7-adf9-4f5d-87d6-a7dd068deb74"); - - @LauncherNetworkAPI - public String str; - - @Override - public UUID getUUID() { - return uuid; - } - - @Override - public String getType() { - return "OAuthURL"; - } - - public OAuthConfirmRequestEvent(){ - } - public OAuthConfirmRequestEvent(String str){ - this.str = str; - } - - -}