Merge pull request #35318 from nextcloud/bugfix/noid/avoid-conflicting-session-data

skjnldsv · web-flow · commit 7f6e22c30837 · 2022-11-22T10:04:14.000+01:00
diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
@@ -371,6 +371,7 @@ public function completeLogin(IUser $user, array $loginDetails, $regenerateSessi
 
 		if ($regenerateSessionId) {
 			$this->session->regenerateId();
+			$this->session->remove(Auth::DAV_AUTHENTICATED);
 		}
 
 		$this->setUser($user);

Original file line number	Diff line number	Diff line change
`@@ -371,6 +371,7 @@ public function completeLogin(IUser $user, array $loginDetails, $regenerateSessi`
`371`	`371`
`372`	`372`	`if ($regenerateSessionId) {`
`373`	`373`	`$this->session->regenerateId();`
	`374`	`+ $this->session->remove(Auth::DAV_AUTHENTICATED);`
`374`	`375`	`}`
`375`	`376`
`376`	`377`	`$this->setUser($user);`