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

use canDeleteEntitlementAtAnyBank and canGetEntitlementsForAnyUserAtAnyBank role

Browse Source 
instead of isSuperAdmin for getAllEntitlements and deleteEntitlement endpoints
This commit is contained in:
hongwei 2020-04-01 08:58:24 +02:00
parent d63bb6ac32
commit a25d1217a9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
obp-api/src/main/scala/code/api/v2_0_0/APIMethods200.scala
View File

@ -2070,7 +2070,7 @@ trait APIMethods200 {
""".stripMargin,
emptyObjectJson,
emptyObjectJson,
List(UserNotLoggedIn, UserNotSuperAdmin, EntitlementNotFound, UnknownError),
List(UserNotLoggedIn, UserHasMissingRoles, EntitlementNotFound, UnknownError),
Catalogs(notCore, notPSD2, notOBWG),
List(apiTagRole, apiTagUser, apiTagEntitlement))
@ -2080,7 +2080,7 @@ trait APIMethods200 {
cc =>
for {
u <- cc.user ?~ ErrorMessages.UserNotLoggedIn
_ <- booleanToBox(isSuperAdmin(u.userId)) ?~ UserNotSuperAdmin
_ <- booleanToBox(hasEntitlement("", u.userId, canDeleteEntitlementAtAnyBank), UserHasMissingRoles + CanDeleteEntitlementAtAnyBank)
entitlement <- tryo{Entitlement.entitlement.vend.getEntitlementById(entitlementId)} ?~ EntitlementNotFound
_ <- entitlement.filter(_.userId == userId) ?~ UserDoesNotHaveEntitlement
_ <- Entitlement.entitlement.vend.deleteEntitlement(entitlement)
@ -2115,8 +2115,8 @@ trait APIMethods200 {
cc =>
for {
(Full(u), callContext) <- authenticatedAccess(cc)
_ <- Helper.booleanToFuture(failMsg = UserNotSuperAdmin) {
isSuperAdmin(u.userId)
_ <- Helper.booleanToFuture(failMsg = UserHasMissingRoles + CanGetEntitlementsForAnyUserAtAnyBank) {
hasEntitlement("", u.userId, canGetEntitlementsForAnyUserAtAnyBank)
}
entitlements <- Entitlement.entitlement.vend.getEntitlementsFuture() map {
connectorEmptyResponse(_, callContext)

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

@ -1718,7 +1718,7 @@ trait APIMethods310 {
""".stripMargin,
emptyObjectJson,
entitlementJSONs,
List(UserNotLoggedIn, UserNotSuperAdmin, UnknownError),
List(UserNotLoggedIn, UserHasMissingRoles, UnknownError),
Catalogs(notCore, notPSD2, notOBWG),
List(apiTagRole, apiTagEntitlement, apiTagNewStyle))
@ -1728,8 +1728,8 @@ trait APIMethods310 {
cc =>
for {
(Full(u), callContext) <- authenticatedAccess(cc)
_ <- Helper.booleanToFuture(failMsg = UserNotSuperAdmin) {
isSuperAdmin(u.userId)
_ <- Helper.booleanToFuture(failMsg = UserHasMissingRoles + CanGetEntitlementsForAnyUserAtAnyBank) {
hasEntitlement("", u.userId, canGetEntitlementsForAnyUserAtAnyBank)
}
roleName = APIUtil.getHttpRequestUrlParam(cc.url, "role")
entitlements <- Entitlement.entitlement.vend.getEntitlementsByRoleFuture(roleName) map {