Cancel lost password requests when the user logs in

Resolves #3922

diff --git a/com.woltlab.wcf/eventListener.xml b/com.woltlab.wcf/eventListener.xml
index 3fb2f656d55517ee6bbe00674d5f9e5616d99625..20179f8bdef4714aafef8f809a5cf1c1ff64d25c 100644 (file)
--- a/com.woltlab.wcf/eventListener.xml
+++ b/com.woltlab.wcf/eventListener.xml
@@ -39,5 +39,10 @@
                        <listenerclassname>wcf\system\event\listener\UserLinkHtmlInputNodeProcessorListener</listenerclassname>
                        <environment>all</environment>
                </eventlistener>
+               <eventlistener name="userLoginCancelLostPassword">
+                       <eventclassname>wcf\system\user\authentication\event\UserLoggedIn</eventclassname>
+                       <listenerclassname>wcf\system\event\listener\UserLoginCancelLostPasswordListener</listenerclassname>
+                       <environment>all</environment>
+               </eventlistener>
        </import>
 </data>

diff --git a/wcfsetup/install/files/lib/system/event/listener/UserLoginCancelLostPasswordListener.class.php b/wcfsetup/install/files/lib/system/event/listener/UserLoginCancelLostPasswordListener.class.php
new file mode 100644 (file)
index 0000000..2ce062d
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/event/listener/UserLoginCancelLostPasswordListener.class.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace wcf\system\event\listener;
+
+use wcf\data\user\UserAction;
+use wcf\system\user\authentication\event\UserLoggedIn;
+
+/**
+ * Cancels lost password requests if the user successfully logs in.
+ *
+ * @author  Tim Duesterhus
+ * @copyright   2001-2021 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package WoltLabSuite\Core\System\Event\Listener
+ * @since   5.5
+ */
+final class UserLoginCancelLostPasswordListener
+{
+    public function __invoke(UserLoggedIn $event)
+    {
+        $user = $event->getUser();
+        if (!$user->lostPasswordKey) {
+            return;
+        }
+
+        (new UserAction(
+            [$user],
+            'update',
+            [
+                'data' => [
+                    'lastLostPasswordRequestTime' => 0,
+                    'lostPasswordKey' => '',
+                ],
+            ]
+        ))->executeAction();
+    }
+}