From 3a6b8a1f7059aa2adf9efa44fb3f71a08cbba1af Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 22 Jan 2021 12:40:45 +0100
Subject: [PATCH] OZG-164 OZG-216 extend environment with settings for keycloak
---
.../libs/environment-shared/src/lib/environment.model.ts | 4 +++-
.../main/java/de/itvsh/goofy/EnvironmentController.java | 7 +++++++
.../src/main/java/de/itvsh/goofy/FrontendEnvironment.java | 2 ++
3 files changed, 12 insertions(+), 1 deletion(-)
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 ce694ccd94..69161ba374 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 d8372229e2..aa539a8b67 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 4317d49c85..5f3b99bb9a 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;
}
--
GitLab