links checked for permissions

oarepo · Nov 28, 2024 · 4e9dbd8 · 4e9dbd8
1 parent d88b0a6
commit 4e9dbd8
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 17 deletions.
diff --git a/build-tests/thesis.yaml b/build-tests/thesis.yaml
@@ -9,7 +9,7 @@ record:
   module:
     qualified: thesis
   permissions:
-    presets: ['authenticated']
+    presets: ['everyone']
   use:
     - invenio
   resource-config:
@@ -21,13 +21,17 @@ record:
         properties:
           title:
             type: fulltext
+    permissions:
+      presets: ['authenticated']
 
     use:
       - invenio_files
 
   draft: {}
 
-  draft-files: {}
+  draft-files:
+    permissions:
+      presets: ['authenticated']
 
 profiles:
   - record

diff --git a/oarepo_model_builder_drafts_files/datatypes/components/draft_file_profile.py b/oarepo_model_builder_drafts_files/datatypes/components/draft_file_profile.py
@@ -61,30 +61,40 @@ def process_links(self, datatype, section: Section, **kwargs):
                     name="files",
                     link_class="ConditionalLink",
                     link_args=[
-                        "cond=is_published_record",
-                        f'if_=RecordLink("{{+api}}{files_url_prefix}files")',
-                        f'else_=RecordLink("{{+api}}{draft_files_url_prefix}files")',
+                        "cond=is_published_record()",
+                        f'if_=RecordLink("{{+api}}{files_url_prefix}files", when=has_permission("list_files"))',
+                        f'else_=RecordLink("{{+api}}{draft_files_url_prefix}files", when=has_permission("list_files"))',
                     ],
                     imports=[
                         Import("invenio_records_resources.services.ConditionalLink"),
                         Import("invenio_records_resources.services.RecordLink"),
-                        Import(
-                            "oarepo_runtime.records.is_published_record"
-                        ),
+                        Import("oarepo_runtime.services.config.is_published_record"),
+                        Import("oarepo_runtime.services.config.has_permission"),
                     ],
                 )
             ),
 
         if datatype.root.profile == "draft_files":
             if "links_search" in section.config:
                 section.config.pop("links_search")
+
+            if "links_search_item" in section.config:
+                section.config.pop("links_search_item")
             # remove normal links and add
             section.config["file_links_list"] = [
                 Link(
                     name="self",
                     link_class="RecordLink",
-                    link_args=[f'"{{+api}}{url_prefix}files"'],
-                    imports=[Import("invenio_records_resources.services.RecordLink")],
+                    link_args=[
+                        f'"{{+api}}{url_prefix}files"',
+                        'when=has_permission_file_service("list_files")',
+                    ],
+                    imports=[
+                        Import("invenio_records_resources.services.RecordLink"),
+                        Import(
+                            "oarepo_runtime.services.config.has_permission_file_service"
+                        ),
+                    ],
                 ),
             ]
 
@@ -98,22 +108,44 @@ def process_links(self, datatype, section: Section, **kwargs):
                 Link(
                     name="self",
                     link_class="FileLink",
-                    link_args=[f'"{{+api}}{url_prefix}files/{{key}}"'],
+                    link_args=[
+                        f'"{{+api}}{url_prefix}files/{{key}}"',
+                        'when=has_permission_file_service("read_files")',
+                    ],
                     imports=[
-                        Import("invenio_records_resources.services.FileLink")
+                        Import("invenio_records_resources.services.FileLink"),
+                        Import(
+                            "oarepo_runtime.services.config.has_permission_file_service"
+                        ),
                     ],  # NOSONAR
                 ),
                 Link(
                     name="content",
                     link_class="FileLink",
-                    link_args=[f'"{{+api}}{url_prefix}files/{{key}}/content"'],
-                    imports=[Import("invenio_records_resources.services.FileLink")],
+                    link_args=[
+                        f'"{{+api}}{url_prefix}files/{{key}}/content"',
+                        'when=has_permission_file_service("get_content_files")',
+                    ],
+                    imports=[
+                        Import("invenio_records_resources.services.FileLink"),
+                        Import(
+                            "oarepo_runtime.services.config.has_permission_file_service"
+                        ),
+                    ],
                 ),
                 Link(
                     name="commit",
                     link_class="FileLink",
-                    link_args=[f'"{{+api}}{url_prefix}files/{{key}}/commit"'],
-                    imports=[Import("invenio_records_resources.services.FileLink")],
+                    link_args=[
+                        f'"{{+api}}{url_prefix}files/{{key}}/commit"',
+                        'when=has_permission_file_service("commit_files")',
+                    ],
+                    imports=[
+                        Import("invenio_records_resources.services.FileLink"),
+                        Import(
+                            "oarepo_runtime.services.config.has_permission_file_service"
+                        ),
+                    ],
                 ),
                 Link(
                     name="preview",

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-model-builder-drafts-files
-version = 4.0.13
+version = 4.0.14
 description =
 authors = Ronald Krist <[email protected]>
 readme = README.md