Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Bug fix for console redirect URI

Rich Turner70402a0a0618
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
index fdce643dc..18a5562a9 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
@@ -107,18 +107,9 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
@Override
protected void addClientRedirectUris(String client, List<String> redirectUrls, boolean devMode) {
- if (devMode) {
- // Allow any redirect URIs in dev mode
- redirectUrls.add("*");
- } else {
- // Callback URL used by Manager web client authentication, any relative path to "ourselves" is fine
- String realmManagerCallbackUrl = UriBuilder.fromUri("/").path(client).path("*").build().toString();
- redirectUrls.add(realmManagerCallbackUrl);
-
- // Callback URL used by Console web client authentication, any relative path to "ourselves" is fine
- String consoleCallbackUrl = UriBuilder.fromUri("/console/").path(client).path("*").build().toString();
- redirectUrls.add(consoleCallbackUrl);
- }
+ // Callback URL used by Manager web client authentication, any relative path to "ourselves" is fine
+ String realmManagerCallbackUrl = UriBuilder.fromUri("/").path(client).path("*").build().toString();
+ redirectUrls.add(realmManagerCallbackUrl);
}
@Override
diff --git a/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java b/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java
index 56f01400d..f1091ee55 100644
--- a/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java
+++ b/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java
@@ -83,7 +83,7 @@ public class ManagerWebService extends WebService {
public static final String APP_DOCROOT = "APP_DOCROOT";
public static final String APP_DOCROOT_DEFAULT = "manager/src/web";
public static final String CUSTOM_APP_DOCROOT = "CUSTOM_APP_DOCROOT";
- public static final String CUSTOM_APP_DOCROOT_DEFAULT = "deployment/manager/app";
+ public static final String CUSTOM_APP_DOCROOT_DEFAULT = "ui/app";
public static final String ROOT_REDIRECT_PATH = "ROOT_REDIRECT_PATH";
public static final String ROOT_REDIRECT_PATH_DEFAULT = "/manager";
public static final String API_PATH = "/api";