Add notice to the login screen to tell the user that an application w…

appinfo/app.php

@@ -20,4 +20,4 @@
 use OCA\OAuth2\AppInfo\Application;
 
 $app = new Application();
-$app->getContainer()->query('UserHooks')->register();
+$app->boot();

css/login.css

@@ -0,0 +1,3 @@
+#body-login .icon-info-white {
+	display: inline;
+}

js/login.js

@@ -0,0 +1,28 @@
+/**
+ * @author Thomas Müller <[email protected]>
+ *
+ * @copyright Copyright (c) 2017, ownCloud GmbH
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+$(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});
+		$loginMessage.parent().append('<div class="warning"><div class="icon-info-white" />'+msg+'</div>');
+	}
+});

lib/AppInfo/Application.php

@@ -20,9 +20,12 @@
 namespace OCA\OAuth2\AppInfo;
 
 use OCA\OAuth2\AuthModule;
+use OCA\OAuth2\Db\Client;
+use OCA\OAuth2\Db\ClientMapper;
 use OCA\OAuth2\Hooks\UserHooks;
 use OCA\OAuth2\Sabre\OAuth2;
 use OCP\AppFramework\App;
+use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\SabrePluginEvent;
 use Sabre\DAV\Auth\Plugin;
 
@@ -78,4 +81,33 @@ public function __construct(array $urlParams = array()) {
 		});
 	}
 
+	public function boot() {
+		$this->getContainer()->query('UserHooks')->register();
+		$request = $this->getContainer()->getServer()->getRequest();
+		$redirectUrl = $request->getParam('redirect_url');
+		if ($redirectUrl === null) {
+			return;
+		}
+
+		$urlParts = parse_url(urldecode($redirectUrl));
+		if (strpos($urlParts['path'], 'apps/oauth2/authorize') === false) {
+			return;
+		}
+		$params = [];
+		parse_str($urlParts['query'], $params);
+		if (!isset($params['client_id'])) {
+			return;
+		}
+		/** @var ClientMapper $mapper */
+		$mapper = \OC::$server->query(ClientMapper::class);
+		/** @var Client $client */
+		try {
+			$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()]);
+		} catch (DoesNotExistException $ex) {
+			// ignore - the given client id is not known
+		}
+	}
 }