Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

1 files changed, 17 insertions, 26 deletions

diff --git a/Zotlabs/Identity/OAuth2Server.php b/Zotlabs/Identity/OAuth2Server.php
index 3d7d5efb2..cbb4748fe 100644
--- a/Zotlabs/Identity/OAuth2Server.php
+++ b/Zotlabs/Identity/OAuth2Server.php
@@ -2,42 +2,33 @@
 
 namespace Zotlabs\Identity;
 
-class OAuth2Server {
+class OAuth2Server extends \OAuth2\Server {
 
-	public $server;
+	public function __construct(OAuth2Storage $storage, $config = []) {
 
-	public function __construct() {
+		if(! is_array($config)) {
+			$config = [
+				'use_openid_connect' => true,
+				'issuer' => \Zotlabs\Lib\System::get_site_name()
+			];
+		}
 
-		$storage = new OAuth2Storage(\DBA::$dba->db);
-
-		$config = [
-			'use_openid_connect' => true,
-			'issuer' => \Zotlabs\Lib\System::get_site_name()
-		];
-
-		// Pass a storage object or array of storage objects to the OAuth2 server class
-		$this->server = new \OAuth2\Server($storage,$config);
+		parent::__construct($storage, $config);
 
 		// Add the "Client Credentials" grant type (it is the simplest of the grant types)
-		$this->server->addGrantType(new \OAuth2\GrantType\ClientCredentials($storage));
+		$this->addGrantType(new \OAuth2\GrantType\ClientCredentials($storage));
 
 		// Add the "Authorization Code" grant type (this is where the oauth magic happens)
-		$this->server->addGrantType(new \OAuth2\GrantType\AuthorizationCode($storage));
+		$this->addGrantType(new \OAuth2\GrantType\AuthorizationCode($storage));
 
-		$keyStorage = new \OAuth2\Storage\Memory( [ 
-			'keys' => [ 
-				'public_key'  => get_config('system','pubkey'),
-				'private_key' => get_config('system','prvkey')
+		$keyStorage = new \OAuth2\Storage\Memory( [
+			'keys' => [
+				'public_key'  => get_config('system', 'pubkey'),
+				'private_key' => get_config('system', 'prvkey')
 			]
 		]);
 
-		$this->server->addStorage($keyStorage,'public_key');
-
+		$this->addStorage($keyStorage, 'public_key');
 	}
 
-	public function get_server() {
-		return $this->server;
-	} 
-
-
-}
\ No newline at end of file
+}