diff --git a/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiProperties.java b/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiProperties.java
index b6b1776ebbb3c8e49bde40dde1beece6fdbda13a..71a5f3fc5d78286becd1ad718acc19bfca47f24c 100644
--- a/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiProperties.java
+++ b/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiProperties.java
@@ -4,7 +4,7 @@ import javax.validation.constraints.NotBlank;
import io.smallrye.config.ConfigMapping;
-@ConfigMapping(prefix = "usermanager.keycloak.api")
+@ConfigMapping(prefix = "kop.keycloak.api")
public interface KeycloakApiProperties {
@NotBlank
diff --git a/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiService.java b/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiService.java
index e98bc4b43da8940e5a12c6bee1324e18642cb4f6..812c782d6946c975855a27cc5d9282137538f294 100644
--- a/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiService.java
+++ b/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiService.java
@@ -31,7 +31,7 @@ class KeycloakApiService {
@Inject
KeycloakApiProperties properties;
- @ConfigProperty(name = "keycloak.url")
+ @ConfigProperty(name = "kop.keycloak.url")
String keycloakUrl;
public Stream<User> findAllUser() {
diff --git a/src/main/java/de/itvsh/kop/user/keycloak/KeycloakProvider.java b/src/main/java/de/itvsh/kop/user/keycloak/KeycloakProvider.java
index 70e1355f6a6e6f7c031d481a61460fe5ee9931d3..8bc5475feb98ee3e7a42c9f45b1c39dbe255fea7 100644
--- a/src/main/java/de/itvsh/kop/user/keycloak/KeycloakProvider.java
+++ b/src/main/java/de/itvsh/kop/user/keycloak/KeycloakProvider.java
@@ -15,7 +15,7 @@ public class KeycloakProvider {
@Inject
KeycloakApiProperties keycloakConfiguration;
- @ConfigProperty(name = "keycloak.url")
+ @ConfigProperty(name = "kop.keycloak.url")
String keycloakUrl;
@ApplicationScoped
diff --git a/src/main/java/de/itvsh/kop/user/sync/SyncScheduler.java b/src/main/java/de/itvsh/kop/user/sync/SyncScheduler.java
index d72afb46754af0bcd912682e2f09a4a6478bb764..1ae30cef9eb1f7245afaceec2a1d8e86133a4bfe 100644
--- a/src/main/java/de/itvsh/kop/user/sync/SyncScheduler.java
+++ b/src/main/java/de/itvsh/kop/user/sync/SyncScheduler.java
@@ -15,7 +15,7 @@ public class SyncScheduler {
@Inject
LockService syncLockService;
- @Scheduled(cron = "{usermanager.keycloak.sync.cron}")
+ @Scheduled(cron = "{kop.keycloak.sync.cron}")
public void start() {
if (syncLockService.isNotLocked()) {
syncService.sync();
diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml
index ef51b4d92c3dfbae315ed3f489e8060dec02034b..525632a2d0f84ae8100408953b9d20c55bfdb577 100644
--- a/src/main/resources/application-dev.yaml
+++ b/src/main/resources/application-dev.yaml
@@ -6,8 +6,9 @@ quarkus:
create-realm: true
realm-name: dev
realm-path: dev-realm.json
-usermanager:
+kop:
keycloak:
+ url: https://sso.dev.ozg-sh.de/auth
sync:
cron: "0 */10 * * * ?"
api:
diff --git a/src/main/resources/application-local.yaml b/src/main/resources/application-local.yaml
index d3116f7d59443a751cf1710f42947e3eebe952fb..f8ac28ecd8b6e42c97c0fe8ca7deb8a7a7b1068a 100644
--- a/src/main/resources/application-local.yaml
+++ b/src/main/resources/application-local.yaml
@@ -2,5 +2,6 @@ quarkus:
port: 8082
mongodb:
connection-string: mongodb://localhost:27017
-keycloak:
- url: http://localhost:8088
\ No newline at end of file
+kop:
+ keycloak:
+ url: http://localhost:8088
\ No newline at end of file
diff --git a/src/main/resources/application-remotekc.yaml b/src/main/resources/application-remotekc.yaml
index f16c633e13820f042de61db668301921d9e4ffb1..cfc3e79a31bfa858f0047d3cd566e73050c213c4 100644
--- a/src/main/resources/application-remotekc.yaml
+++ b/src/main/resources/application-remotekc.yaml
@@ -1,11 +1,10 @@
-usermanager:
+kop:
keycloak:
+ url: https://sso.dev.ozg-sh.de/auth
sync:
cron: "* */10 * * * ?"
api:
user: goofyApiUser
password: S9UEMuLG9y9ev99
realm: sh-kiel-dev
- organisations-einheit-id-key: organisationseinheitId
-keycloak:
- url: https://sso.dev.ozg-sh.de/auth
\ No newline at end of file
+ organisations-einheit-id-key: organisationseinheitId
\ No newline at end of file
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 6fe7ae0cf5158e84643c3741d0744ba520b5f13e..2a828b47de59c406635625d1b79a23f613b702b0 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -15,8 +15,9 @@ quarkus:
fields:
level:
field-name: log.level
-usermanager:
+kop:
keycloak:
+ url: https://sso.dev.ozg-sh.de/auth
sync:
cron: "0 15 13 * * ?"
api:
@@ -25,6 +26,4 @@ usermanager:
realm: sh-kiel-dev
organisations-einheit-id-key: organisationseinheitId
ldap-id-key: LDAP_ID
- client: sh-kiel-dev-goofy
-keycloak:
- url: https://sso.dev.ozg-sh.de/auth
\ No newline at end of file
+ client: sh-kiel-dev-goofy
\ No newline at end of file
diff --git a/src/test/java/de/itvsh/kop/user/keycloak/KeycloakTestProfile.java b/src/test/java/de/itvsh/kop/user/keycloak/KeycloakTestProfile.java
index e47cb32c47d3958ff5c9dc266c9ab517a8db046d..c8fa8a19162ef47002ec952ff19340bd8c07059c 100644
--- a/src/test/java/de/itvsh/kop/user/keycloak/KeycloakTestProfile.java
+++ b/src/test/java/de/itvsh/kop/user/keycloak/KeycloakTestProfile.java
@@ -6,16 +6,16 @@ import io.quarkus.test.junit.QuarkusTestProfile;
public class KeycloakTestProfile implements QuarkusTestProfile {
- private final String userKey = "usermanager.keycloak.api.user";
+ private final String userKey = "kop.keycloak.api.user";
private final String userValue = "goofyApiUser";
- private final String passwordKey = "usermanager.keycloak.api.password";
+ private final String passwordKey = "kop.keycloak.api.password";
private final String passwordValue = "S9UEMuLG9y9ev99";
- private final String realmKey = "usermanager.keycloak.api.realm";
+ private final String realmKey = "kop.keycloak.api.realm";
private final String realmValue = "sh-kiel-dev";
- private final String urlKey = "keycloak.url";
+ private final String urlKey = "kop.keycloak.url";
private final String urlValue = "https://sso.dev.ozg-sh.de/auth";
@Override