Skip to content

[stable19] fix #21285 as oneliner #21779

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
rullzer merged 2 commits into from
Jul 9, 2020
Merged

[stable19] fix #21285 as oneliner #21779

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
2f75ba1
Return correct loginname in credentials,
Jun 7, 2020
ae036b4
adapt testGetLoginCredentialsInvalidTokenLoginCredentials() unit test…
Jun 7, 2020
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
2 changes: 1 addition & 1 deletion lib/private/Authentication/LoginCredentials/Store.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public function getLoginCredentials(): ICredentials {

if ($trySession && $this->session->exists('login_credentials')) {
$creds = json_decode($this->session->get('login_credentials'));
return new Credentials($creds->uid, $creds->uid, $creds->password);
return new Credentials($creds->uid, $this->session->get('loginname'), $creds->password);
}

// If we reach this line, an exception was thrown.
Expand Down
11 changes: 6 additions & 5 deletions tests/lib/Authentication/LoginCredentials/StoreTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,8 @@ public function testGetLoginCredentialsInvalidToken() {
}

public function testGetLoginCredentialsInvalidTokenLoginCredentials() {
$uid = 'user987';
$uid = 'id987';
$user = 'user987';
$password = '7389374';

$this->session->expects($this->once())
Expand All @@ -156,11 +157,11 @@ public function testGetLoginCredentialsInvalidTokenLoginCredentials() {
->method('exists')
->with($this->equalTo('login_credentials'))
->willReturn(true);
$this->session->expects($this->once())
$this->session->expects($this->exactly(2))
->method('get')
->with($this->equalTo('login_credentials'))
->willReturn('{"run":true,"uid":"user987","password":"7389374"}');
$expected = new Credentials('user987', 'user987', '7389374');
->withConsecutive(['login_credentials'], ['loginname'])
->willReturnOnConsecutiveCalls('{"run":true,"uid":"id987","password":"7389374"}', $user);
$expected = new Credentials($uid, $user, $password);

$actual = $this->store->getLoginCredentials();

Expand Down