summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/private/User/Session.php14
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
index 37d518b6123..06ae8f046b9 100644
--- a/lib/private/User/Session.php
+++ b/lib/private/User/Session.php
@@ -832,8 +832,18 @@ class Session implements IUserSession, Emitter {
return false;
}
- // Set the session variable so we know this is an app password
- $this->session->set('app_password', $token);
+ try {
+ $dbToken = $this->tokenProvider->getToken($token);
+ } catch (InvalidTokenException $e) {
+ // Can't relaly happen but better save than sorry
+ return true;
+ }
+
+ // Remember me tokens are not app_passwords
+ if ($dbToken->getRemember() === IToken::DO_NOT_REMEMBER) {
+ // Set the session variable so we know this is an app password
+ $this->session->set('app_password', $token);
+ }
return true;
}