Skip to content

Fix passwordless app token generation #29187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusknorr merged 2 commits into from
Oct 13, 2021
Merged

Fix passwordless app token generation #29187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de5fea4
fix login_credentials->password in session when loging in with apache
Oct 12, 2021
0d2c2ab
allow null password in UserLoggedInEvent
Oct 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/private/legacy/OC_User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ public static function loginWithApache(\OCP\Authentication\IApacheBackend $backe
'post_login',
[
'uid' => $uid,
'password' => '',
'password' => null,
'isTokenLogin' => false,
]
);
Expand All @@ -199,7 +199,7 @@ public static function loginWithApache(\OCP\Authentication\IApacheBackend $backe
$dispatcher->dispatchTyped(new UserLoggedInEvent(
\OC::$server->get(IUserManager::class)->get($uid),
$uid,
'',
null,
false)
);

Expand Down
6 changes: 3 additions & 3 deletions lib/public/User/Events/UserLoggedInEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class UserLoggedInEvent extends Event {
/** @var IUser */
private $user;

/** @var string */
/** @var string|null */
private $password;

/** @var bool */
Expand All @@ -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;
Expand All @@ -74,7 +74,7 @@ public function getLoginName(): string {
/**
* @since 18.0.0
*/
public function getPassword(): string {
public function getPassword(): ?string {
return $this->password;
}

Expand Down