Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2018-11-01 01:06:08 +0300
committerRoeland Jago Douma <roeland@famdouma.nl>2018-11-01 13:45:35 +0300
commit92582a350d295f123d08f16f09e06baa4bc4733c (patch)
treedf9b50095f94a55a99c8936db9a5f48d260de83b /tests
parent15ef354acec82b5d95642cfda95224ed34ffc8d0 (diff)
Use the proper server for the apptoken flow login
If a user can't authenticate normally (because they have 2FA that is not available on their devices for example). The redirect that is generated should be of the proper format. This means 1. Include the protocol 2. Include the possible subfolder Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'tests')
-rw-r--r--tests/Core/Controller/ClientFlowLoginControllerTest.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/Core/Controller/ClientFlowLoginControllerTest.php b/tests/Core/Controller/ClientFlowLoginControllerTest.php
index 7fe87df026f..b54897ddc44 100644
--- a/tests/Core/Controller/ClientFlowLoginControllerTest.php
+++ b/tests/Core/Controller/ClientFlowLoginControllerTest.php
@@ -162,6 +162,9 @@ class ClientFlowLoginControllerTest extends TestCase {
->expects($this->once())
->method('getServerHost')
->willReturn('example.com');
+ $this->request
+ ->method('getServerProtocol')
+ ->willReturn('https');
$expected = new TemplateResponse(
'core',
@@ -172,7 +175,7 @@ class ClientFlowLoginControllerTest extends TestCase {
'instanceName' => 'ExampleCloud',
'urlGenerator' => $this->urlGenerator,
'stateToken' => 'StateToken',
- 'serverHost' => 'example.com',
+ 'serverHost' => 'https://example.com',
'oauthState' => 'OauthStateToken',
],
'guest'
@@ -218,6 +221,9 @@ class ClientFlowLoginControllerTest extends TestCase {
->expects($this->once())
->method('getServerHost')
->willReturn('example.com');
+ $this->request
+ ->method('getServerProtocol')
+ ->willReturn('https');
$expected = new TemplateResponse(
'core',
@@ -228,7 +234,7 @@ class ClientFlowLoginControllerTest extends TestCase {
'instanceName' => 'ExampleCloud',
'urlGenerator' => $this->urlGenerator,
'stateToken' => 'StateToken',
- 'serverHost' => 'example.com',
+ 'serverHost' => 'https://example.com',
'oauthState' => 'OauthStateToken',
],
'guest'