diff --git a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala index a93e43704..abd37e0c2 100644 --- a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala +++ b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala @@ -4656,7 +4656,7 @@ object SwaggerDefinitionsJSON { bank_id = bankIdExample.value ) - lazy val canGetCustomersJson = ApiRole.canGetCustomers + lazy val canGetCustomersJson = ApiRole.canGetCustomersAtOneBank lazy val cardAttributeCommons = CardAttributeCommons( bankId = Some(BankId(bankIdExample.value)), diff --git a/obp-api/src/main/scala/code/api/util/ApiRole.scala b/obp-api/src/main/scala/code/api/util/ApiRole.scala index 51113079d..d4ffcea4a 100644 --- a/obp-api/src/main/scala/code/api/util/ApiRole.scala +++ b/obp-api/src/main/scala/code/api/util/ApiRole.scala @@ -84,14 +84,14 @@ object ApiRole extends MdcLoggable{ case class CanSearchMetrics(requiresBankId: Boolean = false) extends ApiRole lazy val canSearchMetrics = CanSearchMetrics() - case class CanGetCustomersAtAnyBank(requiresBankId: Boolean = false) extends ApiRole - lazy val canGetCustomersAtAnyBank = CanGetCustomersAtAnyBank() + case class CanGetCustomersAtAllBanks(requiresBankId: Boolean = false) extends ApiRole + lazy val canGetCustomersAtAllBanks = CanGetCustomersAtAllBanks() case class CanGetCustomersMinimalAtAnyBank(requiresBankId: Boolean = false) extends ApiRole lazy val canGetCustomersMinimalAtAnyBank = CanGetCustomersMinimalAtAnyBank() - case class CanGetCustomers(requiresBankId: Boolean = true) extends ApiRole - lazy val canGetCustomers = CanGetCustomers() + case class CanGetCustomersAtOneBank(requiresBankId: Boolean = true) extends ApiRole + lazy val canGetCustomersAtOneBank = CanGetCustomersAtOneBank() case class CanGetCustomersMinimal(requiresBankId: Boolean = true) extends ApiRole lazy val canGetCustomersMinimal = CanGetCustomersMinimal() diff --git a/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala b/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala index 5353a9a5a..63d38d1d6 100644 --- a/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala +++ b/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala @@ -6857,7 +6857,7 @@ trait APIMethods400 extends MdcLoggable { UnknownError ), List(apiTagCustomer, apiTagUser), - Some(List(canGetCustomersAtAnyBank)) + Some(List(canGetCustomersAtAllBanks)) ) lazy val getCustomersAtAnyBank: OBPEndpoint = { case "customers" :: Nil JsonGet _ => { cc => diff --git a/obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala b/obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala index f985b2402..5447e8379 100644 --- a/obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala +++ b/obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala @@ -1609,7 +1609,7 @@ trait APIMethods500 { UnknownError ), List(apiTagCustomer, apiTagUser), - Some(List(canGetCustomers)) + Some(List(canGetCustomersAtOneBank)) ) lazy val getCustomersAtOneBank : OBPEndpoint = { diff --git a/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala b/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala index 7cbd553a8..03cecdc6d 100644 --- a/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala +++ b/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala @@ -1129,7 +1129,7 @@ trait APIMethods600 { UnknownError ), List(apiTagCustomer, apiTagUser), - Some(List(canGetCustomers)) + Some(List(canGetCustomersAtOneBank)) ) lazy val getCustomersAtOneBank : OBPEndpoint = { diff --git a/obp-api/src/test/scala/code/api/v4_0_0/CustomerTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/CustomerTest.scala index 93df91f6a..87a46eb25 100644 --- a/obp-api/src/test/scala/code/api/v4_0_0/CustomerTest.scala +++ b/obp-api/src/test/scala/code/api/v4_0_0/CustomerTest.scala @@ -91,14 +91,14 @@ class CustomerTest extends V400ServerSetup with PropsReset{ val response = makeGetRequest(request) Then("We should get a 403") response.code should equal(403) - val errorMsg = UserHasMissingRoles + canGetCustomersAtAnyBank + val errorMsg = UserHasMissingRoles + canGetCustomersAtAllBanks And("error should be " + errorMsg) val errorMessage = response.body.extract[ErrorMessage].message errorMessage contains (UserHasMissingRoles) should be (true) - errorMessage contains (canGetCustomersAtAnyBank.toString()) should be (true) + errorMessage contains (canGetCustomersAtAllBanks.toString()) should be (true) } scenario("We will call the endpoint with a user credentials and a proper role", ApiEndpoint1, VersionOfApi) { - Entitlement.entitlement.vend.addEntitlement("", resourceUser1.userId, CanGetCustomersAtAnyBank.toString) + Entitlement.entitlement.vend.addEntitlement("", resourceUser1.userId, CanGetCustomersAtAllBanks.toString) When(s"We make a request $VersionOfApi") val request = (v4_0_0_Request / "customers").GET <@(user1) val response = makeGetRequest(request)