aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2021-11-12 15:46:59 +0100
committerGitHub <noreply@github.com>2021-11-12 15:46:59 +0100
commitf9f02ef45c5b0a7fa47a3a297e528ac81c720c80 (patch)
tree24d133634a5286335ef805300a2051729612a5a6
parenteb7109b3f41ea367feacbd3252f6d4a743545bb7 (diff)
parent265c2c125c8b4dcaea92c0fa33e0512243a2d404 (diff)
downloadnextcloud-server-f9f02ef45c5b0a7fa47a3a297e528ac81c720c80.tar.gz
nextcloud-server-f9f02ef45c5b0a7fa47a3a297e528ac81c720c80.zip
Merge pull request #29682 from nextcloud/bugfix/29678/fix-missing-token-update
Fix missing token update
-rw-r--r--lib/private/User/Session.php2
-rw-r--r--tests/lib/User/SessionTest.php4
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())