From 1cc2a7590c0ec4fc8ce94e158fc85a5ac4ef6053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Wed, 9 Apr 2025 13:24:29 +0200 Subject: [PATCH] feature/consumer_id: null in consents info and getMyConsents endpoints --- .../src/main/scala/code/api/v5_1_0/APIMethods510.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 d3b465d64..75bdb1803 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 @@ -35,7 +35,7 @@ import code.entitlement.Entitlement import code.loginattempts.LoginAttempt import code.metrics.APIMetrics import code.metrics.MappedMetric.userId -import code.model.AppType +import code.model.{AppType, Consumer} import code.model.dataAccess.{AuthUser, MappedBankAccount} import code.regulatedentities.MappedRegulatedEntityProvider import code.userlocks.UserLocksProvider @@ -2061,9 +2061,9 @@ trait APIMethods510 { } ) } - (consumerId, applicationText) <- consentJson.consumer_id match { + (consumerFromRequestBody: Option[Consumer], applicationText) <- consentJson.consumer_id match { case Some(id) => NewStyle.function.checkConsumerByConsumerId(id, callContext) map { - c => (Some(c.consumerId.get), c.description) + c => (Some(c), c.description) } case None => Future(None, "Any application") } @@ -2073,7 +2073,7 @@ trait APIMethods510 { case Props.RunModes.Test => Consent.challengeAnswerAtTestEnvironment case _ => SecureRandomUtil.numeric() } - createdConsent <- Future(Consents.consentProvider.vend.createObpConsent(user, challengeAnswer, None)) map { + createdConsent <- Future(Consents.consentProvider.vend.createObpConsent(user, challengeAnswer, None, consumerFromRequestBody)) map { i => connectorEmptyResponse(i, callContext) } consentJWT = @@ -2082,7 +2082,7 @@ trait APIMethods510 { consentJson, createdConsent.secret, createdConsent.consentId, - consumerId, + consumerFromRequestBody.map(_.consumerId.get), consentJson.valid_from, consentJson.time_to_live.getOrElse(3600), None,