diff options
author | Lukas Reschke <lukas@statuscode.ch> | 2017-11-08 17:45:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-08 17:45:38 +0100 |
commit | d948626736e65051dfe1affc562710bfedf2eb4a (patch) | |
tree | 4397afed9a88211cba05a2ab853bb704f81c393b | |
parent | 5651fdf10c81b279e2d89643e0a1b3bcefe4e18b (diff) | |
parent | cd1bfea8c4846dd510409ea9025dc1f67b447b76 (diff) | |
download | nextcloud-server-d948626736e65051dfe1affc562710bfedf2eb4a.tar.gz nextcloud-server-d948626736e65051dfe1affc562710bfedf2eb4a.zip |
Merge pull request #7110 from nextcloud/fix-flow-redirect
Theming: theme flow redirection page
-rw-r--r-- | core/Controller/ClientFlowLoginController.php | 2 | ||||
-rw-r--r-- | core/templates/loginflow/redirect.php | 2 | ||||
-rw-r--r-- | tests/Core/Controller/ClientFlowLoginControllerTest.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/Controller/ClientFlowLoginController.php b/core/Controller/ClientFlowLoginController.php index e56a02ca704..81ba8009b24 100644 --- a/core/Controller/ClientFlowLoginController.php +++ b/core/Controller/ClientFlowLoginController.php @@ -228,7 +228,7 @@ class ClientFlowLoginController extends Controller { 'clientIdentifier' => $clientIdentifier, 'oauthState' => $this->session->get('oauth.state'), ], - 'empty' + 'guest' ); } diff --git a/core/templates/loginflow/redirect.php b/core/templates/loginflow/redirect.php index 1c6e105b88d..8bad9760fda 100644 --- a/core/templates/loginflow/redirect.php +++ b/core/templates/loginflow/redirect.php @@ -27,7 +27,7 @@ $urlGenerator = $_['urlGenerator']; ?> <div class="picker-window"> - <p class="info"><?php p($l->t('Redirecting …')) ?></p> + <p><?php p($l->t('Redirecting …')) ?></p> </div> <form method="POST" action="<?php p($urlGenerator->linkToRouteAbsolute('core.ClientFlowLogin.generateAppPassword')) ?>"> diff --git a/tests/Core/Controller/ClientFlowLoginControllerTest.php b/tests/Core/Controller/ClientFlowLoginControllerTest.php index 89253f13038..99388e2c441 100644 --- a/tests/Core/Controller/ClientFlowLoginControllerTest.php +++ b/tests/Core/Controller/ClientFlowLoginControllerTest.php @@ -295,7 +295,7 @@ class ClientFlowLoginControllerTest extends TestCase { 'clientIdentifier' => 'Identifier', 'oauthState' => 'MyOauthStateToken', ], - 'empty' + 'guest' ); $this->assertEquals($expected, $this->clientFlowLoginController->redirectPage('MyStateToken', 'Identifier')); } |