X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FFKOAuthDataStore.php;h=d1f43172b651f2d4f40503417718987198e7b6ec;hb=f010beaa95fafbb0228ef4b569621a64b51afa50;hp=424b6391ee619c11a714c27ebcade1462a9fdc75;hpb=910d3f7b5f16cda15074107073a489e4426c369a;p=friendica.git

diff --git a/src/Network/FKOAuthDataStore.php b/src/Network/FKOAuthDataStore.php
index 424b6391ee..d1f43172b6 100644
--- a/src/Network/FKOAuthDataStore.php
+++ b/src/Network/FKOAuthDataStore.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @file src/Protocol/FKOAuthDataStore.php
+ * @file src/Network/FKOAuthDataStore.php
  * OAuth server
  * Based on oauth2-php <http://code.google.com/p/oauth2-php/>
  *
@@ -9,21 +9,16 @@
 
 namespace Friendica\Network;
 
-use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Core\System;
-use Friendica\Database\DBM;
-use dba;
+use Friendica\Core\Logger;
+use Friendica\Database\DBA;
+use OAuthConsumer;
 use OAuthDataStore;
+use OAuthToken;
 
 define('REQUEST_TOKEN_DURATION', 300);
 define('ACCESS_TOKEN_DURATION', 31536000);
 
-require_once 'include/dba.php';
-
-require_once "library/OAuth1.php";
-require_once "library/oauth2-php/lib/OAuth2.inc";
-
 /**
  * @brief OAuthDataStore class
  */
