diff options
author | Morris Jobke <hey@morrisjobke.de> | 2017-11-08 22:35:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-08 22:35:19 +0100 |
commit | a90db1d32592f2d6e55e5a57f64e959bf76fdfe4 (patch) | |
tree | c72efe950ee6905fd14a42daf073259c0f29c7a8 | |
parent | 7e92bcdbb487ae473cd89bd127fdb2386abdd4b7 (diff) | |
parent | fa380c0b530d90f91b8708199f78701be71a411e (diff) | |
download | nextcloud-server-a90db1d32592f2d6e55e5a57f64e959bf76fdfe4.tar.gz nextcloud-server-a90db1d32592f2d6e55e5a57f64e959bf76fdfe4.zip |
Merge pull request #7114 from nextcloud/12-7110
[stable12] 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 5767c9e1c62..742bc972a32 100644 --- a/core/Controller/ClientFlowLoginController.php +++ b/core/Controller/ClientFlowLoginController.php @@ -223,7 +223,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')); } |