Merge pull request #4588 from nextcloud/update-redirection-login-flow

Update login flow redirection

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

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

tests/Core/Controller/ClientFlowLoginControllerTest.php

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