From 2183a1f3e6dddae2f49a0bd9ad30e1670f2d9d15 Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Sun, 27 Nov 2016 14:19:57 +0100
Subject: [PATCH] copy remember-me value when renewing a session token

On renew, a session token is duplicated. For some reason we did
not copy over the remember-me attribute value. Hence, the new token
was deleted too early in the background job and remember-me did
not work properly.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
 .../Authentication/Token/DefaultTokenProvider.php    |  1 +
 .../Token/DefaultTokenProviderTest.php               | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/private/Authentication/Token/DefaultTokenProvider.php b/lib/private/Authentication/Token/DefaultTokenProvider.php
index ec4cc10c269..0e1196a9da4 100644
--- a/lib/private/Authentication/Token/DefaultTokenProvider.php
+++ b/lib/private/Authentication/Token/DefaultTokenProvider.php
@@ -192,6 +192,7 @@ class DefaultTokenProvider implements IProvider {
 		$newToken->setName($token->getName());
 		$newToken->setToken($this->hashToken($sessionId));
 		$newToken->setType(IToken::TEMPORARY_TOKEN);
+		$newToken->setRemember($token->getRemember());
 		$newToken->setLastActivity($this->time->getTime());
 		$this->mapper->insert($newToken);
 	}
diff --git a/tests/lib/Authentication/Token/DefaultTokenProviderTest.php b/tests/lib/Authentication/Token/DefaultTokenProviderTest.php
index 8d92ee405a1..e354fcc7172 100644
--- a/tests/lib/Authentication/Token/DefaultTokenProviderTest.php
+++ b/tests/lib/Authentication/Token/DefaultTokenProviderTest.php
@@ -292,6 +292,10 @@ class DefaultTokenProviderTest extends TestCase {
 			->expects($this->at(3))
 			->method('getName')
 			->willReturn('MyTokenName');
+		$token
+			->expects($this->at(3))
+			->method('getRememberMe')
+			->willReturn(IToken::DO_NOT_REMEMBER);
 		$this->config
 			->expects($this->exactly(2))
 			->method('getSystemValue')
@@ -308,6 +312,7 @@ class DefaultTokenProviderTest extends TestCase {
 		$newToken->setName('MyTokenName');
 		$newToken->setToken(hash('sha512', 'newId' . 'MyInstanceSecret'));
 		$newToken->setType(IToken::TEMPORARY_TOKEN);
+		$newToken->setRemember(IToken::DO_NOT_REMEMBER);
 		$newToken->setLastActivity(1313131);
 		$this->mapper
 			->expects($this->at(1))
@@ -342,6 +347,10 @@ class DefaultTokenProviderTest extends TestCase {
 			->expects($this->at(4))
 			->method('getName')
 			->willReturn('MyTokenName');
+		$token
+			->expects($this->at(3))
+			->method('getRememberMe')
+			->willReturn(IToken::REMEMBER);
 		$this->crypto
 			->expects($this->any(0))
 			->method('decrypt')
@@ -368,12 +377,13 @@ class DefaultTokenProviderTest extends TestCase {
 		$newToken->setName('MyTokenName');
 		$newToken->setToken(hash('sha512', 'newId' . 'MyInstanceSecret'));
 		$newToken->setType(IToken::TEMPORARY_TOKEN);
+		$newToken->setRemember(IToken::REMEMBER);
 		$newToken->setLastActivity(1313131);
 		$newToken->setPassword('EncryptedPassword');
 		$this->mapper
 			->expects($this->at(1))
 			->method('insert')
-			->with($newToken);
+			->with($this->equalTo($newToken));
 
 		$this->tokenProvider->renewSessionToken('oldId', 'newId');
 	}
-- 
2.39.5