From 1d23ed3afc4700f3af01984ef0c39db8e49da309 Mon Sep 17 00:00:00 2001
From: Zoltan Boraros <zoltan.boraros@shiny.house>
Date: Tue, 16 Mar 2021 12:19:45 +0100
Subject: [PATCH] Add automatic internal user confirmation

At this point we want to maintain backwards compatibility
and confirm every user. Once we start sending activation
links to the selected groups of users, we'll exclude
this groups from the automatic user confirmation.

remp/crm#1741
---
 .../Repositories/UserEmailConfirmationsRepository.php  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/model/Repositories/UserEmailConfirmationsRepository.php b/src/model/Repositories/UserEmailConfirmationsRepository.php
index 1faed46..4937e4b 100644
--- a/src/model/Repositories/UserEmailConfirmationsRepository.php
+++ b/src/model/Repositories/UserEmailConfirmationsRepository.php
@@ -21,7 +21,7 @@ public function generate(int $userId)
 
     public function confirm(string $token): ?ActiveRow
     {
-        $emailConfirmationRow = $this->getTable()->where('token', $token)->fetch();
+        $emailConfirmationRow = $this->getTable()->where('token', $token)->order('id DESC')->fetch();
         if (!$emailConfirmationRow) {
             return null;
         }
@@ -32,10 +32,14 @@ public function confirm(string $token): ?ActiveRow
 
         return $emailConfirmationRow;
     }
-    
+
     public function getToken(int $userId): ?string
     {
-        $token = $this->getTable()->where('user_id', $userId)->fetchField('token');
+        $token = $this->getTable()
+            ->where('user_id', $userId)
+            ->order('id DESC')
+            ->fetchField('token');
+
         return $token ?: null;
     }
 }