diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-05-04 21:06:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-04 21:06:04 +0200 |
| commit | 8dc2749296b44cc79a1fe50f298f3b2034970da4 (patch) | |
| tree | 5bdb8f578854df2a31280b28806b0ef1e86fab2b /core | |
| parent | c3117f4e5577376c96b4b8e00180708ddefcc521 (diff) | |
| parent | e4aac15a92674e22cbf90cf51c4f29ae7f951130 (diff) | |
| download | nextcloud-server-8dc2749296b44cc79a1fe50f298f3b2034970da4.tar.gz nextcloud-server-8dc2749296b44cc79a1fe50f298f3b2034970da4.zip | |
Merge pull request #4588 from nextcloud/update-redirection-login-flow
Update login flow redirection
Diffstat (limited to 'core')
| -rw-r--r-- | core/Controller/ClientFlowLoginController.php | 2 | ||||
| -rw-r--r-- | core/js/login/authpicker.js | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/core/Controller/ClientFlowLoginController.php b/core/Controller/ClientFlowLoginController.php index ca9c092321a..8c2c121d5b2 100644 --- a/core/Controller/ClientFlowLoginController.php +++ b/core/Controller/ClientFlowLoginController.php @@ -232,7 +232,7 @@ class ClientFlowLoginController extends Controller { IToken::DO_NOT_REMEMBER ); - return new Http\RedirectResponse('nc://' . urlencode($loginName) . ':' . urlencode($token) . '@' . $this->request->getServerHost()); + return new Http\RedirectResponse('nc://login/server:' . $this->request->getServerHost() . '&user:' . urlencode($loginName) . '&password:' . urlencode($token)); } } diff --git a/core/js/login/authpicker.js b/core/js/login/authpicker.js index 666a63da365..2d4bcc33158 100644 --- a/core/js/login/authpicker.js +++ b/core/js/login/authpicker.js @@ -8,8 +8,9 @@ jQuery(document).ready(function() { $('#submit-app-token-login').click(function(e) { e.preventDefault(); - window.location.href = 'nc://' - + encodeURIComponent($('#user').val()) + ':' + encodeURIComponent($('#password').val()) - + '@' + encodeURIComponent($('#serverHost').val()); + window.location.href = 'nc://login/server:' + + encodeURIComponent($('#serverHost').val()) + + "&user:" + encodeURIComponent($('#user').val()) + + "&password:" + encodeURIComponent($('#password').val()); }); }); |