From 7346ea71f21e23fcfead4ba73969288401f1a607 Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Sat, 11 Nov 2023 20:56:29 +0100
Subject: [PATCH 1/5] Check permission when automatic sample reception is
 enabled

---
 src/bika/lims/utils/analysisrequest.py                          | 2 +-
 .../default/workflows/senaite_sample_workflow/definition.xml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bika/lims/utils/analysisrequest.py b/src/bika/lims/utils/analysisrequest.py
index 9e3a6bd50b..aca850df85 100644
--- a/src/bika/lims/utils/analysisrequest.py
+++ b/src/bika/lims/utils/analysisrequest.py
@@ -142,7 +142,7 @@ def create_analysisrequest(client, request, values, analyses=None,
             changeWorkflowState(ar, SAMPLE_WORKFLOW, "to_be_sampled",
                                 action="to_be_sampled")
         elif setup.getAutoreceiveSamples():
-            receive_sample(ar)
+            receive_sample(ar, check_permission=True)
         else:
             changeWorkflowState(ar, SAMPLE_WORKFLOW, "sample_due",
                                 action="no_sampling_workflow")
diff --git a/src/senaite/core/profiles/default/workflows/senaite_sample_workflow/definition.xml b/src/senaite/core/profiles/default/workflows/senaite_sample_workflow/definition.xml
index 6c5234b1f1..65c6982fab 100644
--- a/src/senaite/core/profiles/default/workflows/senaite_sample_workflow/definition.xml
+++ b/src/senaite/core/profiles/default/workflows/senaite_sample_workflow/definition.xml
@@ -121,7 +121,7 @@
     <permission-map name="senaite.core: Transition: Invalidate" acquired="False"/>
     <permission-map name="senaite.core: Transition: Preserve Sample" acquired="False"/>
     <permission-map name="senaite.core: Transition: Publish Results" acquired="False"/>
-    <permission-map name="senaite.core: Transition: Receive Sample" acquired="False"/>
+    <permission-map name="senaite.core: Transition: Receive Sample" acquired="True"/>
     <permission-map name="senaite.core: Transition: Reject Sample" acquired="False"/>
     <permission-map name="senaite.core: Transition: Retract" acquired="False"/>
     <permission-map name="senaite.core: Transition: Sample Sample" acquired="False"/>

From 15aed3f954f0bf2a83753d1b93a5caa577baef5f Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Sat, 11 Nov 2023 21:01:56 +0100
Subject: [PATCH 2/5] Changelog updated

---
 CHANGES.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 294353fea4..20eea41d72 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,7 @@ Changelog
 2.5.0 (unreleased)
 ------------------
 
+- #2419 Check permission when automatic sample reception is enabled
 - #2416 Fix Template select empties existing Sample Type-, Point- and Profile values in sample add form
 - #2414 Fix missing empty selection in result option choices when no default value is set
 - #2415 Fix sample specs get overwritten on manage analyses save

From 550227e4cc6b541b39a31b2ce427c45c5fb43a74 Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Sat, 11 Nov 2023 21:07:03 +0100
Subject: [PATCH 3/5] Comment added

---
 .../default/workflows/senaite_sample_workflow/definition.xml   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/senaite/core/profiles/default/workflows/senaite_sample_workflow/definition.xml b/src/senaite/core/profiles/default/workflows/senaite_sample_workflow/definition.xml
index 65c6982fab..e112362ddf 100644
--- a/src/senaite/core/profiles/default/workflows/senaite_sample_workflow/definition.xml
+++ b/src/senaite/core/profiles/default/workflows/senaite_sample_workflow/definition.xml
@@ -214,6 +214,9 @@
     <permission-map name="senaite.core: Transition: Preserve Sample" acquired="False"/>
     <permission-map name="senaite.core: Transition: Publish Results" acquired="False"/>
     <permission-map name="senaite.core: Transition: Receive Sample" acquired="False"/>
+    <!-- This is required to enable permission checking during sample creation
+         if automatic sample reception is enabled:
+         https://github.com/senaite/senaite.core/pull/2419 -->
     <permission-map name="senaite.core: Transition: Reject Sample" acquired="True"/>
     <permission-map name="senaite.core: Transition: Retract" acquired="False"/>
     <permission-map name="senaite.core: Transition: Sample Sample" acquired="True"/>

From ac9fd5dd8b4091c9d813dd7e5fb6fd23d0f7c416 Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Sat, 11 Nov 2023 21:14:17 +0100
Subject: [PATCH 4/5] Added upgrade step

---
 src/senaite/core/profiles/default/metadata.xml | 2 +-
 src/senaite/core/upgrade/v02_05_000.zcml       | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/senaite/core/profiles/default/metadata.xml b/src/senaite/core/profiles/default/metadata.xml
index 7ca69dbaeb..f61f429289 100644
--- a/src/senaite/core/profiles/default/metadata.xml
+++ b/src/senaite/core/profiles/default/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>2519</version>
+  <version>2520</version>
   <dependencies>
     <dependency>profile-Products.ATContentTypes:base</dependency>
     <dependency>profile-Products.CMFEditions:CMFEditions</dependency>
diff --git a/src/senaite/core/upgrade/v02_05_000.zcml b/src/senaite/core/upgrade/v02_05_000.zcml
index b7e95d07ac..39704dcfe0 100644
--- a/src/senaite/core/upgrade/v02_05_000.zcml
+++ b/src/senaite/core/upgrade/v02_05_000.zcml
@@ -3,6 +3,14 @@
     xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
     i18n_domain="senaite.core">
 
+  <genericsetup:upgradeStep
+      title="SENAITE.CORE 2.5.0: Import Workflow"
+      description="Update Managed Permissions of Sample Workflow"
+      source="2519"
+      destination="2520"
+      handler=".v02_05_000.import_workflow"
+      profile="senaite.core:default"/>
+
   <genericsetup:upgradeStep
       title="SENAITE.CORE 2.5.0: Reindex control analyses"
       description="Reindex all control analyses to fix stale `getReferenceAnalysesGroupID` index"

From 30b63996ba0f4c7c630b34b3c14c04c66e819bf2 Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Sat, 11 Nov 2023 21:40:19 +0100
Subject: [PATCH 5/5] Replace comment

---
 .../workflows/senaite_sample_workflow/definition.xml        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/senaite/core/profiles/default/workflows/senaite_sample_workflow/definition.xml b/src/senaite/core/profiles/default/workflows/senaite_sample_workflow/definition.xml
index e112362ddf..926d9e56db 100644
--- a/src/senaite/core/profiles/default/workflows/senaite_sample_workflow/definition.xml
+++ b/src/senaite/core/profiles/default/workflows/senaite_sample_workflow/definition.xml
@@ -121,6 +121,9 @@
     <permission-map name="senaite.core: Transition: Invalidate" acquired="False"/>
     <permission-map name="senaite.core: Transition: Preserve Sample" acquired="False"/>
     <permission-map name="senaite.core: Transition: Publish Results" acquired="False"/>
+    <!-- This is required to enable permission checking during sample creation
+         if automatic sample reception is enabled:
+         https://github.com/senaite/senaite.core/pull/2419 -->
     <permission-map name="senaite.core: Transition: Receive Sample" acquired="True"/>
     <permission-map name="senaite.core: Transition: Reject Sample" acquired="False"/>
     <permission-map name="senaite.core: Transition: Retract" acquired="False"/>
@@ -214,9 +217,6 @@
     <permission-map name="senaite.core: Transition: Preserve Sample" acquired="False"/>
     <permission-map name="senaite.core: Transition: Publish Results" acquired="False"/>
     <permission-map name="senaite.core: Transition: Receive Sample" acquired="False"/>
-    <!-- This is required to enable permission checking during sample creation
-         if automatic sample reception is enabled:
-         https://github.com/senaite/senaite.core/pull/2419 -->
     <permission-map name="senaite.core: Transition: Reject Sample" acquired="True"/>
     <permission-map name="senaite.core: Transition: Retract" acquired="False"/>
     <permission-map name="senaite.core: Transition: Sample Sample" acquired="True"/>