OZG-5682 fix configuration for antragraum

nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/NachrichtenManagerProperties.java

@@ -12,5 +12,8 @@ import lombok.Setter;
 @Getter
 public class NachrichtenManagerProperties {
 
-	private String url;
+	/**
+	 * URL of Nachrichten Manager instance
+	 */
+	private String address;
 }

nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumProperties.java

@@ -55,14 +55,17 @@ public class AntragraumProperties {
 	/**
 	 * The uri where to load the idp Metadata from
 	 */
+	@NotEmpty
 	private Resource metadataUri;
 	/**
 	 * The location of the private key for decrypting the saml token data
 	 */
+	@NotEmpty
 	private Resource decryptionPrivateKey;
 	/**
 	 * The location of the certificate for decrypting the saml token data
 	 */
+	@NotEmpty
 	private Resource decryptionCertificate;
 
 }

nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumService.java

@@ -27,6 +27,8 @@ import static java.util.Objects.*;
 
 import java.util.stream.Stream;
 
+import jakarta.annotation.PostConstruct;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
@@ -34,7 +36,6 @@ import org.springframework.stereotype.Service;
 import de.ozgcloud.nachrichten.NachrichtenManagerProperties;
 import de.ozgcloud.nachrichten.postfach.PersistPostfachNachrichtService;
 import de.ozgcloud.nachrichten.postfach.PostfachNachricht;
-import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 
 @Service
@@ -65,7 +66,7 @@ public class AntragraumService {
 
 	@PostConstruct
 	void init() {
-		if (isNull(nachrichtenManagerProperties.getUrl())) {
+		if (isNull(nachrichtenManagerProperties.getAddress())) {
 			throw new IllegalStateException("Address of Nachrichten-Manager is not set");
 		}
 	}

nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/BayernIdSamlConfiguration.java

@@ -84,7 +84,7 @@ import net.shibboleth.utilities.java.support.xml.XMLParserException;
 class BayernIdSamlConfiguration {
 	private XMLObjectProviderRegistry registry;
 	@Getter
-	private ParserPool parserPool;
+	private ParserPool parserPool; // TODO als spring bean bereit stellen
 	@Autowired
 	private AntragraumProperties antragraumProperties;
 

nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/Saml2Parser.java

@@ -45,7 +45,8 @@ import net.shibboleth.utilities.java.support.xml.XMLParserException;
 @ConditionalOnProperty(AntragraumProperties.PROPERTY_ANTRAGSRAUM_URL)
 @RequiredArgsConstructor
 class Saml2Parser {
-	private final BayernIdSamlConfiguration configuration;
+	private final BayernIdSamlConfiguration configuration; // TODO eine Configuration sollte nicht als Bean injeziert werden
+	// TODO als Spring Bean bereit stellen
 	private ResponseUnmarshaller unmarshaller;
 
 	Response parse(String request) {

nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/Saml2Verifier.java

@@ -48,8 +48,10 @@ import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 class Saml2Verifier {
 	public static final String INVALID_SIGNATURE = "Invalid signature for object [%s]: ";
 	public static final String SIGNATURE_MISSING = "Signature missing";
+
 	private final Saml2Parser parser;
 	private final BayernIdSamlConfiguration configuration;
+
 	private SignatureTrustEngine trustEngine;
 	private CriteriaSet verificationCriteria;
 

nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/info/InfoManagerService.java

@@ -29,7 +29,7 @@ public class InfoManagerService {
 				.nachrichtId(postfachNachricht.getId())
 				.vorgangId(postfachNachricht.getVorgangId())
 				.postfachId(postfachNachricht.getPostfachId())
-				.nachrichtenManagerUrl(nachrichtenManagerProperties.getUrl())
+				.nachrichtenManagerUrl(nachrichtenManagerProperties.getAddress())
 				.build();
 	}
 }

nachrichten-manager-server/src/main/resources/application-bayernlocal.yaml

@@ -3,5 +3,10 @@ ozgcloud:
     url: https://dev.antragsraum.de/
     entityId: https://antragsraum.ozgcloud.de/
     metadataUri: "classpath:/bayernid/metadata/bayernid-idp-infra.xml"
-    decryptionPrivateKey: "classpath:/bayernid/bayernid-test-enc.key"
-    decryptionCertificate: "classpath:/bayernid/bayernid-test-enc.crt"
+    decryptionPrivateKey: "classpath:/bayernid/bayernid-dev-enc.key"
+    decryptionCertificate: "classpath:/bayernid/bayernid-dev-enc.crt"
\ No newline at end of file
+    
+grpc:
+  client:
+    info-manager:
+      address: infomanager.local
\ No newline at end of file

nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/info/InfoManagerServiceTest.java

@@ -88,7 +88,7 @@ class InfoManagerServiceTest {
 
 			@Test
 			void shouldSetNachrichtenManagerUrl() {
-				when(nachrichtenManagerProperties.getUrl()).thenReturn(NACHRICHTEN_MANAGER_URL);
+				when(nachrichtenManagerProperties.getAddress()).thenReturn(NACHRICHTEN_MANAGER_URL);
 
 				var request = buildInfomanagerNachricht();