Merge branch 'main' into mpro7-patch-3

dasch-swiss · Apr 9, 2024 · 1bb33d3 · 1bb33d3
2 parents 2e6cb97 + 80ca581
commit 1bb33d3
Show file tree

Hide file tree

Showing 27 changed files with 509 additions and 932 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'
 services:
 
   app:
-    image: daschswiss/dsp-app:v11.7.4
+    image: daschswiss/dsp-app:v11.8.0
     ports:
       - "4200:4200"
     networks:

diff --git a/integration/src/test/scala/org/knora/webapi/core/LayersTest.scala b/integration/src/test/scala/org/knora/webapi/core/LayersTest.scala
@@ -88,9 +88,9 @@ object LayersTest {
     ApiRoutes & AdminApiEndpoints & ApiV2Endpoints & AppRouter & AssetPermissionsResponder & Authenticator &
       AuthorizationRestService & CacheServiceRequestMessageHandler & CardinalityHandler & ConstructResponseUtilV2 &
       DspIngestClient & GravsearchTypeInspectionRunner & GroupsResponderADM & GroupsRestService & GroupService &
-      HttpServer & IIIFRequestMessageHandler & InferenceOptimizationService & IriConverter & ListsResponder &
+      HttpServer & IIIFRequestMessageHandler & InferenceOptimizationService & IriConverter & KnoraUserToUserConverter & ListsResponder &
       ListsResponderV2 & MessageRelay & OntologyCache & OntologyHelpers & OntologyInferencer & OntologyRepo &
-      OntologyResponderV2 & PermissionUtilADM & PermissionsResponderADM & PermissionsRestService & ProjectExportService &
+      OntologyResponderV2 & PermissionUtilADM & PermissionsResponder & PermissionsRestService & ProjectExportService &
       ProjectExportStorageService & ProjectImportService & ProjectService & ProjectRestService & QueryTraverser &
       RepositoryUpdater & ResourceUtilV2 & ResourcesResponderV2 & RestCardinalityService & SearchApiRoutes &
       SearchResponderV2 & StandoffResponderV2 & StandoffTagUtilV2 & State & TestClientService & TriplestoreService &
@@ -134,7 +134,7 @@ object LayersTest {
       OntologyRepoLive.layer,
       OntologyResponderV2Live.layer,
       PermissionUtilADMLive.layer,
-      PermissionsResponderADMLive.layer,
+      PermissionsResponder.layer,
       PredicateObjectMapper.layer,
       PredicateRepositoryLive.layer,
       ProjectExportServiceLive.layer,

diff --git a/...nora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADMSpec.scala b/...nora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADMSpec.scala
@@ -12,7 +12,7 @@ import java.util.UUID
 import dsp.errors.BadRequestException
 import dsp.errors.ForbiddenException
 import org.knora.webapi.CoreSpec
-import org.knora.webapi.responders.admin.PermissionsResponderADM
+import org.knora.webapi.responders.admin.PermissionsResponder
 import org.knora.webapi.routing.UnsafeZioRun
 import org.knora.webapi.sharedtestdata.SharedOntologyTestDataADM._
 import org.knora.webapi.sharedtestdata.SharedTestDataADM2._
@@ -40,29 +40,6 @@ class PermissionsMessagesADMSpec extends CoreSpec {
       )
       assert(caught.getMessage === s"Invalid permission IRI: $permissionIri.")
     }
-
-    "return 'BadRequest' if the supplied project IRI for AdministrativePermissionForProjectGroupGetADM is not valid" in {
-      val projectIri = "invalid-project-IRI"
-      val caught = intercept[BadRequestException](
-        AdministrativePermissionForProjectGroupGetADM(
-          projectIri = projectIri,
-          groupIri = KnoraGroupRepo.builtIn.ProjectMember.id.value,
-          requestingUser = SharedTestDataADM.imagesUser01,
-        ),
-      )
-      assert(caught.getMessage === s"Invalid project IRI $projectIri")
-    }
-
-    "return 'ForbiddenException' if the user requesting AdministrativePermissionForProjectGroupGetADM is not system or project Admin" in {
-      val caught = intercept[ForbiddenException](
-        AdministrativePermissionForProjectGroupGetADM(
-          projectIri = SharedTestDataADM.imagesProjectIri,
-          groupIri = KnoraGroupRepo.builtIn.ProjectMember.id.value,
-          requestingUser = SharedTestDataADM.imagesUser02,
-        ),
-      )
-      assert(caught.getMessage === "Administrative permission can only be queried by system and project admin.")
-    }
   }
 
   "Administrative Permission Create Requests" should {
@@ -488,7 +465,7 @@ class PermissionsMessagesADMSpec extends CoreSpec {
         ),
       )
       val exit =
-        UnsafeZioRun.run(ZIO.serviceWithZIO[PermissionsResponderADM](_.verifyHasPermissionsDOAP(hasPermissions)))
+        UnsafeZioRun.run(ZIO.serviceWithZIO[PermissionsResponder](_.verifyHasPermissionsDOAP(hasPermissions)))
       assertFailsWithA[BadRequestException](
         exit,
         "Invalid value for name parameter of hasPermissions: invalid, it should be one of " +
@@ -507,7 +484,7 @@ class PermissionsMessagesADMSpec extends CoreSpec {
       )
 
       val exit =
-        UnsafeZioRun.run(ZIO.serviceWithZIO[PermissionsResponderADM](_.verifyHasPermissionsDOAP(hasPermissions)))
+        UnsafeZioRun.run(ZIO.serviceWithZIO[PermissionsResponder](_.verifyHasPermissionsDOAP(hasPermissions)))
       assertFailsWithA[BadRequestException](
         exit,
         s"Invalid value for permissionCode parameter of hasPermissions: $invalidCode, it should be one of " +
@@ -525,7 +502,7 @@ class PermissionsMessagesADMSpec extends CoreSpec {
       )
 
       val exit =
-        UnsafeZioRun.run(ZIO.serviceWithZIO[PermissionsResponderADM](_.verifyHasPermissionsDOAP(hasPermissions)))
+        UnsafeZioRun.run(ZIO.serviceWithZIO[PermissionsResponder](_.verifyHasPermissionsDOAP(hasPermissions)))
       assertFailsWithA[BadRequestException](
         exit,
         s"Given permission code 2 and permission name CR are not consistent.",
@@ -543,7 +520,7 @@ class PermissionsMessagesADMSpec extends CoreSpec {
       )
 
       val exit =
-        UnsafeZioRun.run(ZIO.serviceWithZIO[PermissionsResponderADM](_.verifyHasPermissionsDOAP(hasPermissions)))
+        UnsafeZioRun.run(ZIO.serviceWithZIO[PermissionsResponder](_.verifyHasPermissionsDOAP(hasPermissions)))
       assertFailsWithA[BadRequestException](
         exit,
         s"One of permission code or permission name must be provided for a default object access permission.",
@@ -560,7 +537,7 @@ class PermissionsMessagesADMSpec extends CoreSpec {
         ),
       )
       val exit =
-        UnsafeZioRun.run(ZIO.serviceWithZIO[PermissionsResponderADM](_.verifyHasPermissionsDOAP(hasPermissions)))
+        UnsafeZioRun.run(ZIO.serviceWithZIO[PermissionsResponder](_.verifyHasPermissionsDOAP(hasPermissions)))
       assertFailsWithA[BadRequestException](
         exit,
         s"additionalInformation of a default object access permission type cannot be empty.",