From 7c2d22a5490b38bbbe124aa569bc9c42d20a2550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20H=C3=A4rter?= <sha@rother-oss.com>
Date: Mon, 30 Sep 2024 09:06:29 +0200
Subject: [PATCH 1/3] Issue #3559: Set owner in AgentTicketQuickClose before
 unlocking ticket.

---
 Kernel/Modules/AgentTicketQuickClose.pm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Kernel/Modules/AgentTicketQuickClose.pm b/Kernel/Modules/AgentTicketQuickClose.pm
index 651db9c4d2..7621e8f51a 100644
--- a/Kernel/Modules/AgentTicketQuickClose.pm
+++ b/Kernel/Modules/AgentTicketQuickClose.pm
@@ -135,6 +135,14 @@ sub _SetState {
 
     return if !$Success;
 
+    if ( $Param{Config}{RequiredLock} ) {
+        $TicketObject->TicketOwnerSet(
+            TicketID  => $Self->{TicketID},
+            UserID    => $Self->{UserID},
+            NewUserID => $Self->{UserID},
+        );
+    }
+
     $TicketObject->TicketLockSet(
         TicketID => $Self->{TicketID},
         Lock     => 'unlock',

From 56ca9cc51e92a756f2269be33620b7d5d0eaf1ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20H=C3=A4rter?= <sha@rother-oss.com>
Date: Mon, 30 Sep 2024 09:14:43 +0200
Subject: [PATCH 2/3] Issue #3559: Shifted OwnerSet above StateSet.

---
 Kernel/Modules/AgentTicketQuickClose.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Kernel/Modules/AgentTicketQuickClose.pm b/Kernel/Modules/AgentTicketQuickClose.pm
index 7621e8f51a..b223897dbc 100644
--- a/Kernel/Modules/AgentTicketQuickClose.pm
+++ b/Kernel/Modules/AgentTicketQuickClose.pm
@@ -127,14 +127,6 @@ sub _SetState {
 
     return if !$State;
 
-    my $Success = $TicketObject->TicketStateSet(
-        State    => $State,
-        TicketID => $Self->{TicketID},
-        UserID   => $Self->{UserID},
-    );
-
-    return if !$Success;
-
     if ( $Param{Config}{RequiredLock} ) {
         $TicketObject->TicketOwnerSet(
             TicketID  => $Self->{TicketID},
@@ -143,6 +135,14 @@ sub _SetState {
         );
     }
 
+    my $Success = $TicketObject->TicketStateSet(
+        State    => $State,
+        TicketID => $Self->{TicketID},
+        UserID   => $Self->{UserID},
+    );
+
+    return if !$Success;
+
     $TicketObject->TicketLockSet(
         TicketID => $Self->{TicketID},
         Lock     => 'unlock',

From 8fc2ab26b015c784c011dff83c8bb1b684a316cd Mon Sep 17 00:00:00 2001
From: Mike Thumes <mit@rother-oss.com>
Date: Mon, 30 Sep 2024 09:52:50 +0200
Subject: [PATCH 3/3] Issue #3440: Logout after pwd change - adapt Selenium
 test

---
 scripts/test/Selenium/Output/Preferences/Customer/Password.t | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/test/Selenium/Output/Preferences/Customer/Password.t b/scripts/test/Selenium/Output/Preferences/Customer/Password.t
index f9613cb6f2..4d637614b8 100644
--- a/scripts/test/Selenium/Output/Preferences/Customer/Password.t
+++ b/scripts/test/Selenium/Output/Preferences/Customer/Password.t
@@ -72,8 +72,8 @@ $Selenium->RunTest(
             $Selenium->find_element( "#Update", 'css' )->VerifiedClick();
 
             # check for correct password update preferences message on screen
-            my $UpdateMessage = "Preferences updated successfully!";
-            $Selenium->content_contains( $UpdateMessage, 'Customer preference password - updated' );
+            my $UpdateMessage = "Session invalid. Please log in again.";
+            $Selenium->content_contains( $UpdateMessage, 'Customer preference password - updated and session invalidated.' );
         };
     }
 );