The user is set on the login screen if transmitted from the client

owncloud · Jul 31, 2017 · 75e88e6 · 75e88e6
1 parent 5846a0f
commit 75e88e6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/js/login.js b/js/login.js
@@ -21,8 +21,17 @@
 $(document).ready(function(){
 	var $loginMessage = $('#body-login').find('#message');
 	if ($loginMessage.length) {
-		var client = $("data[key='oauth2']").attr('value');
-		var msg = t('oauth2', 'The application "{app}" is requesting access to your account. To authorize it, please log in first.', {app : client});
+		var data = $("data[key='oauth2']");
+		var msg = t('oauth2', 'The application "{app}" is requesting access to your account. To authorize it, please log in first.', {app : data.attr('client')});
 		$loginMessage.parent().append('<div class="warning"><div class="icon-info-white" />'+msg+'</div>');
+		var user = data.attr('user');
+		if (user) {
+			$('#password')
+				.val('')
+				.get(0).focus();
+			$('#user')
+				.val(user)
+				.prop('readonly', true);
+		}
 	}
 });
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -105,7 +105,11 @@ public function boot() {
 			$client = $mapper->findByIdentifier($params['client_id']);
 			\OCP\Util::addScript('oauth2', 'login');
 			\OCP\Util::addStyle('oauth2', 'login');
-			\OCP\Util::addHeader('data', ['key' => 'oauth2', 'value' => $client->getName()]);
+			$data = ['key' => 'oauth2', 'client' => $client->getName()];
+			if (isset($params['user'])) {
+				$data['user'] = $params['user'];
+			}
+			\OCP\Util::addHeader('data', $data);
 		} catch (DoesNotExistException $ex) {
 			// ignore - the given client id is not known
 		}