From 928a3d8bfbc25679afb98dbd3822b96b7d4fd68a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Wed, 19 Mar 2025 23:26:48 +0100 Subject: [PATCH] feature/Check mandatory headers of Berlin Group 3 --- obp-api/src/main/scala/code/api/util/BerlinGroupCheck.scala | 4 ++-- obp-api/src/test/scala/code/setup/ServerSetup.scala | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/obp-api/src/main/scala/code/api/util/BerlinGroupCheck.scala b/obp-api/src/main/scala/code/api/util/BerlinGroupCheck.scala index 22a7118a8..a8d63a65b 100644 --- a/obp-api/src/main/scala/code/api/util/BerlinGroupCheck.scala +++ b/obp-api/src/main/scala/code/api/util/BerlinGroupCheck.scala @@ -20,9 +20,9 @@ object BerlinGroupCheck { private def validateHeaders(verb: String, url: String, reqHeaders: List[HTTPParam], forwardResult: (Box[User], Option[CallContext])): (Box[User], Option[CallContext]) = { val headerMap = reqHeaders.map(h => h.name.toLowerCase -> h).toMap val missingHeaders = if(url.contains("berlin-group") && url.endsWith("/consent")) - berlinGroupMandatoryHeaders.filterNot(headerMap.contains) - else (berlinGroupMandatoryHeaders ++ berlinGroupMandatoryHeaderConsent).filterNot(headerMap.contains) + else + berlinGroupMandatoryHeaders.filterNot(headerMap.contains) if (missingHeaders.isEmpty) { forwardResult // All mandatory headers are present diff --git a/obp-api/src/test/scala/code/setup/ServerSetup.scala b/obp-api/src/test/scala/code/setup/ServerSetup.scala index 3d1ee367c..31ff36032 100644 --- a/obp-api/src/test/scala/code/setup/ServerSetup.scala +++ b/obp-api/src/test/scala/code/setup/ServerSetup.scala @@ -57,6 +57,10 @@ trait ServerSetup extends FeatureSpec with SendServerRequests setPropsValues("api_instance_id" -> "1_final") setPropsValues("starConnector_supported_types" -> "mapped,internal") setPropsValues("connector" -> "star") + + // Berlin Group + setPropsValues("berlin_group_mandatory_headers" -> "") + setPropsValues("berlin_group_mandatory_header_consent" -> "") val server = TestServer def baseRequest = host(server.host, server.port)