Merge pull request #527 from it-at-m/authservice-change-settings-prefix

refactor properties im AuthService serviceauth -> service.config
it-at-m · Nov 11, 2024 · c681865 · c681865
2 parents 3dbab83 + 2c5e8af
commit c681865
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 19 deletions.
diff --git a/docs/src/services/auth-service/index.md b/docs/src/services/auth-service/index.md
@@ -71,7 +71,7 @@ sequenceDiagram
 
 ## Konfigrationsparameter
 
-Alle Konfigurationsparameter beginnen mit dem Prefix `serviceauth`
+Alle Konfigurationsparameter beginnen mit dem Prefix `service.config`
 
 | Name                    | Beschreibung                                                                           | Default |
 |-------------------------|----------------------------------------------------------------------------------------| ------- |

diff --git a/.../java/de/muenchen/oss/wahllokalsystem/authservice/client/InfomanagementServiceClient.java b/.../java/de/muenchen/oss/wahllokalsystem/authservice/client/InfomanagementServiceClient.java
@@ -24,10 +24,10 @@ public class InfomanagementServiceClient implements WelcomeClient {
 
     private final KonfigurationControllerApi konfigurationControllerApi;
 
-    @Value("${serviceauth.clients.infomanagement.configkey.welcomeMessage}")
+    @Value("${service.config.clients.infomanagement.configkey.welcomeMessage}")
     String konfigKeyWelcomeMessage;
 
-    @Value("${serviceauth.welcomemessage.default}")
+    @Value("${service.config.welcomemessage.default}")
     String defaultWelcomeMessage;
 
     @Override

diff --git a/...java/de/muenchen/oss/wahllokalsystem/authservice/configuration/BasePathConfiguration.java b/...java/de/muenchen/oss/wahllokalsystem/authservice/configuration/BasePathConfiguration.java
@@ -10,7 +10,7 @@
 @RequiredArgsConstructor
 public class BasePathConfiguration {
 
-    @Value("${serviceauth.clients.infomanagement.basepath}")
+    @Value("${service.config.clients.infomanagement.basepath}")
     String eaiBasePath;
 
     private final ApiClient eaiApiClient;

diff --git a/...vice/src/main/java/de/muenchen/oss/wahllokalsystem/authservice/service/CryptoService.java b/...vice/src/main/java/de/muenchen/oss/wahllokalsystem/authservice/service/CryptoService.java
@@ -14,7 +14,7 @@ public class CryptoService {
 
     private final EncryptionBuilder encryptionBuilder;
 
-    @Value("${serviceauth.crypto.encryptionPrefix}")
+    @Value("${service.config.crypto.encryptionPrefix}")
     private String encryptedPrefix = "";
 
     public boolean isEncrypted(final String value) {

diff --git a/...ervice/src/main/java/de/muenchen/oss/wahllokalsystem/authservice/service/UserService.java b/...ervice/src/main/java/de/muenchen/oss/wahllokalsystem/authservice/service/UserService.java
@@ -25,7 +25,7 @@ public class UserService {
 
     private final LoginAttemptModelMapper loginAttemptModelMapper;
 
-    @Value("${serviceauth.maxLoginAttempts}")
+    @Value("${service.config.maxLoginAttempts}")
     @Getter
     @Setter
     private int maxLoginAttempts;

diff --git a/wls-auth-service/src/main/resources/application.yml b/wls-auth-service/src/main/resources/application.yml
@@ -59,17 +59,16 @@ info.application.name: @project.artifactId@
 info.application.version: @project.version@
 
 service:
+  config:
+    crypto:
+      encryptionPrefix: "ENCRYPTED:"
+    maxLoginAttempts: 5
+    clients:
+      infomanagement:
+        basepath: http://localhost:39146
+        configkey:
+          welcomeMessage: WILLKOMMENSTEXT
+    welcomemessage:
+      default: "Willkommen zur Wahl!"
   info:
-    oid: AUTH-SERVICE
-
-serviceauth:
-  crypto:
-    encryptionPrefix: "ENCRYPTED:"
-  maxLoginAttempts: 5
-  clients:
-    infomanagement:
-      basepath: http://localhost:39146
-      configkey:
-        welcomeMessage: WILLKOMMENSTEXT
-  welcomemessage:
-    default: "Willkommen zur Wahl!"
+    oid: AUTH-SERVICE