Skip to content

Commit

Permalink
Replace EntityPermission with ObjectAccessPermission
Browse files Browse the repository at this point in the history
  • Loading branch information
@seakayone
seakayone committed Mar 27, 2024
1 parent 098b851 commit 0aef982
Show file tree
Hide file tree
Showing 16 changed files with 220 additions and 288 deletions.
77 changes: 38 additions & 39 deletions ...n/src/test/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2SpecFullData.scala
View file

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions integration/src/test/scala/org/knora/webapi/messages/util/PermissionUtilADMSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import org.knora.webapi.messages.OntologyConstants
import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionADM
import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionType
import org.knora.webapi.messages.util.PermissionUtilADM
import org.knora.webapi.messages.util.PermissionUtilADM._
import org.knora.webapi.sharedtestdata.SharedTestDataADM
import org.knora.webapi.sharedtestdata.SharedTestDataADM2
import org.knora.webapi.slice.admin.domain.model.ObjectAccessPermission

import pekko.testkit.ImplicitSender

Expand All @@ -25,11 +25,11 @@ class PermissionUtilADMSpec extends CoreSpec with ImplicitSender {
val permissionLiteral =
"RV knora-admin:UnknownUser|V knora-admin:KnownUser|M knora-admin:ProjectMember|CR knora-admin:Creator"

val parsedPermissionLiteral: Map[EntityPermission, Set[IRI]] = Map(
RestrictedViewPermission -> Set(OntologyConstants.KnoraAdmin.UnknownUser),
ViewPermission -> Set(OntologyConstants.KnoraAdmin.KnownUser),
ModifyPermission -> Set(OntologyConstants.KnoraAdmin.ProjectMember),
ChangeRightsPermission -> Set(OntologyConstants.KnoraAdmin.Creator),
val parsedPermissionLiteral: Map[ObjectAccessPermission, Set[IRI]] = Map(
ObjectAccessPermission.RestrictedView -> Set(OntologyConstants.KnoraAdmin.UnknownUser),
ObjectAccessPermission.View -> Set(OntologyConstants.KnoraAdmin.KnownUser),
ObjectAccessPermission.Modify -> Set(OntologyConstants.KnoraAdmin.ProjectMember),
ObjectAccessPermission.ChangeRights -> Set(OntologyConstants.KnoraAdmin.Creator),
)

"PermissionUtil" should {
Expand All @@ -40,7 +40,7 @@ class PermissionUtilADMSpec extends CoreSpec with ImplicitSender {
entityProject = SharedTestDataADM2.incunabulaProjectIri,
entityPermissionLiteral = permissionLiteral,
requestingUser = SharedTestDataADM.incunabulaMemberUser,
) should equal(Some(ModifyPermission)) // modify permission
) should equal(Some(ObjectAccessPermission.Modify)) // modify permission
}

"return user's max permission for a specific resource (incunabula project admin user)" in {
Expand All @@ -49,7 +49,7 @@ class PermissionUtilADMSpec extends CoreSpec with ImplicitSender {
entityProject = SharedTestDataADM2.incunabulaProjectIri,
entityPermissionLiteral = permissionLiteral,
requestingUser = SharedTestDataADM.incunabulaProjectAdminUser,
) should equal(Some(ChangeRightsPermission)) // change rights permission
) should equal(Some(ObjectAccessPermission.ChangeRights)) // change rights permission
}

"return user's max permission for a specific resource (incunabula creator user)" in {
Expand All @@ -58,7 +58,7 @@ class PermissionUtilADMSpec extends CoreSpec with ImplicitSender {
entityProject = SharedTestDataADM2.incunabulaProjectIri,
entityPermissionLiteral = permissionLiteral,
requestingUser = SharedTestDataADM.incunabulaCreatorUser,
) should equal(Some(ChangeRightsPermission)) // change rights permission
) should equal(Some(ObjectAccessPermission.ChangeRights)) // change rights permission
}

