diff --git a/src/main/java/pro/gravit/launcher/client/gui/scenes/login/methods/WebAuthMethod.java b/src/main/java/pro/gravit/launcher/client/gui/scenes/login/methods/WebAuthMethod.java index 8ec53f94..7d69b7f7 100644 --- a/src/main/java/pro/gravit/launcher/client/gui/scenes/login/methods/WebAuthMethod.java +++ b/src/main/java/pro/gravit/launcher/client/gui/scenes/login/methods/WebAuthMethod.java @@ -54,13 +54,8 @@ public CompletableFuture show(AuthWebViewDetails details) { public CompletableFuture auth(AuthWebViewDetails details) { overlay.future = new CompletableFuture<>(); overlay.follow(details.url, details.redirectUrl, (r) -> { - String code = r; - LogHelper.debug("Code: %s", code); - if (code.startsWith("?code=")) { - code = r.substring("?code=".length(), r.indexOf("&")); - } - LogHelper.debug("Code: %s", code); - overlay.future.complete(new LoginScene.LoginAndPasswordResult(null, new AuthCodePassword(code))); + LogHelper.dev("Redirect uri: %s", r); + overlay.future.complete(new LoginScene.LoginAndPasswordResult(null, new AuthCodePassword(r))); }); return overlay.future; } @@ -118,16 +113,16 @@ protected void doInit() { } public void follow(String url, String redirectUrl, Consumer redirectCallback) { - LogHelper.debug("Load url %s", url); + LogHelper.dev("Load url %s", url); webView.getEngine().setJavaScriptEnabled(true); webView.getEngine().load(url); if (redirectCallback != null) { webView.getEngine().locationProperty().addListener((obs, oldLocation, newLocation) -> { if (newLocation != null) { - LogHelper.debug("Location: %s", newLocation); + LogHelper.dev("Location: %s", newLocation); if (redirectUrl != null) { if (newLocation.startsWith(redirectUrl)) { - redirectCallback.accept(newLocation.substring(redirectUrl.length())); + redirectCallback.accept(newLocation); } } else { redirectCallback.accept(newLocation);