From f0fd809bb88ef344fb092d7fe35363cdc7432611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Fri, 18 Jul 2025 14:20:50 +0200 Subject: [PATCH] test/Fix ConsentObpTest failures --- .../scala/code/api/v5_1_0/APIMethods510.scala | 3 +- .../api/v4_0_0/ForceErrorValidationTest.scala | 42 +++++++++---------- .../code/api/v5_1_0/ConsentObpTest.scala | 4 +- .../scala/code/setup/SendServerRequests.scala | 4 +- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala b/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala index 32f8ce6c2..215111f2f 100644 --- a/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala +++ b/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala @@ -2161,7 +2161,8 @@ trait APIMethods510 { consentJson, createdConsent.secret, createdConsent.consentId, - consumerFromRequestBody.map(_.consumerId.get), + consumerFromRequestBody.map(_.consumerId.get) + .orElse(cc.consumer.map(_.consumerId.get)), // Consumer from current call consentJson.valid_from, consentJson.time_to_live.getOrElse(3600), None, diff --git a/obp-api/src/test/scala/code/api/v4_0_0/ForceErrorValidationTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/ForceErrorValidationTest.scala index 0262fdf9d..b524417ee 100644 --- a/obp-api/src/test/scala/code/api/v4_0_0/ForceErrorValidationTest.scala +++ b/obp-api/src/test/scala/code/api/v4_0_0/ForceErrorValidationTest.scala @@ -61,7 +61,7 @@ class ForceErrorValidationTest extends V400ServerSetup with PropsReset { scenario("We will call the endpoint with user credentials", ApiEndpoint1, VersionOfApi) { When("We make a request v4.0.0") val request310 = (v4_0_0_Request / "banks" / bankId / "customers").POST <@ user1 - val response310 = makePostRequest(request310, "", ("Force-Error", "OBP-20006")) + val response310 = makePostRequest(request310, "", List(("Force-Error", "OBP-20006"))) Then("We should get a 403") response310.code should equal(403) val errorMsg = UserHasMissingRoles + canCreateCustomer + " or " + canCreateCustomerAtAnyBank @@ -92,7 +92,7 @@ class ForceErrorValidationTest extends V400ServerSetup with PropsReset { When("We make a request v4.0.0") val request = (dynamicEntity_Request / "FooBar").POST - val response = makePostRequest(request, correctFooBar, ("Force-Error", "OBP-20006")) + val response = makePostRequest(request, correctFooBar, List(("Force-Error", "OBP-20006"))) Then("We should get a 401") response.code should equal(401) @@ -104,7 +104,7 @@ class ForceErrorValidationTest extends V400ServerSetup with PropsReset { When("We make a request v4.0.0") val request = (dynamicEndpoint_Request / "save").POST - val response = makePostRequest(request, correctUser, ("Force-Error", "OBP-20006")) + val response = makePostRequest(request, correctUser, List(("Force-Error", "OBP-20006"))) Then("We should get a 401") response.code should equal(401) @@ -207,7 +207,7 @@ class ForceErrorValidationTest extends V400ServerSetup with PropsReset { addEntitlement(canCreateCustomer, bankId) When("We make a request v4.0.0") val request = (v4_0_0_Request / "banks" / bankId / "customers").POST <@ (user1) - val response = makePostRequest(request, "", "Force-Error" -> "OBP-xxxx") + val response = makePostRequest(request, "", List(("Force-Error" -> "OBP-xxxx"))) Then("We should get a 400") response.code should equal(400) val validation = response.body @@ -220,7 +220,7 @@ class ForceErrorValidationTest extends V400ServerSetup with PropsReset { addEntitlement(canCreateCustomer, bankId) When("We make a request v4.0.0") val request = (v4_0_0_Request / "banks" / bankId / "customers").POST <@ (user1) - val response = makePostRequest(request, "", ("Force-Error", "OBP-20009")) + val response = makePostRequest(request, "", List(("Force-Error", "OBP-20009"))) Then("We should get a 400") response.code should equal(400) val validation = response.body @@ -233,7 +233,7 @@ class ForceErrorValidationTest extends V400ServerSetup with PropsReset { addEntitlement(canCreateCustomer, bankId) When("We make a request v4.0.0") val request = (v4_0_0_Request / "banks" / bankId / "customers").POST <@ (user1) - val response = makePostRequest(request, "", ("Force-Error", "OBP-20006"), ("Response-Code", "not_integer")) + val response = makePostRequest(request, "", List(("Force-Error", "OBP-20006"), ("Response-Code", "not_integer"))) Then("We should get a 400") response.code should equal(400) val validation = response.body @@ -246,7 +246,7 @@ class ForceErrorValidationTest extends V400ServerSetup with PropsReset { addEntitlement(canCreateCustomer, bankId) When("We make a request v4.0.0") val request = (v4_0_0_Request / "banks" / bankId / "customers").POST <@ (user1) - val response = makePostRequest(request, "", ("Force-Error", "OBP-20006")) + val response = makePostRequest(request, "", List(("Force-Error", "OBP-20006"))) Then("We should get a 403") response.code should equal(403) val validation = response.body @@ -261,7 +261,7 @@ class ForceErrorValidationTest extends V400ServerSetup with PropsReset { addEntitlement(canCreateCustomer, bankId) When("We make a request v4.0.0") val request = (v4_0_0_Request / "banks" / bankId / "customers").POST <@ (user1) - val response = makePostRequest(request, "", ("Force-Error", "OBP-20006"), ("Response-Code", "444")) + val response = makePostRequest(request, "", List(("Force-Error", "OBP-20006"), ("Response-Code", "444"))) Then("We should get a 444") response.code should equal(444) val validation = response.body @@ -277,7 +277,7 @@ class ForceErrorValidationTest extends V400ServerSetup with PropsReset { addEntitlement(canCreateCustomer, bankId) When("We make a request v4.0.0") val request = (v4_0_0_Request / "banks" / bankId / "customers").POST <@ (user1) - val response = makePostRequest(request, "", ("Force-Error", "OBP-20006")) + val response = makePostRequest(request, "", List(("Force-Error", "OBP-20006"))) Then("We should not get a 403") response.code should not equal(403) val validation = response.body @@ -415,7 +415,7 @@ class ForceErrorValidationTest extends V400ServerSetup with PropsReset { When("We make a request v4.0.0") val request = (dynamicEntity_Request / "FooBar").POST <@ user1 - val response = makePostRequest(request, correctFooBar, ("Force-Error" -> "OBP-xxxx")) + val response = makePostRequest(request, correctFooBar, List((("Force-Error" -> "OBP-xxxx")))) Then("We should get a 400") response.code should equal(400) @@ -431,7 +431,7 @@ class ForceErrorValidationTest extends V400ServerSetup with PropsReset { When("We make a request v4.0.0") val request = (dynamicEntity_Request / "FooBar").POST <@ user1 - val response = makePostRequest(request, correctFooBar, ("Force-Error" -> "OBP-20009")) + val response = makePostRequest(request, correctFooBar, List(("Force-Error" -> "OBP-20009"))) Then("We should get a 400") response.code should equal(400) val validation = response.body @@ -446,7 +446,7 @@ class ForceErrorValidationTest extends V400ServerSetup with PropsReset { When("We make a request v4.0.0") val request = (dynamicEntity_Request / "FooBar").POST <@ user1 - val response = makePostRequest(request, correctFooBar, ("Force-Error" -> "OBP-20006"), ("Response-Code" -> "not_integer")) + val response = makePostRequest(request, correctFooBar, List(("Force-Error" -> "OBP-20006"), ("Response-Code" -> "not_integer"))) Then("We should get a 400") response.code should equal(400) val validation = response.body @@ -461,7 +461,7 @@ class ForceErrorValidationTest extends V400ServerSetup with PropsReset { When("We make a request v4.0.0") val request = (dynamicEntity_Request / "FooBar").POST <@ user1 - val response = makePostRequest(request, correctFooBar, ("Force-Error" -> "OBP-20006")) + val response = makePostRequest(request, correctFooBar, List(("Force-Error" -> "OBP-20006"))) Then("We should get a 403") response.code should equal(403) val validation = response.body @@ -478,7 +478,7 @@ class ForceErrorValidationTest extends V400ServerSetup with PropsReset { When("We make a request v4.0.0") val request = (dynamicEntity_Request / "FooBar").POST <@ user1 - val response = makePostRequest(request, correctFooBar, ("Force-Error" -> "OBP-20006"), ("Response-Code" -> "444")) + val response = makePostRequest(request, correctFooBar, List(("Force-Error" -> "OBP-20006"), ("Response-Code" -> "444"))) Then("We should get a 444") response.code should equal(444) val validation = response.body @@ -496,7 +496,7 @@ class ForceErrorValidationTest extends V400ServerSetup with PropsReset { When("We make a request v4.0.0") val request = (dynamicEntity_Request / "FooBar").POST <@ user1 - val response = makePostRequest(request, correctFooBar, ("Force-Error" -> "OBP-20006")) + val response = makePostRequest(request, correctFooBar, List(("Force-Error" -> "OBP-20006"))) Then("We should not get a 403") response.code should not equal(403) val validation = response.body @@ -517,7 +517,7 @@ class ForceErrorValidationTest extends V400ServerSetup with PropsReset { When("We make a request v4.0.0") val request = (dynamicEndpoint_Request/ "save").POST <@ user1 - val response = makePostRequest(request, correctUser, ("Force-Error" -> "OBP-xxxx")) + val response = makePostRequest(request, correctUser, List("Force-Error" -> "OBP-xxxx")) Then("We should get a 400") response.code should equal(400) @@ -534,7 +534,7 @@ class ForceErrorValidationTest extends V400ServerSetup with PropsReset { When("We make a request v4.0.0") val request = (dynamicEndpoint_Request/ "save").POST <@ user1 - val response = makePostRequest(request, correctUser, ("Force-Error" -> "OBP-20009")) + val response = makePostRequest(request, correctUser, List("Force-Error" -> "OBP-20009")) Then("We should get a 400") response.code should equal(400) val validation = response.body @@ -550,7 +550,7 @@ class ForceErrorValidationTest extends V400ServerSetup with PropsReset { When("We make a request v4.0.0") val request = (dynamicEndpoint_Request/ "save").POST <@ user1 - val response = makePostRequest(request, correctUser, ("Force-Error" -> "OBP-20006"), ("Response-Code" -> "not_integer")) + val response = makePostRequest(request, correctUser, List("Force-Error" -> "OBP-20006", "Response-Code" -> "not_integer")) Then("We should get a 400") response.code should equal(400) val validation = response.body @@ -566,7 +566,7 @@ class ForceErrorValidationTest extends V400ServerSetup with PropsReset { When("We make a request v4.0.0") val request = (dynamicEndpoint_Request/ "save").POST <@ user1 - val response = makePostRequest(request, correctUser, ("Force-Error" -> "OBP-20006")) + val response = makePostRequest(request, correctUser, List("Force-Error" -> "OBP-20006")) Then("We should get a 403") response.code should equal(403) val validation = response.body @@ -584,7 +584,7 @@ class ForceErrorValidationTest extends V400ServerSetup with PropsReset { When("We make a request v4.0.0") val request = (dynamicEndpoint_Request/ "save").POST <@ user1 - val response = makePostRequest(request, correctUser, ("Force-Error" -> "OBP-20006"), ("Response-Code" -> "444")) + val response = makePostRequest(request, correctUser, List("Force-Error" -> "OBP-20006", "Response-Code" -> "444")) Then("We should get a 444") response.code should equal(444) val validation = response.body @@ -603,7 +603,7 @@ class ForceErrorValidationTest extends V400ServerSetup with PropsReset { When("We make a request v4.0.0") val request = (dynamicEndpoint_Request/ "save").POST <@ user1 - val response = makePostRequest(request, correctUser, ("Force-Error" -> "OBP-20006")) + val response = makePostRequest(request, correctUser, List("Force-Error" -> "OBP-20006")) Then("We should not get a 403") response.code should not equal(403) val validation = response.body diff --git a/obp-api/src/test/scala/code/api/v5_1_0/ConsentObpTest.scala b/obp-api/src/test/scala/code/api/v5_1_0/ConsentObpTest.scala index f32313162..1cfd6c0d9 100644 --- a/obp-api/src/test/scala/code/api/v5_1_0/ConsentObpTest.scala +++ b/obp-api/src/test/scala/code/api/v5_1_0/ConsentObpTest.scala @@ -64,11 +64,11 @@ class ConsentObpTest extends V510ServerSetup { lazy val views = List(PostConsentViewJsonV310(bankId, bankAccount.id, Constant.SYSTEM_OWNER_VIEW_ID)) lazy val postConsentEmailJsonV310 = SwaggerDefinitionsJSON.postConsentEmailJsonV310 .copy(entitlements=entitlements) - .copy(consumer_id=Some(testConsumer.consumerId.get)) + .copy(consumer_id=None) .copy(views=views) lazy val postConsentImplicitJsonV310 = SwaggerDefinitionsJSON.postConsentImplicitJsonV310 .copy(entitlements=entitlements) - .copy(consumer_id=Some(testConsumer.consumerId.get)) + .copy(consumer_id=None) .copy(views=views) val maxTimeToLive = APIUtil.getPropsAsIntValue(nameOfProperty="consents.max_time_to_live", defaultValue=3600) diff --git a/obp-api/src/test/scala/code/setup/SendServerRequests.scala b/obp-api/src/test/scala/code/setup/SendServerRequests.scala index 8b37294c6..e43c346cf 100644 --- a/obp-api/src/test/scala/code/setup/SendServerRequests.scala +++ b/obp-api/src/test/scala/code/setup/SendServerRequests.scala @@ -211,9 +211,9 @@ trait SendServerRequests { /** *this method does a POST request given a URL, a JSON */ - def makePostRequest(req: Req, json: String, headers: (String, String) *): APIResponse = { + def makePostRequest(req: Req, json: String, headers: List[(String, String)] = Nil): APIResponse = { val extra_headers = Map( "Content-Type" -> "application/json", - "Accept" -> "application/json") ++ headers.toMap + "Accept" -> "application/json") ++ headers val reqData = extractParamsAndHeaders(req.POST, json, "UTF-8", extra_headers) val jsonReq = createRequest(reqData) getAPIResponse(jsonReq)