diff --git a/goofy-client/libs/environment-shared/src/lib/environment.model.ts b/goofy-client/libs/environment-shared/src/lib/environment.model.ts index ce694ccd94f576b2b53e6c88c741e12e78c7c727..69161ba37497610345513e8941b126a4182fb7ca 100644 --- a/goofy-client/libs/environment-shared/src/lib/environment.model.ts +++ b/goofy-client/libs/environment-shared/src/lib/environment.model.ts @@ -2,5 +2,7 @@ import { ResourceUri } from '@ngxp/rest/lib/resource.model'; export interface Environment { production: boolean, - remoteHost: ResourceUri + remoteHost: ResourceUri, + authServier: String, + realm: String } \ No newline at end of file diff --git a/goofy-server/src/main/java/de/itvsh/goofy/EnvironmentController.java b/goofy-server/src/main/java/de/itvsh/goofy/EnvironmentController.java index d8372229e2bb28e7218b5acab3dc8b3af9f89ae2..aa539a8b6784bc28f12eddeca11d4e3f958d016d 100644 --- a/goofy-server/src/main/java/de/itvsh/goofy/EnvironmentController.java +++ b/goofy-server/src/main/java/de/itvsh/goofy/EnvironmentController.java @@ -2,6 +2,8 @@ package de.itvsh.goofy; import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.*; +import org.keycloak.adapters.springboot.KeycloakSpringBootProperties; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -11,6 +13,9 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/api/environment") public class EnvironmentController { + @Autowired + private KeycloakSpringBootProperties kcProperties; + @Value("${goofy.production}") private boolean production; @@ -19,6 +24,8 @@ public class EnvironmentController { return FrontendEnvironment.builder()// .production(production)// .remoteHost(apiRoot())// + .authServer(kcProperties.getAuthServerUrl())// + .realm(kcProperties.getRealm()) .build(); } diff --git a/goofy-server/src/main/java/de/itvsh/goofy/FrontendEnvironment.java b/goofy-server/src/main/java/de/itvsh/goofy/FrontendEnvironment.java index 4317d49c857a7e737ed2c53d99ff7f6e8ce69d2f..5f3b99bb9aec0baac48b909d3eaea9f56173d4f9 100644 --- a/goofy-server/src/main/java/de/itvsh/goofy/FrontendEnvironment.java +++ b/goofy-server/src/main/java/de/itvsh/goofy/FrontendEnvironment.java @@ -9,4 +9,6 @@ public class FrontendEnvironment { private boolean production; private String remoteHost; + private String authServer; + private String realm; }