artin/OBP-API
1
0
Fork 0
mirror of https://github.com/OpenBankProject/OBP-API.git synced 2026-02-06 20:47:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2496 from hongwei1/develop

Browse Source 
feature/tweaked the page and swagger array default value
This commit is contained in:
Simon Redfern 2025-02-28 12:21:18 +01:00 committed by GitHub
commit eee06ce0ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 123 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala
View File

@ -4238,7 +4238,7 @@ object SwaggerDefinitionsJSON {
val postConsentEmailJsonV310 = PostConsentEmailJsonV310(
everything = false,
views = List(PostConsentViewJsonV310(bankIdExample.value, accountIdExample.value, viewIdExample.value)),
views = List(PostConsentViewJsonV310(bankIdExample.value, accountIdExample.value, viewIdExample.value, None)),
entitlements = List(PostConsentEntitlementJsonV310(bankIdExample.value, "CanGetCustomer")),
consumer_id = Some(consumerIdExample.value),
email = emailExample.value,
@ -4248,7 +4248,7 @@ object SwaggerDefinitionsJSON {
val postConsentPhoneJsonV310 = PostConsentPhoneJsonV310(
everything = false,
views = List(PostConsentViewJsonV310(bankIdExample.value, accountIdExample.value, viewIdExample.value)),
views = List(PostConsentViewJsonV310(bankIdExample.value, accountIdExample.value, viewIdExample.value, None)),
entitlements = List(PostConsentEntitlementJsonV310(bankIdExample.value, "CanGetCustomer")),
consumer_id = Some(consumerIdExample.value),
phone_number = mobileNumberExample.value,
@ -4258,7 +4258,7 @@ object SwaggerDefinitionsJSON {
val postConsentImplicitJsonV310 = PostConsentImplicitJsonV310(
everything = false,
views = List(PostConsentViewJsonV310(bankIdExample.value, accountIdExample.value, viewIdExample.value)),
views = List(PostConsentViewJsonV310(bankIdExample.value, accountIdExample.value, viewIdExample.value, None)),
entitlements = List(PostConsentEntitlementJsonV310(bankIdExample.value, "CanGetCustomer")),
consumer_id = Some(consumerIdExample.value),
valid_from = Some(new Date()),
@ -5223,14 +5223,14 @@ object SwaggerDefinitionsJSON {
)
val helperInfoJson = HelperInfoJson(
counterparty_id = List(counterpartyIdExample.value)
counterparty_ids = List(counterpartyIdExample.value)
)
val consentAccountAccessJson= ConsentAccountAccessJson(
bank_id = bankIdExample.value,
account_id = accountIdExample.value,
view_id = viewIdExample.value,
helper_info = helperInfoJson
helper_info = Some(helperInfoJson)
)
val consentJsonV500 = ConsentJsonV500(

1
obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJsonUtil.scala
View File

@ -22,6 +22,7 @@ object SwaggerDefinitionsJsonUtil {
"iat": 1730373271,
"nbf": 1730373271,
"exp": 1730937600,
"request_headers":[],
"entitlements": [],
"views": [ {
"bank_id": "nlbkb",

7
obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerJSONFactory.scala
View File

@ -752,9 +752,10 @@ object SwaggerJSONFactory extends MdcLoggable {
case _ if isTypeOf[JArray] =>
exampleValue match {
case JArray(v ::_) => s""" {"type": "array", "items":${buildSwaggerSchema(JsonUtils.getType(v), v)} }"""
case _ =>
logger.error(s"Empty JArray is not allowed in request body and response body example.")
throw new RuntimeException("JArray type should not be empty.")
case _ => s""" {"type": "array","items": {}}""" //if array is empty, we can not know the type here.
// case _ =>
// logger.error(s"Empty JArray is not allowed in request body and response body example.")
// throw new RuntimeException("JArray type should not be empty.")
}
case _ if isTypeOf[JObject] =>

2
obp-api/src/main/scala/code/api/util/APIUtil.scala
View File

@ -795,7 +795,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{
return false
}
// 2nd: check the password length between 10 and 512
// 2nd: check the password length between 17 and 512
if (password.length > 16 && password.length <= 512) {
return true
}

39
obp-api/src/main/scala/code/api/util/ConsentUtil.scala
View File

@ -4,8 +4,9 @@ import java.text.SimpleDateFormat
import java.util.{Date, UUID}
import code.api.berlin.group.v1_3.JSONFactory_BERLIN_GROUP_1_3.{ConsentAccessJson, PostConsentJson}
import code.api.util.ApiRole.{canCreateEntitlementAtAnyBank, canCreateEntitlementAtOneBank}
import code.api.util.ErrorMessages.{InvalidConnectorResponse, NoViewReadAccountsBerlinGroup, CouldNotAssignAccountAccess}
import code.api.util.ErrorMessages.{CouldNotAssignAccountAccess, InvalidConnectorResponse, NoViewReadAccountsBerlinGroup}
import code.api.v3_1_0.{PostConsentBodyCommonJson, PostConsentEntitlementJsonV310, PostConsentViewJsonV310}
import code.api.v5_0_0.HelperInfoJson
import code.api.{APIFailure, Constant, RequestHeader}
import code.bankconnectors.Connector
import code.consent
@ -71,7 +72,8 @@ case class Role(role_name: String,
)
case class ConsentView(bank_id: String,
account_id: String,
view_id : String
view_id : String,
helper_info: Option[HelperInfoJson]
)
case class Consent(createdByUserId: String,
@ -593,7 +595,9 @@ object Consent extends MdcLoggable {
consentId: String,
consumerId: Option[String],
validFrom: Option[Date],
timeToLive: Long): String = {
timeToLive: Long,
helperInfo: Option[HelperInfoJson]
): String = {
lazy val currentConsumerId = Consumer.findAll(By(Consumer.createdByUserId, user.userId)).map(_.consumerId.get).headOption.getOrElse("")
val currentTimeInSeconds = System.currentTimeMillis / 1000
@ -621,12 +625,13 @@ object Consent extends MdcLoggable {
val viewsToAdd: Seq[ConsentView] =
for {
view <- views
if consent.everything || consent.views.exists(_ == PostConsentViewJsonV310(view.bankId.value,view.accountId.value, view.viewId.value))
if consent.everything || consent.views.exists(_ == PostConsentViewJsonV310(view.bankId.value,view.accountId.value, view.viewId.value, helperInfo))
} yield {
ConsentView(
bank_id = view.bankId.value,
account_id = view.accountId.value,
view_id = view.viewId.value
view_id = view.viewId.value,
helper_info = helperInfo
)
}
// 2. Add Roles
@ -701,7 +706,8 @@ object Consent extends MdcLoggable {
ConsentView(
bank_id = bankAccount._1.map(_.bankId.value).getOrElse(""),
account_id = bankAccount._1.map(_.accountId.value).openOrThrowException(error),
view_id = Constant.SYSTEM_READ_ACCOUNTS_BERLIN_GROUP_VIEW_ID
view_id = Constant.SYSTEM_READ_ACCOUNTS_BERLIN_GROUP_VIEW_ID,
None
)
}
}
@ -712,7 +718,8 @@ object Consent extends MdcLoggable {
ConsentView(
bank_id = bankAccount._1.map(_.bankId.value).getOrElse(""),
account_id = bankAccount._1.map(_.accountId.value).openOrThrowException(error),
view_id = Constant.SYSTEM_READ_BALANCES_BERLIN_GROUP_VIEW_ID
view_id = Constant.SYSTEM_READ_BALANCES_BERLIN_GROUP_VIEW_ID,
None
)
}
}
@ -723,7 +730,8 @@ object Consent extends MdcLoggable {
ConsentView(
bank_id = bankAccount._1.map(_.bankId.value).getOrElse(""),
account_id = bankAccount._1.map(_.accountId.value).openOrThrowException(error),
view_id = Constant.SYSTEM_READ_TRANSACTIONS_BERLIN_GROUP_VIEW_ID
view_id = Constant.SYSTEM_READ_TRANSACTIONS_BERLIN_GROUP_VIEW_ID,
None
)
}
}
@ -767,7 +775,8 @@ object Consent extends MdcLoggable {
ConsentView(
bank_id = bankAccount._1.map(_.bankId.value).getOrElse(""),
account_id = bankAccount._1.map(_.accountId.value).openOrThrowException(error),
view_id = Constant.SYSTEM_READ_ACCOUNTS_BERLIN_GROUP_VIEW_ID
view_id = Constant.SYSTEM_READ_ACCOUNTS_BERLIN_GROUP_VIEW_ID,
None
)
}
}
@ -778,7 +787,8 @@ object Consent extends MdcLoggable {
ConsentView(
bank_id = bankAccount._1.map(_.bankId.value).getOrElse(""),
account_id = bankAccount._1.map(_.accountId.value).openOrThrowException(error),
view_id = Constant.SYSTEM_READ_BALANCES_BERLIN_GROUP_VIEW_ID
view_id = Constant.SYSTEM_READ_BALANCES_BERLIN_GROUP_VIEW_ID,
None
)
}
}
@ -789,7 +799,8 @@ object Consent extends MdcLoggable {
ConsentView(
bank_id = bankAccount._1.map(_.bankId.value).getOrElse(""),
account_id = bankAccount._1.map(_.accountId.value).openOrThrowException(error),
view_id = Constant.SYSTEM_READ_TRANSACTIONS_BERLIN_GROUP_VIEW_ID
view_id = Constant.SYSTEM_READ_TRANSACTIONS_BERLIN_GROUP_VIEW_ID,
None
)
}
}
@ -853,7 +864,8 @@ object Consent extends MdcLoggable {
ConsentView(
bank_id = bankId.getOrElse(null),
account_id = accountId,
view_id = permission
view_id = permission,
None
))
}.flatten
} else {
@ -862,7 +874,8 @@ object Consent extends MdcLoggable {
ConsentView(
bank_id = null,
account_id = null,
view_id = permission
view_id = permission,
None
)
}
}

3
obp-api/src/main/scala/code/api/v3_1_0/APIMethods310.scala
View File

@ -3582,7 +3582,8 @@ trait APIMethods310 {
createdConsent.consentId,
consumerId,
consentJson.valid_from,
consentJson.time_to_live.getOrElse(3600)
consentJson.time_to_live.getOrElse(3600),
None
)
_ <- Future(Consents.consentProvider.vend.setJsonWebToken(createdConsent.consentId, consentJWT)) map {
i => connectorEmptyResponse(i, callContext)

4
obp-api/src/main/scala/code/api/v3_1_0/JSONFactory3.1.0.scala
View File

@ -28,7 +28,6 @@ package code.api.v3_1_0
import java.lang
import java.util.Date
import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON
import code.api.util.APIUtil.{stringOptionOrNull, stringOrNull}
import code.api.util.RateLimitingPeriod.LimitCallPeriod
@ -44,6 +43,7 @@ import code.api.v2_1_0.{CounterpartyIdJson, CustomerCreditRatingJSON, ResourceUs
import code.api.v2_2_0._
import code.api.v3_0_0.{AccountRuleJsonV300, CustomerAttributeResponseJsonV300, JSONFactory300, ViewBasicV300, ViewJsonV300}
import code.api.v3_0_0.JSONFactory300.{createAccountRoutingsJSON, createAccountRulesJSON}
import code.api.v5_0_0.HelperInfoJson
import code.consent.MappedConsent
import code.entitlement.Entitlement
import code.loginattempts.BadLoginAttempt
@ -518,7 +518,7 @@ case class MeetingsJsonV310(
meetings: List[MeetingJsonV310]
)
case class PostConsentEntitlementJsonV310(bank_id: String, role_name: String)
case class PostConsentViewJsonV310(bank_id: String, account_id: String, view_id: String)
case class PostConsentViewJsonV310(bank_id: String, account_id: String, view_id: String, helper_info: Option[HelperInfoJson])
trait PostConsentCommonBody{
val everything: Boolean
val views: List[PostConsentViewJsonV310]

68
obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala
View File

@ -739,7 +739,7 @@ trait APIMethods500 {
nameOf(getConsentByConsentRequestId),
"GET",
"/consumer/consent-requests/CONSENT_REQUEST_ID/consents",
"Get Consent By Consent Request Id",
"Get Consent By Consent Request Id via Consumner",
s"""
|
|This endpoint gets the Consent By consent request id.
@ -762,16 +762,44 @@ trait APIMethods500 {
consent <- Future { Consents.consentProvider.vend.getConsentByConsentRequestId(consentRequestId)} map {
unboxFullOrFail(_, callContext, ConsentRequestNotFound)
}
_ <- Helper.booleanToFuture(failMsg = ConsentNotFound, cc = cc.callContext) {
consent.mUserId == cc.userId
_ <- Helper.booleanToFuture(failMsg = ConsentNotFound, failCode = 404, cc = cc.callContext) {
consent.mConsumerId.get == cc.consumer.map(_.consumerId.get).getOrElse("None")
}
(bankId, accountId, viewId, helperInfo) <- NewStyle.function.tryons(failMsg = Oauth2BadJWTException, 400, callContext) {
val jsonWebTokenAsJValue = JwtUtil.getSignedPayloadAsJson(consent.jsonWebToken).map(json.parse(_).extract[ConsentJWT])
val viewsFromJwtToken = jsonWebTokenAsJValue.head.views
//at the moment,we only support VRP consent to show `ConsentAccountAccessJson` in the response. Because the TPP need them for payments.
val isVrpConsent = (viewsFromJwtToken.length == 1 )&& (viewsFromJwtToken.head.bank_id.nonEmpty)&& (viewsFromJwtToken.head.account_id.nonEmpty)&& (viewsFromJwtToken.head.view_id.startsWith("_vrp-"))
if(isVrpConsent){
val bankId = BankId(viewsFromJwtToken.head.bank_id)
val accountId = AccountId(viewsFromJwtToken.head.account_id)
val viewId = ViewId(viewsFromJwtToken.head.view_id)
val helperInfoFromJwtToken = viewsFromJwtToken.head.helper_info
val viewCanGetCounterparty = Views.views.vend.customView(viewId, BankIdAccountId(bankId, accountId)).map(_.canGetCounterparty)
val helperInfo = if(viewCanGetCounterparty==Full(true)) helperInfoFromJwtToken else None
(Some(bankId), Some(accountId), Some(viewId), helperInfo)
}else{
(None, None, None, None)
}
}
} yield {
(
ConsentJsonV500(
consent.consentId,
consent.jsonWebToken,
consent.status,
Some(consent.consentRequestId)
consent.consentId,
consent.jsonWebToken,
consent.status,
Some(consent.consentRequestId),
if (bankId.isDefined && accountId.isDefined && viewId.isDefined) {
Some(ConsentAccountAccessJson(
bank_id = bankId.get.value,
account_id = accountId.get.value,
view_id = viewId.get.value,
helper_info = helperInfo
))
} else {
None
}
),
HttpCode.`200`(cc)
)
@ -936,8 +964,10 @@ trait APIMethods500 {
_ <- Helper.booleanToFuture(ConsentAllowedScaMethods, cc=callContext){
List(StrongCustomerAuthentication.SMS.toString(), StrongCustomerAuthentication.EMAIL.toString(), StrongCustomerAuthentication.IMPLICIT.toString()).exists(_ == scaMethod)
}
// If the payload contains "to_account` , it mean it is a VRP consent.
isVrpConsent = createdConsentRequest.payload.contains("to_account")
(consentRequestJson, isVRPConsentRequest) <-
if(createdConsentRequest.payload.contains("to_account")) {
if(isVrpConsent) {
val failMsg = s"$InvalidJsonFormat The vrp consent request json body should be the $PostVRPConsentRequestJsonV510 "
NewStyle.function.tryons(failMsg, 400, callContext) {
json.parse(createdConsentRequest.payload).extract[code.api.v5_1_0.PostVRPConsentRequestJsonInternalV510]
@ -1123,11 +1153,12 @@ trait APIMethods500 {
)
)
}
postConsentViewJsons <- if(createdConsentRequest.payload.contains("to_account")) {
postConsentViewJsons <- if(isVrpConsent) {
Future.successful(List(PostConsentViewJsonV310(
bankId.value,
accountId.value,
viewId.value
viewId.value,
Some(HelperInfoJson(List(counterpartyId.value)))
)))
}else{
Future.sequence(
@ -1137,7 +1168,8 @@ trait APIMethods500 {
.map(result =>PostConsentViewJsonV310(
result._1.bankId.value,
result._1.accountId.value,
access.view_id
access.view_id,
None,
))
)
)
@ -1198,7 +1230,8 @@ trait APIMethods500 {
createdConsent.consentId,
consumerId,
postConsentBodyCommonJson.valid_from,
postConsentBodyCommonJson.time_to_live.getOrElse(3600)
postConsentBodyCommonJson.time_to_live.getOrElse(3600),
Some(HelperInfoJson(List(counterpartyId.value)))
)
_ <- Future(Consents.consentProvider.vend.setJsonWebToken(createdConsent.consentId, consentJWT)) map {
i => connectorEmptyResponse(i, callContext)
@ -1251,7 +1284,14 @@ trait APIMethods500 {
consentJWT,
mappedConsent.status,
Some(mappedConsent.consentRequestId),
if (isVRPConsentRequest) Some(ConsentAccountAccessJson(bankId.value, accountId.value, viewId.value, HelperInfoJson(List(counterpartyId.value)))) else None
if (isVRPConsentRequest) Some(
ConsentAccountAccessJson(
bankId.value,
accountId.value,
viewId.value,
Some(HelperInfoJson(List(counterpartyId.value))))
)
else None
), HttpCode.`201`(callContext))
}
}
@ -2148,7 +2188,7 @@ trait APIMethods500 {
_ <- NewStyle.function.systemView(ViewId(viewId), cc.callContext)
updatedView <- NewStyle.function.updateSystemView(ViewId(viewId), updateJson.toUpdateViewJson, cc.callContext)
} yield {
(JSONFactory310.createViewJSON(updatedView), HttpCode.`200`(cc.callContext))
(createViewJsonV500(updatedView), HttpCode.`200`(cc.callContext))
}
}
}

13
obp-api/src/main/scala/code/api/v5_0_0/JSONFactory5.0.0.scala
View File

@ -232,18 +232,24 @@ case class PostConsentRequestJsonV500(
time_to_live: Option[Long]
)
case class HelperInfoJson(
counterparty_id:List[String]
counterparty_ids:List[String]
)
case class ConsentAccountAccessJson(
bank_id:String,
account_id:String,
view_id:String,
helper_info: HelperInfoJson
helper_info: Option[HelperInfoJson]
)
case class ConsentJsonV500(consent_id: String, jwt: String, status: String, consent_request_id: Option[String], account_access:Option[ConsentAccountAccessJson] = None)
case class ConsentJsonV500(
consent_id: String,
jwt: String,
status: String,
consent_request_id: Option[String],
account_access:Option[ConsentAccountAccessJson] = None
)
case class CreatePhysicalCardJsonV500(
card_number: String,
@ -819,6 +825,7 @@ object JSONFactory500 {
metadata_view= view.metadataView,
is_public = view.isPublic,
is_system = view.isSystem,
is_firehose = Some(view.isFirehose),
alias = alias,
hide_metadata_if_alias_used = view.hideOtherAccountMetadataIfAlias,
can_add_comment = view.canAddComment,

7
obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala
View File

@ -1675,7 +1675,7 @@ trait APIMethods510 {
nameOf(getConsentByConsentId),
"GET",
"/user/current/consents/CONSENT_ID",
"Get Consent By Consent Id",
"Get Consent By Consent Id via User",
s"""
|
|This endpoint gets the Consent By consent id.
@ -1713,7 +1713,7 @@ trait APIMethods510 {
nameOf(getConsentByConsentIdViaConsumer),
"GET",
"/consumer/current/consents/CONSENT_ID",
"Get Consent By Consent Id",
"Get Consent By Consent Id via Consumer",
s"""
|
|This endpoint gets the Consent By consent id.
@ -2045,7 +2045,8 @@ trait APIMethods510 {
createdConsent.consentId,
consumerId,
consentJson.valid_from,
consentJson.time_to_live.getOrElse(3600)
consentJson.time_to_live.getOrElse(3600),
None,
)
_ <- Future(Consents.consentProvider.vend.setJsonWebToken(createdConsent.consentId, consentJWT)) map {
i => connectorEmptyResponse(i, callContext)

10
obp-api/src/main/scala/code/snippet/VrpConsentCreation.scala
View File

@ -70,12 +70,12 @@ class VrpConsentCreation extends MdcLoggable with RestHelper with APIMethods510
|
|The transfers governed by this consent must respect the following rules:
|
| 1) The grand total amount will not exceed {limit ($currency), (${(jsonAst \ "to_account" \ "limit" \ "max_total_amount").extract[String]})}
| 2) Any single amount will not exceed {limit ($currency), (${(jsonAst \ "to_account" \ "limit" \ "max_single_amount").extract[String]})}
| 3) The maximum amount per month that can be transferred is {limit ($currency), (${(jsonAst \ "to_account" \ "limit" \ "max_monthly_amount").extract[String]})} over {limit (${(jsonAst \ "to_account" \ "limit" \ "max_number_of_monthly_transactions").extract[String]}) transactions.
| 4) The maximum amount per year that can be transferred is {limit ($currency), (${(jsonAst \ "to_account" \ "limit" \ "max_yearly_amount").extract[String]})} over {limit (${(jsonAst \ "to_account" \ "limit" \ "max_number_of_yearly_transactions").extract[String]}) transactions.
| 1) The grand total amount will not exceed $currency ${(jsonAst \ "to_account" \ "limit" \ "max_total_amount").extract[String]}.
| 2) Any single amount will not exceed $currency ${(jsonAst \ "to_account" \ "limit" \ "max_single_amount").extract[String]}.
| 3) The maximum amount per month that can be transferred is $currency ${(jsonAst \ "to_account" \ "limit" \ "max_monthly_amount").extract[String]} over ${(jsonAst \ "to_account" \ "limit" \ "max_number_of_monthly_transactions").extract[String]} transactions.
| 4) The maximum amount per year that can be transferred is $currency ${(jsonAst \ "to_account" \ "limit" \ "max_yearly_amount").extract[String]} over ${(jsonAst \ "to_account" \ "limit" \ "max_number_of_yearly_transactions").extract[String]} transactions.
|
|This consent will start on date {${(jsonAst \ "valid_from").extract[String]}} and be valid for ${DateTimeUtil.formatDuration(ttl)}.
|This consent will start on date ${(jsonAst \ "valid_from").extract[String].replace("T"," ").replace("Z","")} and be valid for ${DateTimeUtil.formatDuration(ttl)}.
|
|I understand that I can revoke this consent at any time.
|""".stripMargin

BIN
obp-api/src/test/resources/frozen_type_meta_data
View File

Binary file not shown.

6
obp-api/src/test/scala/code/api/v3_1_0/ConsentTest.scala
View File

@ -60,7 +60,7 @@ class ConsentTest extends V310ServerSetup {
lazy val bankId = randomBankId
lazy val bankAccount = randomPrivateAccount(bankId)
lazy val entitlements = List(PostConsentEntitlementJsonV310("", CanGetAnyUser.toString()))
lazy val views = List(PostConsentViewJsonV310(bankId, bankAccount.id, Constant.SYSTEM_OWNER_VIEW_ID))
lazy val views = List(PostConsentViewJsonV310(bankId, bankAccount.id, Constant.SYSTEM_OWNER_VIEW_ID, None))
lazy val postConsentEmailJsonV310 = SwaggerDefinitionsJSON.postConsentEmailJsonV310
.copy(entitlements=entitlements)
.copy(consumer_id=Some(testConsumer.consumerId.get))
@ -198,7 +198,7 @@ class ConsentTest extends V310ServerSetup {
// Check we have all views from the consent
val assignedViews = user.views.map(_.list).toSeq.flatten
assignedViews.map(e => PostConsentViewJsonV310(e.bank_id, e.account_id, e.view_id)).distinct should equal(views)
assignedViews.map(e => PostConsentViewJsonV310(e.bank_id, e.account_id, e.view_id, None)).distinct should equal(views)
case false =>
// Due to missing props at the instance the request must fail
@ -277,7 +277,7 @@ class ConsentTest extends V310ServerSetup {
// Check we have all views from the consent
val assignedViews = user.views.map(_.list).toSeq.flatten
assignedViews.map(e => PostConsentViewJsonV310(e.bank_id, e.account_id, e.view_id)).distinct should equal(views)
assignedViews.map(e => PostConsentViewJsonV310(e.bank_id, e.account_id, e.view_id, None)).distinct should equal(views)
case false =>
// Due to missing props at the instance the request must fail

4
obp-api/src/test/scala/code/api/v5_1_0/ConsentObpTest.scala
View File

@ -61,7 +61,7 @@ class ConsentObpTest extends V510ServerSetup {
lazy val bankId = randomBankId
lazy val bankAccount = randomPrivateAccount(bankId)
lazy val entitlements = List(PostConsentEntitlementJsonV310("", CanGetAnyUser.toString()))
lazy val views = List(PostConsentViewJsonV310(bankId, bankAccount.id, Constant.SYSTEM_OWNER_VIEW_ID))
lazy val views = List(PostConsentViewJsonV310(bankId, bankAccount.id, Constant.SYSTEM_OWNER_VIEW_ID, None))
lazy val postConsentEmailJsonV310 = SwaggerDefinitionsJSON.postConsentEmailJsonV310
.copy(entitlements=entitlements)
.copy(consumer_id=Some(testConsumer.consumerId.get))
@ -169,7 +169,7 @@ class ConsentObpTest extends V510ServerSetup {
// Check we have all views from the consent
val assignedViews = user.views.map(_.list).toSeq.flatten
assignedViews.map(e => PostConsentViewJsonV310(e.bank_id, e.account_id, e.view_id)).distinct should equal(views)
assignedViews.map(e => PostConsentViewJsonV310(e.bank_id, e.account_id, e.view_id, None)).distinct should equal(views)
case false =>
// Due to missing props at the instance the request must fail

8
obp-api/src/test/scala/code/api/v5_1_0/VRPConsentRequestTest.scala
View File

@ -215,7 +215,7 @@ class VRPConsentRequestTest extends V510ServerSetup with PropsReset{
val consentRequestBankId = createConsentByRequestResponse.body.extract[ConsentJsonV500].account_access.get.bank_id
val consentRequestAccountId = createConsentByRequestResponse.body.extract[ConsentJsonV500].account_access.get.account_id
val consentRequestViewId = createConsentByRequestResponse.body.extract[ConsentJsonV500].account_access.get.view_id
val consentRequestCounterpartyId = createConsentByRequestResponse.body.extract[ConsentJsonV500].account_access.get.helper_info.counterparty_id
val consentRequestCounterpartyId = createConsentByRequestResponse.body.extract[ConsentJsonV500].account_access.get.helper_info.head.counterparty_ids
val createTransReqRequest = (v4_0_0_Request / "banks" / consentRequestBankId / "accounts" / consentRequestAccountId /
consentRequestViewId / "transaction-request-types" / "COUNTERPARTY" / "transaction-requests").POST
@ -326,7 +326,7 @@ class VRPConsentRequestTest extends V510ServerSetup with PropsReset{
val consentRequestBankId = createConsentByRequestResponse.body.extract[ConsentJsonV500].account_access.get.bank_id
val consentRequestAccountId = createConsentByRequestResponse.body.extract[ConsentJsonV500].account_access.get.account_id
val consentRequestViewId = createConsentByRequestResponse.body.extract[ConsentJsonV500].account_access.get.view_id
val consentRequestCounterpartyId = createConsentByRequestResponse.body.extract[ConsentJsonV500].account_access.get.helper_info.counterparty_id
val consentRequestCounterpartyId = createConsentByRequestResponse.body.extract[ConsentJsonV500].account_access.get.helper_info.head.counterparty_ids
val createTransReqRequest = (v4_0_0_Request / "banks" / consentRequestBankId / "accounts" / consentRequestAccountId /
consentRequestViewId / "transaction-request-types" / "COUNTERPARTY" / "transaction-requests").POST
@ -421,7 +421,7 @@ class VRPConsentRequestTest extends V510ServerSetup with PropsReset{
val consentRequestBankId = createConsentByRequestResponse.body.extract[ConsentJsonV500].account_access.get.bank_id
val consentRequestAccountId = createConsentByRequestResponse.body.extract[ConsentJsonV500].account_access.get.account_id
val consentRequestViewId = createConsentByRequestResponse.body.extract[ConsentJsonV500].account_access.get.view_id
val consentRequestCounterpartyId = createConsentByRequestResponse.body.extract[ConsentJsonV500].account_access.get.helper_info.counterparty_id
val consentRequestCounterpartyId = createConsentByRequestResponse.body.extract[ConsentJsonV500].account_access.get.helper_info.head.counterparty_ids
val createTransReqRequest = (v4_0_0_Request / "banks" / consentRequestBankId / "accounts" / consentRequestAccountId /
consentRequestViewId / "transaction-request-types" / "COUNTERPARTY" / "transaction-requests").POST
@ -509,7 +509,7 @@ class VRPConsentRequestTest extends V510ServerSetup with PropsReset{
val consentRequestBankId = createConsentByRequestResponse.body.extract[ConsentJsonV500].account_access.get.bank_id
val consentRequestAccountId = createConsentByRequestResponse.body.extract[ConsentJsonV500].account_access.get.account_id
val consentRequestViewId = createConsentByRequestResponse.body.extract[ConsentJsonV500].account_access.get.view_id
val consentRequestCounterpartyId = createConsentByRequestResponse.body.extract[ConsentJsonV500].account_access.get.helper_info.counterparty_id
val consentRequestCounterpartyId = createConsentByRequestResponse.body.extract[ConsentJsonV500].account_access.get.helper_info.head.counterparty_ids
val createTransReqRequest = (v4_0_0_Request / "banks" / consentRequestBankId / "accounts" / consentRequestAccountId /
consentRequestViewId / "transaction-request-types" / "COUNTERPARTY" / "transaction-requests").POST