Merge branch 'master' of git.ozg-sh.de:mgm/goofy

goofy-client/apps/goofy-e2e/docker-compose.yml

@@ -29,7 +29,8 @@ services:
     environment:
       - GRPC_CLIENT_PLUTO_ADDRESS=static://ozg-pluto:9090
       - SPRING_PROFILES_ACTIVE=remotekc, e2e
-      - KOP_USER-MANAGER_URL=http://${DOCKER_GATEWAY_HOST:-host.docker.internal}:9092
+      - KOP_USER-MANAGER_URL=http://localhost:9092
+      - KOP_USER-MANAGER_INTERNALURL=http://ozg-usermanager:8080
     ports:
       - 8080:8080
     depends_on:

goofy-server/src/main/java/de/itvsh/goofy/common/user/InternalUserIdService.java

@@ -16,7 +16,7 @@ public class InternalUserIdService {
 
 	private static final String PATH = "/migration/user/{externalUserId}"; // NOSONAR
 
-	@Value("${kop.user-manager.url}")
+	@Value("${kop.user-manager.internalurl}")
 	private String userManagerUrl;
 
 	private RestTemplate restTemplate = new RestTemplate();

goofy-server/src/main/resources/application-e2e.yml

@@ -8,3 +8,4 @@ kop:
       url: classpath:files/LandesnetzInfo.html
   user-manager:
     url: http://localhost:9092
+    internalurl: http://ozg-usermanager:8080
\ No newline at end of file

goofy-server/src/main/resources/application-local.yml

@@ -18,5 +18,6 @@ server:
 kop:
   user-manager:
     url: http://localhost:9092
+    internalurl: http://localhost:9092
     profile-template: /api/userProfiles/%s
     search-template: /api/userProfiles/?searchBy={searchBy}
\ No newline at end of file

goofy-server/src/test/resources/application-itcase.yml

@@ -5,6 +5,7 @@ logging:
 kop:
   user-manager:
     url: https://localhost
+    internalurl: http://localhost:8080
     search-template: /api/userProfiles/?searchBy={searchBy}
     profile-template: /api/userProfiles/%s
   upload:

goofy-server/src/test/resources/application.yml

@@ -14,6 +14,7 @@ kop:
       validity: 60000
   user-manager:
     url: https://localhost
+    internalurl: http://localhost:8080
     search-template: /api/userProfiles/?searchBy={searchBy}
     profile-template: /api/userProfiles/%s