Skip to content

[stable24] Show user account on grant loginflow step #32415

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
blizzz merged 2 commits into from
May 16, 2022
Merged

[stable24] Show user account on grant loginflow step #32415

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3526bab
Show user account on grant loginflow step
nickvergessen May 13, 2022
aea73a2
Extend tests
nickvergessen May 16, 2022
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
Prev Previous commit
Extend tests 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen @backportbot-nextcloud
nickvergessen authored and backportbot-nextcloud[bot] committed May 16, 2022
commit aea73a24a5f788527b4fa969fc4a930aa7cb1044
69 changes: 36 additions & 33 deletions tests/Core/Controller/ClientFlowLoginControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,15 +134,15 @@ public function testShowAuthPickerPageNoClientOrOauthRequest() {

public function testShowAuthPickerPageWithOcsHeader() {
$this->request
->expects($this->at(0))
->method('getHeader')
->with('USER_AGENT')
->willReturn('Mac OS X Sync Client');
$this->request
->expects($this->at(1))
->method('getHeader')
->with('OCS-APIREQUEST')
->willReturn('true');
->withConsecutive(
['USER_AGENT'],
['OCS-APIREQUEST']
)
->willReturnMap([
['USER_AGENT', 'Mac OS X Sync Client'],
['OCS-APIREQUEST', 'true'],
]);
$this->random
->expects($this->once())
->method('generate')
Expand Down Expand Up @@ -196,10 +196,15 @@ public function testShowAuthPickerPageWithOcsHeader() {

public function testShowAuthPickerPageWithOauth() {
$this->request
->expects($this->at(0))
->method('getHeader')
->with('USER_AGENT')
->willReturn('Mac OS X Sync Client');
->withConsecutive(
['USER_AGENT'],
['OCS-APIREQUEST']
)
->willReturnMap([
['USER_AGENT', 'Mac OS X Sync Client'],
['OCS-APIREQUEST', 'false'],
]);
$client = new Client();
$client->setName('My external service');
$client->setRedirectUri('https://example.com/redirect.php');
Expand Down Expand Up @@ -413,23 +418,21 @@ public function testGeneratePasswordWithPassword() {
*/
public function testGeneratePasswordWithPasswordForOauthClient($redirectUri, $redirectUrl) {
$this->session
->expects($this->at(0))
->method('get')
->with('client.flow.state.token')
->willReturn('MyStateToken');
$this->session
->expects($this->at(1))
->method('remove')
->with('client.flow.state.token');
$this->session
->expects($this->at(3))
->method('get')
->with('oauth.state')
->willReturn('MyOauthState');
->withConsecutive(
['client.flow.state.token'],
['oauth.state']
)
->willReturnMap([
['client.flow.state.token', 'MyStateToken'],
['oauth.state', 'MyOauthState'],
]);
$this->session
->expects($this->at(4))
->method('remove')
->with('oauth.state');
->withConsecutive(
['client.flow.state.token'],
['oauth.state']
);
$this->session
->expects($this->once())
->method('getId')
Expand All @@ -450,15 +453,15 @@ public function testGeneratePasswordWithPasswordForOauthClient($redirectUri, $re
->with($myToken, 'SessionId')
->willReturn('MyPassword');
$this->random
->expects($this->at(0))
->method('generate')
->with(72)
->willReturn('MyGeneratedToken');
$this->random
->expects($this->at(1))
->method('generate')
->with(128)
->willReturn('MyAccessCode');
->withConsecutive(
[72],
[128]
)
->willReturnMap([
[72, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS, 'MyGeneratedToken'],
[128, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS, 'MyAccessCode'],
]);
$user = $this->createMock(IUser::class);
$user
->expects($this->once())
Expand Down
14 changes: 14 additions & 0 deletions tests/Core/Controller/ClientFlowLoginV2ControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
use OCP\IRequest;
use OCP\ISession;
use OCP\IURLGenerator;
use OCP\IUser;
use OCP\IUserSession;
use OCP\Security\ISecureRandom;
use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
Expand All @@ -50,6 +52,8 @@ class ClientFlowLoginV2ControllerTest extends TestCase {
private $urlGenerator;
/** @var ISession|MockObject */
private $session;
/** @var IUserSession|MockObject */
private $userSession;
/** @var ISecureRandom|MockObject */
private $random;
/** @var Defaults|MockObject */
Expand All @@ -66,6 +70,7 @@ protected function setUp(): void {
$this->loginFlowV2Service = $this->createMock(LoginFlowV2Service::class);
$this->urlGenerator = $this->createMock(IURLGenerator::class);
$this->session = $this->createMock(ISession::class);
$this->userSession = $this->createMock(IUserSession::class);
$this->random = $this->createMock(ISecureRandom::class);
$this->defaults = $this->createMock(Defaults::class);
$this->l = $this->createMock(IL10N::class);
Expand All @@ -75,6 +80,7 @@ protected function setUp(): void {
$this->loginFlowV2Service,
$this->urlGenerator,
$this->session,
$this->userSession,
$this->random,
$this->defaults,
'user',
Expand Down Expand Up @@ -224,6 +230,14 @@ public function testGrantPageValid() {
return null;
});

$user = $this->createMock(IUser::class);
$user->method('getUID')
->willReturn('uid');
$user->method('getDisplayName')
->willReturn('display name');
$this->userSession->method('getUser')
->willReturn($user);

$flow = new LoginFlowV2();
$this->loginFlowV2Service->method('getByLoginToken')
->with('loginToken')
Expand Down