Add channel ID to user_id in clients table. Added TODO comments about dynamic client registration protocol.

4 files changed, 29 insertions, 15 deletions

diff --git a/Zotlabs/Module/Authorize.php b/Zotlabs/Module/Authorize.php
index f98453fb5..2c0c9248f 100644
--- a/Zotlabs/Module/Authorize.php
+++ b/Zotlabs/Module/Authorize.php
@@ -32,17 +32,23 @@ class Authorize extends \Zotlabs\Web\Controller {
 		if (!local_channel()) {
 			return login();
 		} else {
-			// display an authorization form
-			$app = array('name' => 'Test App', 'icon' => '/images/icons/plugin.png');
+			// TODO: Fully implement the dynamic client registration protocol:
+			// OpenID Connect Dynamic Client Registration 1.0 Client Metadata
+			// http://openid.net/specs/openid-connect-registration-1_0.html
+			$app = array(
+				'name' => (x($_REQUEST, 'client_name') ? urldecode($_REQUEST['client_name']) : 'Unknown App'),
+				'icon' => (x($_REQUEST, 'logo_uri') ? urldecode($_REQUEST['logo_uri']) : '/images/icons/plugin.png'),
+				'url' => (x($_REQUEST, 'client_uri') ? urldecode($_REQUEST['client_uri']) : ''),
+			);
 			$o .= replace_macros(get_markup_template('oauth_authorize.tpl'), array(
 				'$title' => '',
-				'$authorize' => 'Do you authorize the app "' . $app['name'] . '" to access your channel data?',
+				'$authorize' => 'Do you authorize the app <a style="float: none;" href="' . $app['url'] . '">' . $app['name'] . '</a> to access your channel data?',
 				'$app' => $app,
 				'$yes' => t('Allow'),
 				'$no' => t('Deny'),
 				'$client_id' => (x($_REQUEST, 'client_id') ? $_REQUEST['client_id'] : ''),
 				'$redirect_uri' => (x($_REQUEST, 'redirect_uri') ? $_REQUEST['redirect_uri'] : ''),
-				'$state' => (x($_REQUEST, 'state') ? $_REQUEST['state'] : '')
+				'$state' => (x($_REQUEST, 'state') ? $_REQUEST['state'] : ''),
 			));
 			return $o;
 		}
@@ -56,14 +62,15 @@ class Authorize extends \Zotlabs\Web\Controller {
 		$storage = new OAuth2Storage(\DBA::$dba->db);
 		$s = new \Zotlabs\Identity\OAuth2Server($storage);
 
-
+		// TODO: The automatic client registration protocol below should adhere more
+		// closely to "OAuth 2.0 Dynamic Client Registration Protocol" defined
+		// at https://tools.ietf.org/html/rfc7591
+		
 		// If no client_id was provided, generate a new one.
 		if (x($_POST, 'client_id')) {
 			$client_id = $_POST['client_id'];
-			logger('client_id was provided: ' . $client_id);
 		} else {
 			$client_id = $_POST['client_id'] = random_string(16);
-			logger('client_id was not provided. Generated new id: ' . $client_id);
 		}
 		// If no redirect_uri was provided, generate a fake one.
 		if (x($_POST, 'redirect_uri')) {
@@ -72,15 +79,15 @@ class Authorize extends \Zotlabs\Web\Controller {
 			$redirect_uri = $_POST['redirect_uri'] = 'https://fake.example.com';
 		}
 
-		logger('redirect_uri is : ' . $redirect_uri);
 		// If the client is not registered, add to the database
 		if (!$storage->getClientDetails($client_id)) {
 			$client_secret = random_string(16);
-			$storage->setClientDetails($client_id, $client_secret, $redirect_uri);
+			// Client apps are registered per channel
+			$user_id = local_channel();
+			$storage->setClientDetails($client_id, $client_secret, $redirect_uri, null, null, $user_id);
 		}
 
 		$request = \OAuth2\Request::createFromGlobals();
-		logger(json_encode($request, JSON_PRETTY_PRINT), LOGGER_DEBUG);
 		$response = new \OAuth2\Response();
 
 		// validate the authorize request
diff --git a/Zotlabs/Module/Oauth2testvehicle.php b/Zotlabs/Module/Oauth2testvehicle.php
index 6e9f31c47..79958f025 100644
--- a/Zotlabs/Module/Oauth2testvehicle.php
+++ b/Zotlabs/Module/Oauth2testvehicle.php
@@ -8,6 +8,7 @@ class OAuth2TestVehicle extends \Zotlabs\Web\Controller {
 		
 		// If there is a 'code' and 'state' parameter then this is a client app 
 		// callback issued after the authorization code request
+		// TODO: Check state value and compare to original sent value
 		if ($_REQUEST['code'] && $_REQUEST['state']) {
 			logger('Authorization callback invoked.', LOGGER_DEBUG);
 			logger(json_encode($_REQUEST, JSON_PRETTY_PRINT), LOGGER_DEBUG);
@@ -61,8 +62,14 @@ class OAuth2TestVehicle extends \Zotlabs\Web\Controller {
 					array(
 						array('response_type', 'code'),
 						array('client_id', urlencode('test_app_client_id')),
-						array('redirect_uri', urlencode('http://hub.localhost/oauth2testvehicle')),
-						array('state', 'xyz')
+						array('redirect_uri', 'http://hub.localhost/oauth2testvehicle'),
+						array('state', 'xyz'),
+						// OpenID Connect Dynamic Client Registration 1.0 Client Metadata
+						// http://openid.net/specs/openid-connect-registration-1_0.html
+						array('client_name', urlencode('Killer App')),
+						array('logo_uri', urlencode('https://client.example.com/website/img/icon.png')),
+						array('client_uri', urlencode('https://client.example.com/website')),
+						array('application_type', 'web'), // would be 'native' for mobile app
 					),
 					'oauth_authorize',
 					'Authorize a test client app',
diff --git a/view/tpl/oauth2testvehicle.tpl b/view/tpl/oauth2testvehicle.tpl
index aebc71bb2..18bbfb1ff 100644
--- a/view/tpl/oauth2testvehicle.tpl
+++ b/view/tpl/oauth2testvehicle.tpl
@@ -2,7 +2,7 @@
 
 {{foreach $endpoints as $ept}}
 <div class="oath2test-form-box">
-<form action="{{$baseurl}}/{{$ept.0}}" method="{{$ept.4}}">
+<form action="{{$baseurl}}/{{$ept.0}}/" method="{{$ept.4}}">
 	<h3>{{$ept.3}}</h3>
 	<p>{{$baseurl}}/{{$ept.0}}/?{{foreach $ept.1 as $field}}{{$field.0}}={{$field.1}}&<input type="hidden" name="{{$field.0}}" value="{{$field.1}}" />{{/foreach}}
 	</p>
diff --git a/view/tpl/oauth_authorize.tpl b/view/tpl/oauth_authorize.tpl
index f5da11cdc..72701ce52 100755
--- a/view/tpl/oauth_authorize.tpl
+++ b/view/tpl/oauth_authorize.tpl
@@ -2,8 +2,8 @@
 
 <div class='oauthapp'>
 	<img src='{{$app.icon}}'>
-	<h4>{{$app.name}}</h4>
-	<h3>{{$authorize}}</h3>
+	<h3>{{$app.name}}</h3>
+	<p class="descriptive-paragraph">{{$authorize}}</p>
 	<form method="POST">
 	<div class="settings-submit-wrapper">
 		<input type="hidden" name="client_id" value="{{$client_id}}" />