Skip to content

Feature OpenID #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
XakepSDK wants to merge 1 commit into
base: support/3.0.x
Choose a base branch
from
Open

Feature OpenID #132

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions src/main/java/pro/gravit/launcher/client/gui/scenes/login/methods/WebAuthMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,8 @@ public CompletableFuture<Void> show(AuthWebViewDetails details) {
public CompletableFuture<LoginScene.LoginAndPasswordResult> 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;
}
Expand Down Expand Up @@ -118,16 +113,16 @@ protected void doInit() {
}

public void follow(String url, String redirectUrl, Consumer<String> 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);
Expand Down