mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update login flow redirection 

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
This commit is contained in:
Mario Danic 2017-04-28 23:33:09 +02:00 committed by Lukas Reschke
parent fb3ac32915
commit e4aac15a92
No known key found for this signature in database
GPG Key ID: B9F6980CF6E759B1
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/Controller/ClientFlowLoginController.php
View File

@ -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));
}
}

7
core/js/login/authpicker.js
View File

@ -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());
});
});

4
tests/Core/Controller/ClientFlowLoginControllerTest.php
View File

@ -338,7 +338,7 @@ class ClientFlowLoginControllerTest extends TestCase {
->method('getServerHost')
->willReturn('example.com');
$expected = new Http\RedirectResponse('nc://MyLoginName:MyGeneratedToken@example.com');
$expected = new Http\RedirectResponse('nc://login/server:example.com&user:MyLoginName&password:MyGeneratedToken');
$this->assertEquals($expected, $this->clientFlowLoginController->generateAppPassword('MyStateToken'));
}
@ -402,7 +402,7 @@ class ClientFlowLoginControllerTest extends TestCase {
->method('getServerHost')
->willReturn('example.com');
$expected = new Http\RedirectResponse('nc://MyLoginName:MyGeneratedToken@example.com');
$expected = new Http\RedirectResponse('nc://login/server:example.com&user:MyLoginName&password:MyGeneratedToken');
$this->assertEquals($expected, $this->clientFlowLoginController->generateAppPassword('MyStateToken'));
}
}