@@ -40,16 +35,17 @@ class FKOAuthDataStore extends OAuthDataStore
 	/**
 	 * @param string $consumer_key key
 	 * @return mixed
+	 * @throws \Exception
 	 */
 	public function lookup_consumer($consumer_key)
 	{
-		logger(__function__ . ":" . $consumer_key);
+		Logger::log(__function__ . ":" . $consumer_key);
 
-		$s = dba::select('clients', array('client_id', 'pw', 'redirect_uri'), array('client_id' => $consumer_key));
-		$r = dba::inArray($s);
+		$s = DBA::select('clients', ['client_id', 'pw', 'redirect_uri'], ['client_id' => $consumer_key]);
+		$r = DBA::toArray($s);
 
-		if (DBM::is_result($r)) {
-			return new \OAuthConsumer($r[0]['client_id'], $r[0]['pw'], $r[0]['redirect_uri']);
+		if (DBA::isResult($r)) {
+			return new OAuthConsumer($r[0]['client_id'], $r[0]['pw'], $r[0]['redirect_uri']);
 		}
 
 		return null;
@@ -60,16 +56,17 @@ class FKOAuthDataStore extends OAuthDataStore
 	 * @param string $token_type type
 	 * @param string $token      token
 	 * @return mixed
+	 * @throws \Exception
 	 */
 	public function lookup_token($consumer, $token_type, $token)
 	{
-		logger(__function__ . ":" . $consumer . ", " . $token_type . ", " . $token);
+		Logger::log(__function__ . ":" . $consumer . ", " . $token_type . ", " . $token);
 
-		$s = dba::select('tokens', array('id', 'secret', 'scope', 'expires', 'uid'), array('client_id' => $consumer->key, 'scope' => $token_type, 'id' => $token));
-		$r = dba::inArray($s);
+		$s = DBA::select('tokens', ['id', 'secret', 'scope', 'expires', 'uid'], ['client_id' => $consumer->key, 'scope' => $token_type, 'id' => $token]);
+		$r = DBA::toArray($s);
 
-		if (DBM::is_result($r)) {
-			$ot = new \OAuthToken($r[0]['id'], $r[0]['secret']);
+		if (DBA::isResult($r)) {
+			$ot = new OAuthToken($r[0]['id'], $r[0]['secret']);
 			$ot->scope = $r[0]['scope'];
 			$ot->expires = $r[0]['expires'];
 			$ot->uid = $r[0]['uid'];
@@ -85,13 +82,13 @@ class FKOAuthDataStore extends OAuthDataStore
 	 * @param string $nonce     nonce
 	 * @param string $timestamp timestamp
 	 * @return mixed
+	 * @throws \Exception
 	 */
 	public function lookup_nonce($consumer, $token, $nonce, $timestamp)
 	{
-		$r = dba::select('tokens', ['id', 'secret'], ['client_id' => $consumer->key, 'id' => $nonce, 'expires' => $timestamp], ['limit' => 1]);
-
-		if (DBM::is_result($r)) {
-			return new \OAuthToken($r['id'], $r['secret']);
+		$token = DBA::selectFirst('tokens', ['id', 'secret'], ['client_id' => $consumer->key, 'id' => $nonce, 'expires' => $timestamp]);
+		if (DBA::isResult($token)) {
+			return new OAuthToken($token['id'], $token['secret']);
 		}
 
 		return null;
@@ -101,10 +98,11 @@ class FKOAuthDataStore extends OAuthDataStore
 	 * @param string $consumer consumer
 	 * @param string $callback optional, default null
 	 * @return mixed
+	 * @throws \Exception
 	 */
 	public function new_request_token($consumer, $callback = null)
 	{
-		logger(__function__ . ":" . $consumer . ", " . $callback);
+		Logger::log(__function__ . ":" . $consumer . ", " . $callback);
 		$key = self::genToken();
 		$sec = self::genToken();
 
@@ -114,21 +112,21 @@ class FKOAuthDataStore extends OAuthDataStore
 			$k = $consumer;
 		}
 
-		$r = dba::insert(
+		$r = DBA::insert(
 			'tokens',
-			array(
+			[
 				'id' => $key,
 				'secret' => $sec,
 				'client_id' => $k,
 				'scope' => 'request',
-				'expires' => time() + REQUEST_TOKEN_DURATION)
+				'expires' => time() + REQUEST_TOKEN_DURATION]
 		);
 
 		if (!$r) {
 			return null;
 		}
 
-		return new \OAuthToken($key, $sec);
+		return new OAuthToken($key, $sec);
 	}
 
 	/**
@@ -136,10 +134,11 @@ class FKOAuthDataStore extends OAuthDataStore
 	 * @param string $consumer consumer
 	 * @param string $verifier optional, defult null
 	 * @return object
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	public function new_access_token($token, $consumer, $verifier = null)
 	{
-		logger(__function__ . ":" . $token . ", " . $consumer . ", " . $verifier);
+		Logger::log(__function__ . ":" . $token . ", " . $consumer . ", " . $verifier);
 
 		// return a new access token attached to this consumer
 		// for the user associated with this token if the request token
@@ -150,28 +149,28 @@ class FKOAuthDataStore extends OAuthDataStore
 
 		// get user for this verifier
 		$uverifier = Config::get("oauth", $verifier);
-		logger(__function__ . ":" . $verifier . "," . $uverifier);
+		Logger::log(__function__ . ":" . $verifier . "," . $uverifier);
 
 		if (is_null($verifier) || ($uverifier !== false)) {
 			$key = self::genToken();
 			$sec = self::genToken();
-			$r = dba::insert(
+			$r = DBA::insert(
 				'tokens',
-				array(
+				[
 					'id' => $key,
 					'secret' => $sec,
 					'client_id' => $consumer->key,
 					'scope' => 'access',
 					'expires' => time() + ACCESS_TOKEN_DURATION,
-					'uid' => $uverifier)
+					'uid' => $uverifier]
 			);
 
 			if ($r) {
-				$ret = new \OAuthToken($key, $sec);
+				$ret = new OAuthToken($key, $sec);
 			}
 		}
 
-		dba::delete('tokens', array('id' => $token->key));
+		DBA::delete('tokens', ['id' => $token->key]);
 
 		if (!is_null($ret) && !is_null($uverifier)) {
 			Config::delete("oauth", $verifier);