Skip to content

armgit / core

Public Imported from GitHub
0

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

Improved redirects

Michael Rademaker02c6ed265337
diff --git a/client/src/main/java/org/openremote/app/client/app/HeaderPresenter.java b/client/src/main/java/org/openremote/app/client/app/HeaderPresenter.java
index c3d1c5140..966cd689c 100644
--- a/client/src/main/java/org/openremote/app/client/app/HeaderPresenter.java
+++ b/client/src/main/java/org/openremote/app/client/app/HeaderPresenter.java
@@ -150,7 +150,7 @@ public class HeaderPresenter implements HeaderView.Presenter {
@Override
public void navigateApps() {
- placeController.goTo(new ConsoleAppsPlace(consoleAppSelection != null ? consoleAppSelection.getRealm() : null));
+ placeController.goTo(new ConsoleAppsPlace(consoleAppSelection != null ? consoleAppSelection.getAppName() : null));
}
@Override
diff --git a/client/src/main/java/org/openremote/app/client/apps/ConsoleAppSelection.java b/client/src/main/java/org/openremote/app/client/apps/ConsoleAppSelection.java
index d17ba86c7..1280db407 100644
--- a/client/src/main/java/org/openremote/app/client/apps/ConsoleAppSelection.java
+++ b/client/src/main/java/org/openremote/app/client/apps/ConsoleAppSelection.java
@@ -23,20 +23,20 @@ import org.openremote.model.event.Event;
public class ConsoleAppSelection extends Event {
- final protected String realm;
+ final protected String appName;
- public ConsoleAppSelection(String realm) {
- this.realm = realm;
+ public ConsoleAppSelection(String appName) {
+ this.appName = appName;
}
- public String getRealm() {
- return realm;
+ public String getAppName() {
+ return appName;
}
@Override
public String toString() {
return getClass().getSimpleName() + "{" +
- "realmId='" + realm + '\'' +
+ "appName='" + appName + '\'' +
'}';
}
}
diff --git a/client/src/main/java/org/openremote/app/client/apps/ConsoleAppsActivity.java b/client/src/main/java/org/openremote/app/client/apps/ConsoleAppsActivity.java
index 344eb6797..4c859ac33 100644
--- a/client/src/main/java/org/openremote/app/client/apps/ConsoleAppsActivity.java
+++ b/client/src/main/java/org/openremote/app/client/apps/ConsoleAppsActivity.java
@@ -23,7 +23,6 @@ import org.openremote.app.client.Environment;
import org.openremote.app.client.i18n.ManagerMessages;
import org.openremote.app.client.mvp.AcceptsView;
import org.openremote.app.client.mvp.AppActivity;
-import org.openremote.model.apps.ConsoleApp;
import org.openremote.model.apps.ConsoleAppResource;
import org.openremote.model.event.bus.EventBus;
import org.openremote.model.event.bus.EventRegistration;
@@ -38,17 +37,17 @@ public class ConsoleAppsActivity
final ConsoleAppsView view;
final Environment environment;
final ConsoleAppResource consoleAppResource;
- final ConsoleAppArrayMapper consoleAppArrayMapper;
+ final StringArrayMapper stringArrayMapper;
@Inject
public ConsoleAppsActivity(Environment environment,
ConsoleAppsView view,
ConsoleAppResource consoleAppResource,
- ConsoleAppArrayMapper consoleAppArrayMapper) {
+ StringArrayMapper stringArrayMapper) {
this.environment = environment;
this.view = view;
this.consoleAppResource = consoleAppResource;
- this.consoleAppArrayMapper = consoleAppArrayMapper;
+ this.stringArrayMapper = stringArrayMapper;
}
@Override
@@ -62,16 +61,16 @@ public class ConsoleAppsActivity
view.setPresenter(this);
environment.getApp().getRequests().sendAndReturn(
- consoleAppArrayMapper,
+ stringArrayMapper,
consoleAppResource::getInstalledApps,
200,
- apps -> {
- view.setApps(apps);
+ appNames -> {
+ view.setApps(appNames);
if (getPlace().getRealm() != null) {
- for (ConsoleApp app : apps) {
- if (app.getTenant().getRealm().equals(getPlace().getRealm())) {
- view.openAppUrl(app.getTenant().getRealm(), app.getUrl());
- environment.getEventBus().dispatch(new ConsoleAppSelection(app.getTenant().getRealm()));
+ for (String appName : appNames) {
+ if (appName.equals(getPlace().getRealm())) {
+ view.openAppUrl("/" + appName);
+ environment.getEventBus().dispatch(new ConsoleAppSelection(appName));
break;
}
}
diff --git a/client/src/main/java/org/openremote/app/client/apps/ConsoleAppsView.java b/client/src/main/java/org/openremote/app/client/apps/ConsoleAppsView.java
index 1d3729ffd..a65820abc 100644
--- a/client/src/main/java/org/openremote/app/client/apps/ConsoleAppsView.java
+++ b/client/src/main/java/org/openremote/app/client/apps/ConsoleAppsView.java
@@ -23,7 +23,6 @@ import jsinterop.annotations.JsPackage;
import jsinterop.annotations.JsType;
import org.openremote.app.client.polymer.ViewComponent;
import org.openremote.app.client.i18n.ManagerMessages;
-import org.openremote.model.apps.ConsoleApp;
@JsType(isNative = true, namespace = JsPackage.GLOBAL, name = "openremote.manager.ConsoleAppsView")
public abstract class ConsoleAppsView extends ViewComponent {
@@ -35,14 +34,14 @@ public abstract class ConsoleAppsView extends ViewComponent {
ManagerMessages messages();
- void onAppSelected(String realm);
+ void onAppSelected(String appName);
}
native void setPresenter(Presenter presenter);
- native void setApps(ConsoleApp[] apps);
+ native void setApps(String[] apps);
- native void openAppUrl(String realm, String appUrl);
+ native void openAppUrl(String appName);
/* TODO Tricks
diff --git a/client/src/main/java/org/openremote/app/client/apps/ConsoleAppArrayMapper.java b/client/src/main/java/org/openremote/app/client/apps/StringArrayMapper.java
similarity index 81%
rename from client/src/main/java/org/openremote/app/client/apps/ConsoleAppArrayMapper.java
rename to client/src/main/java/org/openremote/app/client/apps/StringArrayMapper.java
index 2380503c7..8862573ad 100644
--- a/client/src/main/java/org/openremote/app/client/apps/ConsoleAppArrayMapper.java
+++ b/client/src/main/java/org/openremote/app/client/apps/StringArrayMapper.java
@@ -23,10 +23,7 @@ import com.github.nmorel.gwtjackson.client.ObjectMapper;
import com.github.nmorel.gwtjackson.client.annotation.JsonMixIns;
import org.openremote.app.client.interop.jackson.DefaultJsonMixin;
import org.openremote.app.client.rest.EntityReader;
-import org.openremote.model.apps.ConsoleApp;
-@JsonMixIns({@JsonMixIns.JsonMixIn(target = ConsoleApp.class, mixIn = DefaultJsonMixin.class)})
-public interface ConsoleAppArrayMapper
- extends ObjectMapper<ConsoleApp[]>,
- EntityReader<ConsoleApp[]> {
+@JsonMixIns({@JsonMixIns.JsonMixIn(target = String.class, mixIn = DefaultJsonMixin.class)})
+public interface StringArrayMapper extends ObjectMapper<String[]>, EntityReader<String[]> {
}
diff --git a/client/src/main/webapp/src/manager/or-manager-console-apps/or-manager-console-apps-view.html b/client/src/main/webapp/src/manager/or-manager-console-apps/or-manager-console-apps-view.html
index dcb9af9c3..709eea6af 100644
--- a/client/src/main/webapp/src/manager/or-manager-console-apps/or-manager-console-apps-view.html
+++ b/client/src/main/webapp/src/manager/or-manager-console-apps/or-manager-console-apps-view.html
@@ -26,9 +26,9 @@
class$="layout vertical [[widgetStyle.SecondaryNav]] nav">
<template is="dom-repeat" id="appsList" items="[[apps]]">
- <div class$="navItem [[widgetStyle.SecondaryNavItem]] [[widgetStyle.Hyperlink]] [[item.active]]">
+ <div class$="navItem [[widgetStyle.SecondaryNavItem]] [[widgetStyle.Hyperlink]] [[isActive(item)]]">
<div class$="[[icon('connectdevelop')]]"></div>
- <a on-click="onAppSelected">[[item.tenant.displayName]]</a>
+ <a on-click="onAppSelected">[[item]]</a>
</div>
</template>
@@ -76,6 +76,13 @@
haveApps: {
type: Boolean,
computed: "computeHaveApps(apps)"
+ },
+ activeApp: {
+ type: String
+ },
+ isActiveApp: {
+ type: String,
+ computed: "isActive(app)"
}
}
}
@@ -107,24 +114,20 @@
}
onAppSelected(e) {
- this.presenter.onAppSelected(e.model.item.tenant.realm);
+ this.activeApp = e.model.item;
+ this.presenter.onAppSelected(e.model.item);
}
- openAppUrl(realm, appUrl) {
- // Select the open app in the list
- if (this.$.appsList.items) {
- for (let item of this.$.appsList.items) {
- if (item.tenant.realm === realm) {
- item.active = "active";
- }
- }
- }
-
+ openAppUrl(appName) {
// Show the app in an iframe
this.$.placeholder.style.display = "none";
- this.$.appFrame.src = appUrl;
+ this.$.appFrame.src = appName;
this.$.appFrame.style.display = "inherit";
}
+
+ isActive(app) {
+ return app === this.activeApp ? "active" : ""
+ }
}
defineAppElement(OpenRemoteManagerConsoleAppsView, OpenRemoteManagerConsoleAppsView.is, "manager", "ConsoleAppsView");
diff --git a/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java b/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java
index e909ab326..11fd8024c 100644
--- a/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java
+++ b/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java
@@ -375,32 +375,9 @@ public abstract class KeycloakIdentityProvider implements IdentityProvider {
authProxyHandler));
}
- protected ClientRepresentation createClientApplication(String realm, String clientId, String appName, boolean devMode) {
- ClientRepresentation client = new ClientRepresentation();
-
- client.setClientId(clientId);
- client.setName(appName);
- client.setPublicClient(true);
-
- if (devMode) {
- // We need direct access for integration tests
- LOG.info("### Allowing direct access grants for client app '" + appName + "', this must NOT be used in production! ###");
- client.setDirectAccessGrantsEnabled(true);
-
- // Allow any web origin (this will add CORS headers to token requests etc.)
- client.setWebOrigins(Collections.singletonList("*"));
- }
-
- List<String> redirectUris = new ArrayList<>();
- addClientRedirectUris(realm, redirectUris);
- client.setRedirectUris(redirectUris);
-
- return client;
- }
-
/**
* There must be _some_ valid redirect URIs for the application or authentication will not be possible.
*/
- abstract protected void addClientRedirectUris(String realm, List<String> redirectUrls);
+ abstract protected void addClientRedirectUris(String client, List<String> redirectUrls);
}
diff --git a/manager/src/main/java/org/openremote/manager/apps/ConsoleAppResourceImpl.java b/manager/src/main/java/org/openremote/manager/apps/ConsoleAppResourceImpl.java
index 1ef5394cf..d5dab4b4e 100644
--- a/manager/src/main/java/org/openremote/manager/apps/ConsoleAppResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/apps/ConsoleAppResourceImpl.java
@@ -20,7 +20,6 @@
package org.openremote.manager.apps;
import org.openremote.container.web.WebResource;
-import org.openremote.model.apps.ConsoleApp;
import org.openremote.model.apps.ConsoleAppResource;
import org.openremote.model.http.RequestParams;
@@ -37,7 +36,7 @@ public class ConsoleAppResourceImpl extends WebResource implements ConsoleAppRes
}
@Override
- public ConsoleApp[] getInstalledApps(@BeanParam RequestParams requestParams) {
+ public String[] getInstalledApps(@BeanParam RequestParams requestParams) {
if (!isSuperUser()) {
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
diff --git a/manager/src/main/java/org/openremote/manager/apps/ConsoleAppService.java b/manager/src/main/java/org/openremote/manager/apps/ConsoleAppService.java
index 744793933..712c02efa 100644
--- a/manager/src/main/java/org/openremote/manager/apps/ConsoleAppService.java
+++ b/manager/src/main/java/org/openremote/manager/apps/ConsoleAppService.java
@@ -24,16 +24,10 @@ import org.openremote.container.ContainerService;
import org.openremote.container.timer.TimerService;
import org.openremote.manager.security.ManagerIdentityService;
import org.openremote.manager.web.ManagerWebService;
-import org.openremote.model.apps.ConsoleApp;
-import org.openremote.model.security.Tenant;
import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.List;
import java.util.logging.Logger;
-import static org.openremote.model.Constants.MASTER_REALM;
-
public class ConsoleAppService implements ContainerService {
private static final Logger LOG = Logger.getLogger(ConsoleAppService.class.getName());
@@ -62,34 +56,11 @@ public class ConsoleAppService implements ContainerService {
public void stop(Container container) throws Exception {
}
- public ConsoleApp[] getInstalled() throws Exception {
- List<ConsoleApp> result = new ArrayList<>();
- Files.list(managerWebService.getAppDocRoot()).filter(Files::isDirectory).forEach(dir -> {
- String directoryName = dir.getFileName().toString();
- Tenant tenant = identityService.getIdentityProvider().getTenantForRealm(directoryName);
- if (tenant == null) {
- LOG.fine("No tenant exists for installed console app: " + dir.toAbsolutePath());
- return;
- }
- if (tenant.isActive(timerService.getCurrentTimeMillis()) && tenant.getDisplayName() != null) {
- String appUrl = managerWebService.getConsoleUrl(
- identityService.getExternalServerUri(),
- directoryName
- );
- ConsoleApp consoleApp = new ConsoleApp(tenant, appUrl);
- result.add(consoleApp);
- }
- });
-
- result.sort((o1, o2) -> {
- if (o1.getTenant().getRealm().equals(MASTER_REALM))
- return -1;
- if (o2.getTenant().getRealm().equals(MASTER_REALM))
- return 1;
- return o1.getTenant().getDisplayName().compareTo(o2.getTenant().getDisplayName());
- });
-
- return result.toArray(new ConsoleApp[result.size()]);
+ public String[] getInstalled() throws Exception {
+ return Files.list(managerWebService.getAppDocRoot())
+ .filter(Files::isDirectory)
+ .map(dir -> dir.getFileName().toString())
+ .toArray(String[]::new);
}
@Override
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 3b2325ff1..8e3921527 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
@@ -31,6 +31,7 @@ import org.openremote.container.security.keycloak.KeycloakIdentityProvider;
import org.openremote.container.timer.TimerService;
import org.openremote.container.web.ClientRequestInfo;
import org.openremote.container.web.WebService;
+import org.openremote.manager.apps.ConsoleAppService;
import org.openremote.manager.event.ClientEventService;
import org.openremote.model.Constants;
import org.openremote.model.asset.Asset;
@@ -45,7 +46,9 @@ import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriBuilder;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
+import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.IntStream;
@@ -61,6 +64,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
final protected TimerService timerService;
final protected MessageBrokerService messageBrokerService;
final protected ClientEventService clientEventService;
+ final protected ConsoleAppService consoleAppService;
public ManagerKeycloakIdentityProvider(UriBuilder externalServerUri, Container container) {
super(KEYCLOAK_CLIENT_ID, externalServerUri, container);
@@ -70,22 +74,23 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
this.persistenceService = container.getService(PersistenceService.class);
this.messageBrokerService = container.getService(MessageBrokerService.class);
this.clientEventService = container.getService(ClientEventService.class);
+ this.consoleAppService = container.getService(ConsoleAppService.class);
enableAuthProxy(container.getService(WebService.class));
}
@Override
- protected void addClientRedirectUris(String realm, List<String> redirectUrls) {
- if (devMode) {
+ protected void addClientRedirectUris(String client, List<String> redirectUrls) {
+ if (false) {
// 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 managerCallbackUrl = UriBuilder.fromUri("/").path(realm).path("*").build().toString();
- redirectUrls.add(managerCallbackUrl);
+ 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(realm).path("*").build().toString();
+ String consoleCallbackUrl = UriBuilder.fromUri("/console/").path(client).path("*").build().toString();
redirectUrls.add(consoleCallbackUrl);
}
}
@@ -485,6 +490,37 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
addDefaultRoles(clientResource.roles());
}
+ protected ClientRepresentation createClientApplication(String realm, String clientId, String appName, boolean devMode) {
+ ClientRepresentation client = new ClientRepresentation();
+
+ client.setClientId(clientId);
+ client.setName(appName);
+ client.setPublicClient(true);
+
+ if (devMode) {
+ // We need direct access for integration tests
+ LOG.info("### Allowing direct access grants for client app '" + appName + "', this must NOT be used in production! ###");
+ client.setDirectAccessGrantsEnabled(true);
+
+ // Allow any web origin (this will add CORS headers to token requests etc.)
+ client.setWebOrigins(Collections.singletonList("*"));
+ }
+
+ List<String> redirectUris = new ArrayList<>();
+ try {
+ for (String consoleName : consoleAppService.getInstalled()) {
+ addClientRedirectUris(consoleName, redirectUris);
+ }
+ } catch (Exception exception) {
+ LOG.log(Level.WARNING, exception.getMessage(), exception);
+ addClientRedirectUris(realm, redirectUris);
+ }
+
+ client.setRedirectUris(redirectUris);
+
+ return client;
+ }
+
protected void addDefaultRoles(RolesResource rolesResource) {
for (ClientRole clientRole : ClientRole.values()) {
@@ -543,13 +579,13 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
componentRepresentation.getName()).get(0);
response = syncUsers(clientRequestInfo, componentRepresentation.getId(), realm, "triggerFullSync");
-// if (!response.getStatusInfo().equals(Response.Status.OK)) {
-// throw new WebApplicationException(
-// Response.status(response.getStatus())
-// .entity(response.getEntity())
-// .build()
-// );
-// }
+ if (!response.getStatusInfo().equals(Response.Status.OK)) {
+ throw new WebApplicationException(
+ Response.status(response.getStatus())
+ .entity(response.getEntity())
+ .build()
+ );
+ }
}
}
diff --git a/model/src/main/java/org/openremote/model/apps/ConsoleApp.java b/model/src/main/java/org/openremote/model/apps/ConsoleApp.java
deleted file mode 100644
index a9808aa85..000000000
--- a/model/src/main/java/org/openremote/model/apps/ConsoleApp.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2017, OpenRemote Inc.
- *
- * See the CONTRIBUTORS.txt file in the distribution for a
- * full listing of individual contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.openremote.model.apps;
-
-import jsinterop.annotations.JsType;
-import org.openremote.model.security.Tenant;
-
-/**
- * An installed console app.
- */
-@JsType
-public class ConsoleApp {
-
- public Tenant tenant;
- public String url;
-
- protected ConsoleApp() {
- this(null, null);
- }
-
- public ConsoleApp(Tenant tenant, String url) {
- setTenant(tenant);
- setUrl(url);
- }
-
- public Tenant getTenant() {
- return tenant;
- }
-
- public void setTenant(Tenant tenant) {
- this.tenant = tenant;
- }
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
- @Override
- public String toString() {
- return getClass().getSimpleName() + "{" +
- "tenant='" + tenant + '\'' +
- ", url='" + url + '\'' +
- '}';
- }
-}
diff --git a/model/src/main/java/org/openremote/model/apps/ConsoleAppResource.java b/model/src/main/java/org/openremote/model/apps/ConsoleAppResource.java
index 7187734ee..1f0aa18b5 100644
--- a/model/src/main/java/org/openremote/model/apps/ConsoleAppResource.java
+++ b/model/src/main/java/org/openremote/model/apps/ConsoleAppResource.java
@@ -44,6 +44,6 @@ public interface ConsoleAppResource {
@SuccessStatusCode(200)
@RolesAllowed({"read:consoles"})
@SuppressWarnings("unusable-by-js")
- ConsoleApp[] getInstalledApps(@BeanParam RequestParams requestParams);
+ String[] getInstalledApps(@BeanParam RequestParams requestParams);
}
diff --git a/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy b/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy
index 08307fbb2..d19ee315f 100644
--- a/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy
+++ b/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy
@@ -37,6 +37,7 @@ import static org.openremote.container.security.IdentityService.IDENTITY_NETWORK
import static org.openremote.container.timer.TimerService.Clock.PSEUDO
import static org.openremote.container.timer.TimerService.TIMER_CLOCK_TYPE
import static org.openremote.container.web.WebService.WEBSERVER_LISTEN_PORT
+import static org.openremote.manager.web.ManagerWebService.APP_DOCROOT
import static org.openremote.manager.setup.SetupTasks.*
trait ManagerContainerTrait extends ContainerTrait {
@@ -47,7 +48,8 @@ trait ManagerContainerTrait extends ContainerTrait {
(IDENTITY_NETWORK_HOST) : KeycloakIdentityProvider.KEYCLOAK_HOST_DEFAULT,
(IDENTITY_NETWORK_WEBSERVER_PORT): Integer.toString(KeycloakIdentityProvider.KEYCLOAK_PORT_DEFAULT),
(SETUP_IMPORT_DEMO_SCENES) : "false",
- (SETUP_IMPORT_DEMO_RULES) : "false"
+ (SETUP_IMPORT_DEMO_RULES) : "false",
+ (APP_DOCROOT) : "../deployment/manager/app/"
]
}
diff --git a/test/src/test/groovy/org/openremote/test/admin/AdminTenantsActivityTest.groovy b/test/src/test/groovy/org/openremote/test/admin/AdminTenantsActivityTest.groovy
index f8aed046a..47adc06a6 100644
--- a/test/src/test/groovy/org/openremote/test/admin/AdminTenantsActivityTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/admin/AdminTenantsActivityTest.groovy
@@ -324,7 +324,7 @@ class AdminTenantsActivityTest extends Specification implements ManagerContainer
assert resultEvents[0].place instanceof AdminTenantPlace
assert resultEvents[1] instanceof GoToPlaceEvent
assert resultEvents[1].place instanceof AdminTenantPlace
- assert resultEvents[1].place.realm == "testrealm"
+ assert resultEvents[1].place.getAppName == "testrealm"
}
and: "The admin tenant form should be cleared"
diff --git a/test/src/test/groovy/org/openremote/test/admin/AdminUsersActivityTest.groovy b/test/src/test/groovy/org/openremote/test/admin/AdminUsersActivityTest.groovy
index 6eda638e9..2f18ae553 100644
--- a/test/src/test/groovy/org/openremote/test/admin/AdminUsersActivityTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/admin/AdminUsersActivityTest.groovy
@@ -247,7 +247,7 @@ class AdminUsersActivityTest extends Specification implements ManagerContainerTr
resultEvents[0].place instanceof AdminUsersPlace
resultEvents[1] instanceof GoToPlaceEvent
resultEvents[1].place instanceof AdminUsersPlace
- resultEvents[1].place.realm == MASTER_REALM
+ resultEvents[1].place.getAppName == MASTER_REALM
and: "The view should have received the tenants, selected realm, and users"
conditions.eventually {
@@ -274,7 +274,7 @@ class AdminUsersActivityTest extends Specification implements ManagerContainerTr
assert resultEvents[0].place instanceof AdminUserEditPlace
assert resultEvents[1] instanceof GoToPlaceEvent
assert resultEvents[1].place instanceof AdminUserEditPlace
- assert resultEvents[1].place.realm == MASTER_REALM
+ assert resultEvents[1].place.getAppName == MASTER_REALM
}
and: "The admin navigation view should have the right place set"
@@ -405,7 +405,7 @@ class AdminUsersActivityTest extends Specification implements ManagerContainerTr
assert resultEvents[1].place instanceof AdminUsersPlace
assert resultEvents[2] instanceof GoToPlaceEvent
assert resultEvents[2].place instanceof AdminUsersPlace
- assert resultEvents[2].place.realm == MASTER_REALM
+ assert resultEvents[2].place.getAppName == MASTER_REALM
}
and: "The view should have received the users"
@@ -433,7 +433,7 @@ class AdminUsersActivityTest extends Specification implements ManagerContainerTr
assert resultEvents[0].place instanceof AbstractAdminUsersPlace
assert resultEvents[1] instanceof GoToPlaceEvent
assert resultEvents[1].place instanceof AbstractAdminUsersPlace
- assert resultEvents[1].place.realm == MASTER_REALM
+ assert resultEvents[1].place.getAppName == MASTER_REALM
assert resultEvents[1].place.userId == selectedUser.id
}
@@ -653,7 +653,7 @@ class AdminUsersActivityTest extends Specification implements ManagerContainerTr
assert resultEvents[1].place instanceof AdminUsersPlace
assert resultEvents[2] instanceof GoToPlaceEvent
assert resultEvents[2].place instanceof AdminUsersPlace
- assert resultEvents[2].place.realm == MASTER_REALM
+ assert resultEvents[2].place.getAppName == MASTER_REALM
}
and: "The view should have received the tenants and users"