From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Fri, 2 Dec 2016 10:16:33 +0000 (+0100)
Subject: don't regenerate Session ID twice, also fixes tests
X-Git-Tag: v12.0.0beta1~153^2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=daf9d235478ceccd484fbb66e445e19a3b2cd09b;p=nextcloud-server.git

don't regenerate Session ID twice, also fixes tests

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---

diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
index dca5ff394ac..9bbf62b5275 100644
--- a/lib/private/User/Session.php
+++ b/lib/private/User/Session.php
@@ -328,10 +328,11 @@ class Session implements IUserSession, Emitter {
 	/**
 	 * @param IUser $user
 	 * @param array $loginDetails
+	 * @param bool $regenerateSessionId
 	 * @return bool
 	 * @throws LoginException
 	 */
-	public function completeLogin(IUser $user, array $loginDetails) {
+	public function completeLogin(IUser $user, array $loginDetails, $regenerateSessionId = true) {
 		if (!$user->isEnabled()) {
 			// disabled users can not log in
 			// injecting l10n does not work - there is a circular dependency between session and \OCP\L10N\IFactory
@@ -339,7 +340,9 @@ class Session implements IUserSession, Emitter {
 			throw new LoginException($message);
 		}
 
-		$this->session->regenerateId();
+		if($regenerateSessionId) {
+			$this->session->regenerateId();
+		}
 
 		$this->setUser($user);
 		$this->setLoginName($loginDetails['loginName']);
@@ -536,7 +539,7 @@ class Session implements IUserSession, Emitter {
 			return false;
 		}
 
-		return $this->completeLogin($user, ['loginName' => $uid, 'password' => $password]);
+		return $this->completeLogin($user, ['loginName' => $uid, 'password' => $password], false);
 	}
 
 	/**
@@ -570,7 +573,7 @@ class Session implements IUserSession, Emitter {
 			return false;
 		}
 
-		return $this->completeLogin($user, ['loginName' => $uid, 'password' => $password, 'token' => $dbToken]);
+		return $this->completeLogin($user, ['loginName' => $uid, 'password' => $password, 'token' => $dbToken], false);
 	}
 
 	/**