Merge pull request #29685 from nextcloud/backport/29682/stable22

[stable22] Fix missing token update

2 files changed, 4 insertions, 2 deletions

diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
index fa6f14fd3ec..710cba84879 100644
--- a/lib/private/User/Session.php
+++ b/lib/private/User/Session.php
@@ -750,6 +750,7 @@ class Session implements IUserSession, Emitter {
 			}
 
 			$dbToken->setLastCheck($now);
+			$this->tokenProvider->updateToken($dbToken);
 			return true;
 		}
 
@@ -767,6 +768,7 @@ class Session implements IUserSession, Emitter {
 		}
 
 		$dbToken->setLastCheck($now);
+		$this->tokenProvider->updateToken($dbToken);
 		return true;
 	}
 
diff --git a/tests/lib/User/SessionTest.php b/tests/lib/User/SessionTest.php
index 8f72ba06b92..334c3d9065f 100644
--- a/tests/lib/User/SessionTest.php
+++ b/tests/lib/User/SessionTest.php
@@ -1264,7 +1264,7 @@ class SessionTest extends \Test\TestCase {
 		$mapper->expects($this->any())
 			->method('getToken')
 			->willReturn($token);
-		$mapper->expects($this->once())
+		$mapper->expects($this->exactly(2))
 			->method('update');
 		$request
 			->expects($this->any())
@@ -1314,7 +1314,7 @@ class SessionTest extends \Test\TestCase {
 		$mapper->expects($this->any())
 			->method('getToken')
 			->willReturn($token);
-		$mapper->expects($this->never())
+		$mapper->expects($this->once())
 			->method('update');
 		$request
 			->expects($this->any())