From 056990151a02eb3c1fca8c4284c85ba582927ec7 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 24 Aug 2021 12:39:29 +0200 Subject: [PATCH] adjusted vault config --- .../org/cryptomator/ui/keyloading/hub/AuthFlowReceiver.java | 4 ++-- .../java/org/cryptomator/ui/keyloading/hub/HubConfig.java | 4 ++-- .../ui/keyloading/hub/AuthFlowIntegrationTest.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/keyloading/hub/AuthFlowReceiver.java b/src/main/java/org/cryptomator/ui/keyloading/hub/AuthFlowReceiver.java index 2f96f05a3..d2995b0f8 100644 --- a/src/main/java/org/cryptomator/ui/keyloading/hub/AuthFlowReceiver.java +++ b/src/main/java/org/cryptomator/ui/keyloading/hub/AuthFlowReceiver.java @@ -87,9 +87,9 @@ class AuthFlowReceiver implements AutoCloseable { res.setStatus(HttpServletResponse.SC_MOVED_TEMPORARILY); if (error == null && code != null) { - res.setHeader("Location", hubConfig.unlockSuccessUrl); + res.setHeader("Location", hubConfig.authSuccessUrl); } else { - res.setHeader("Location", hubConfig.unlockErrorUrl); + res.setHeader("Location", hubConfig.authErrorUrl); } callback.add(new Callback(error, code, state)); diff --git a/src/main/java/org/cryptomator/ui/keyloading/hub/HubConfig.java b/src/main/java/org/cryptomator/ui/keyloading/hub/HubConfig.java index 0e53351e5..050435327 100644 --- a/src/main/java/org/cryptomator/ui/keyloading/hub/HubConfig.java +++ b/src/main/java/org/cryptomator/ui/keyloading/hub/HubConfig.java @@ -7,7 +7,7 @@ public class HubConfig { public String authEndpoint; public String tokenEndpoint; public String deviceRegistrationUrl; - public String unlockSuccessUrl; - public String unlockErrorUrl; + public String authSuccessUrl; + public String authErrorUrl; } diff --git a/src/test/java/org/cryptomator/ui/keyloading/hub/AuthFlowIntegrationTest.java b/src/test/java/org/cryptomator/ui/keyloading/hub/AuthFlowIntegrationTest.java index 2b0f93c25..1c875365a 100644 --- a/src/test/java/org/cryptomator/ui/keyloading/hub/AuthFlowIntegrationTest.java +++ b/src/test/java/org/cryptomator/ui/keyloading/hub/AuthFlowIntegrationTest.java @@ -23,8 +23,8 @@ public class AuthFlowIntegrationTest { hubConfig.authEndpoint = "http://localhost:8080/auth/realms/cryptomator/protocol/openid-connect/auth"; hubConfig.tokenEndpoint = "http://localhost:8080/auth/realms/cryptomator/protocol/openid-connect/token"; hubConfig.clientId = "cryptomator-hub"; - hubConfig.unlockSuccessUrl = "http://localhost:3000/#/unlock-success"; - hubConfig.unlockErrorUrl = "http://localhost:3000/#/unlock-error"; + hubConfig.authSuccessUrl = "http://localhost:3000/#/unlock-success"; + hubConfig.authErrorUrl = "http://localhost:3000/#/unlock-error"; try (var authFlow = AuthFlow.init(hubConfig)) { var token = authFlow.run(uri -> {