diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-11-29 09:54:36 +0100 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-11-29 10:27:22 +0100 |
| commit | 5e4990faddfd05a1f368e4d6d6070a9d1ff55dfc (patch) | |
| tree | 5a8a328f2a898692ced1fc8b9860f3400c429ff6 /core/templates | |
| parent | cba5ccfbaf9f0bc29c8a3807377b7422423203bb (diff) | |
| download | nextcloud-server-5e4990faddfd05a1f368e4d6d6070a9d1ff55dfc.tar.gz nextcloud-server-5e4990faddfd05a1f368e4d6d6070a9d1ff55dfc.zip | |
Remove redirect page
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/loginflow/grant.php | 15 | ||||
| -rw-r--r-- | core/templates/loginflow/redirect.php | 31 |
2 files changed, 11 insertions, 35 deletions
diff --git a/core/templates/loginflow/grant.php b/core/templates/loginflow/grant.php index a03b31f762c..017bb1f23cf 100644 --- a/core/templates/loginflow/grant.php +++ b/core/templates/loginflow/grant.php @@ -19,7 +19,7 @@ * */ -script('core', 'login/authpicker'); +script('core', 'login/grant'); style('core', 'login/authpicker'); /** @var array $_ */ @@ -39,8 +39,15 @@ $urlGenerator = $_['urlGenerator']; <br/> <p id="redirect-link"> - <a href="<?php p($urlGenerator->linkToRouteAbsolute('core.ClientFlowLogin.redirectPage', ['stateToken' => $_['stateToken'], 'clientIdentifier' => $_['clientIdentifier'], 'oauthState' => $_['oauthState']])) ?>"> - <input type="submit" class="login primary icon-confirm-white" value="<?php p($l->t('Grant access')) ?>"> - </a> + <form method="POST" action="<?php p($urlGenerator->linkToRouteAbsolute('core.ClientFlowLogin.generateAppPassword')) ?>"> + <input type="hidden" name="clientIdentifier" value="<?php p($_['clientIdentifier']) ?>" /> + <input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" /> + <input type="hidden" name="stateToken" value="<?php p($_['stateToken']) ?>" /> + <input type="hidden" name="oauthState" value="<?php p($_['oauthState']) ?>" /> + <div id="submit-wrapper"> + <input type="submit" id="submit" class="login primary" title="" value="<?php p($l->t('Grant access')); ?>" /> + <div class="submit-icon icon-confirm-white"></div> + </div> + </form> </p> </div> diff --git a/core/templates/loginflow/redirect.php b/core/templates/loginflow/redirect.php deleted file mode 100644 index 200decfbedb..00000000000 --- a/core/templates/loginflow/redirect.php +++ /dev/null @@ -1,31 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch> - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -script('core', 'login/redirect'); -style('core', 'login/authpicker'); - -/** @var array $_ */ -/** @var \OCP\IURLGenerator $urlGenerator */ -$urlGenerator = $_['urlGenerator']; -?> - -<div class="picker-window"> - <p><?php p($l->t('Redirecting …')) ?></p> -</div> |