mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6386 from nextcloud/12-6247 

[stable12] Fix undefined index oauthState
This commit is contained in:
Morris Jobke 2017-09-07 09:32:45 +02:00 committed by GitHub
parent 9071f60605 04583a7587
commit 7c3148f1aa
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/Controller/ClientFlowLoginController.php
View File

@ -193,6 +193,7 @@ class ClientFlowLoginController extends Controller {
'urlGenerator' => $this->urlGenerator, 'urlGenerator' => $this->urlGenerator,
'stateToken' => $stateToken, 'stateToken' => $stateToken,
'serverHost' => $this->request->getServerHost(), 'serverHost' => $this->request->getServerHost(),
'oauthState' => $this->session->get('oauth.state'),
], ],
'guest' 'guest'
); );

12
tests/Core/Controller/ClientFlowLoginControllerTest.php
View File

@ -149,6 +149,11 @@ class ClientFlowLoginControllerTest extends TestCase {
->expects($this->once()) ->expects($this->once())
->method('set') ->method('set')
->with('client.flow.state.token', 'StateToken'); ->with('client.flow.state.token', 'StateToken');
$this->session
->expects($this->once())
->method('get')
->with('oauth.state')
->willReturn('OauthStateToken');
$this->defaults $this->defaults
->expects($this->once()) ->expects($this->once())
->method('getName') ->method('getName')
@ -168,6 +173,7 @@ class ClientFlowLoginControllerTest extends TestCase {
'urlGenerator' => $this->urlGenerator, 'urlGenerator' => $this->urlGenerator,
'stateToken' => 'StateToken', 'stateToken' => 'StateToken',
'serverHost' => 'example.com', 'serverHost' => 'example.com',
'oauthState' => 'OauthStateToken',
], ],
'guest' 'guest'
); );
@ -199,6 +205,11 @@ class ClientFlowLoginControllerTest extends TestCase {
->expects($this->once()) ->expects($this->once())
->method('set') ->method('set')
->with('client.flow.state.token', 'StateToken'); ->with('client.flow.state.token', 'StateToken');
$this->session
->expects($this->once())
->method('get')
->with('oauth.state')
->willReturn('OauthStateToken');
$this->defaults $this->defaults
->expects($this->once()) ->expects($this->once())
->method('getName') ->method('getName')
@ -218,6 +229,7 @@ class ClientFlowLoginControllerTest extends TestCase {
'urlGenerator' => $this->urlGenerator, 'urlGenerator' => $this->urlGenerator,
'stateToken' => 'StateToken', 'stateToken' => 'StateToken',
'serverHost' => 'example.com', 'serverHost' => 'example.com',
'oauthState' => 'OauthStateToken',
], ],
'guest' 'guest'
); );