From de5fea4a007e3c668a4f7ce24625118b3dc17fbe Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Tue, 12 Oct 2021 18:23:27 +0200 Subject: fix login_credentials->password in session when loging in with apache Signed-off-by: Julien Veyssier --- lib/private/legacy/OC_User.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/private/legacy/OC_User.php b/lib/private/legacy/OC_User.php index 848f460dac5..96c8d1ec332 100644 --- a/lib/private/legacy/OC_User.php +++ b/lib/private/legacy/OC_User.php @@ -190,7 +190,7 @@ class OC_User { 'post_login', [ 'uid' => $uid, - 'password' => '', + 'password' => null, 'isTokenLogin' => false, ] ); -- cgit v1.2.3 From 0d2c2ab62996ccbeed4d03383980a841c8473b13 Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Wed, 13 Oct 2021 12:37:34 +0200 Subject: allow null password in UserLoggedInEvent Signed-off-by: Julien Veyssier --- lib/private/legacy/OC_User.php | 2 +- lib/public/User/Events/UserLoggedInEvent.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/private/legacy/OC_User.php b/lib/private/legacy/OC_User.php index 96c8d1ec332..27c4f6b2857 100644 --- a/lib/private/legacy/OC_User.php +++ b/lib/private/legacy/OC_User.php @@ -199,7 +199,7 @@ class OC_User { $dispatcher->dispatchTyped(new UserLoggedInEvent( \OC::$server->get(IUserManager::class)->get($uid), $uid, - '', + null, false) ); diff --git a/lib/public/User/Events/UserLoggedInEvent.php b/lib/public/User/Events/UserLoggedInEvent.php index b9b36544231..b1a46b9570d 100644 --- a/lib/public/User/Events/UserLoggedInEvent.php +++ b/lib/public/User/Events/UserLoggedInEvent.php @@ -37,7 +37,7 @@ class UserLoggedInEvent extends Event { /** @var IUser */ private $user; - /** @var string */ + /** @var string|null */ private $password; /** @var bool */ @@ -49,7 +49,7 @@ class UserLoggedInEvent extends Event { /** * @since 18.0.0 */ - public function __construct(IUser $user, string $loginName, string $password, bool $isTokenLogin) { + public function __construct(IUser $user, string $loginName, ?string $password, bool $isTokenLogin) { parent::__construct(); $this->user = $user; $this->password = $password; @@ -74,7 +74,7 @@ class UserLoggedInEvent extends Event { /** * @since 18.0.0 */ - public function getPassword(): string { + public function getPassword(): ?string { return $this->password; } -- cgit v1.2.3