"return user's max permission for a specific resource (root user)" in {
Expand All @@ -67,7 +67,7 @@ class PermissionUtilADMSpec extends CoreSpec with ImplicitSender {
entityProject = SharedTestDataADM2.incunabulaProjectIri,
entityPermissionLiteral = permissionLiteral,
requestingUser = SharedTestDataADM.rootUser,
) should equal(Some(ChangeRightsPermission)) // change rights permission
) should equal(Some(ObjectAccessPermission.ChangeRights)) // change rights permission
}

"return user's max permission for a specific resource (normal user)" in {
Expand All @@ -76,7 +76,7 @@ class PermissionUtilADMSpec extends CoreSpec with ImplicitSender {
entityProject = SharedTestDataADM2.incunabulaProjectIri,
entityPermissionLiteral = permissionLiteral,
requestingUser = SharedTestDataADM.normalUser,
) should equal(Some(ViewPermission)) // view permission
) should equal(Some(ObjectAccessPermission.View)) // view permission
}

"return user's max permission for a specific resource (anonymous user)" in {
Expand All @@ -85,7 +85,7 @@ class PermissionUtilADMSpec extends CoreSpec with ImplicitSender {
entityProject = SharedTestDataADM2.incunabulaProjectIri,
entityPermissionLiteral = permissionLiteral,
requestingUser = SharedTestDataADM.anonymousUser,
) should equal(Some(RestrictedViewPermission)) // restricted view permission
) should equal(Some(ObjectAccessPermission.RestrictedView)) // restricted view permission
}

"return user's max permission from assertions for a specific resource" in {
Expand All @@ -99,7 +99,7 @@ class PermissionUtilADMSpec extends CoreSpec with ImplicitSender {
entityIri = "http://rdfh.ch/00014b43f902",
assertions = assertions,
requestingUser = SharedTestDataADM.incunabulaMemberUser,
) should equal(Some(ModifyPermission)) // modify permissions
) should equal(Some(ObjectAccessPermission.Modify)) // modify permissions
}

"return user's max permission on link value" ignore {
Expand All @@ -119,7 +119,7 @@ class PermissionUtilADMSpec extends CoreSpec with ImplicitSender {
PermissionADM.modifyPermission(OntologyConstants.KnoraAdmin.ProjectMember),
PermissionADM.viewPermission(OntologyConstants.KnoraAdmin.KnownUser),
PermissionADM.viewPermission("http://rdfh.ch/groups/customgroup"),
PermissionADM.restrictedViewPermission(OntologyConstants.KnoraAdmin.UnknownUser),
ObjectAccessPermission.View.toPermissionADM(OntologyConstants.KnoraAdmin.UnknownUser),
)

PermissionUtilADM.parsePermissionsWithType(
Expand Down Expand Up @@ -161,17 +161,17 @@ class PermissionUtilADMSpec extends CoreSpec with ImplicitSender {
"remove duplicate permissions" in {

val duplicatedPermissions = Seq(
PermissionADM.restrictedViewPermission("1"),
PermissionADM.restrictedViewPermission("1"),
PermissionADM.restrictedViewPermission("2"),
ObjectAccessPermission.View.toPermissionADM("1"),
ObjectAccessPermission.View.toPermissionADM("1"),
ObjectAccessPermission.View.toPermissionADM("2"),
PermissionADM.changeRightsPermission("2"),
PermissionADM.changeRightsPermission("3"),
PermissionADM.changeRightsPermission("3"),
)

val deduplicatedPermissions = Set(
PermissionADM.restrictedViewPermission("1"),
PermissionADM.restrictedViewPermission("2"),
ObjectAccessPermission.View.toPermissionADM("1"),
ObjectAccessPermission.View.toPermissionADM("2"),
PermissionADM.changeRightsPermission("2"),
PermissionADM.changeRightsPermission("3"),
)
Expand All @@ -184,7 +184,7 @@ class PermissionUtilADMSpec extends CoreSpec with ImplicitSender {

"remove lesser permissions" in {
val withLesserPermissions = Set(
PermissionADM.restrictedViewPermission("1"),
ObjectAccessPermission.View.toPermissionADM("1"),
PermissionADM.viewPermission("1"),
PermissionADM.modifyPermission("2"),
PermissionADM.changeRightsPermission("1"),
Expand Down
Loading

0 comments on commit 0aef982

Please sign in to comment.