From 9f4be62d3de8ac5819a2b39892cf5423416f9c35 Mon Sep 17 00:00:00 2001 From: Adam Magness Date: Mon, 4 Dec 2017 20:30:10 -0500 Subject: [PATCH 1/6] Use statement --- src/Network/FKOAuth1.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Network/FKOAuth1.php b/src/Network/FKOAuth1.php index 768cae7d1b..31960a91da 100644 --- a/src/Network/FKOAuth1.php +++ b/src/Network/FKOAuth1.php @@ -10,6 +10,7 @@ use Friendica\Core\System; use Friendica\Database\DBM; use Friendica\Network\FKOAuthDataStore; use dba; +use OAuthServer; require_once "library/OAuth1.php"; require_once "include/plugin.php"; From 448598495cc4cee10e333d17a161c52549478cfa Mon Sep 17 00:00:00 2001 From: Adam Magness Date: Mon, 4 Dec 2017 21:00:47 -0500 Subject: [PATCH 2/6] Static remove static --- src/Network/FKOAuthDataStore.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Network/FKOAuthDataStore.php b/src/Network/FKOAuthDataStore.php index 0fcd01fc5c..6cb080ba71 100644 --- a/src/Network/FKOAuthDataStore.php +++ b/src/Network/FKOAuthDataStore.php @@ -36,7 +36,7 @@ class FKOAuthDataStore extends OAuthDataStore * @param string $consumer_key key * @return mixed */ - public static function lookup_consumer($consumer_key) + public function lookup_consumer($consumer_key) { logger(__function__.":".$consumer_key); @@ -56,7 +56,7 @@ class FKOAuthDataStore extends OAuthDataStore * @param string $token token * @return mixed */ - public static function lookup_token($consumer, $token_type, $token) + public function lookup_token($consumer, $token_type, $token) { logger(__function__.":".$consumer.", ". $token_type.", ".$token); @@ -81,7 +81,7 @@ class FKOAuthDataStore extends OAuthDataStore * @param string $timestamp timestamp * @return mixed */ - public static function lookup_nonce($consumer, $token, $nonce, $timestamp) + public function lookup_nonce($consumer, $token, $nonce, $timestamp) { $r = dba::select('tokens', ['id', 'secret'], ['client_id' => $consumer->key, 'id' => $nonce, 'expires' => $timestamp], ['limit' => 1]); @@ -97,7 +97,7 @@ class FKOAuthDataStore extends OAuthDataStore * @param string $callback optional, default null * @return mixed */ - public static function new_request_token($consumer, $callback = null) + public function new_request_token($consumer, $callback = null) { logger(__function__.":".$consumer.", ". $callback); $key = self::genToken(); @@ -132,7 +132,7 @@ class FKOAuthDataStore extends OAuthDataStore * @param string $verifier optional, defult null * @return object */ - public static function new_access_token($token, $consumer, $verifier = null) + public function new_access_token($token, $consumer, $verifier = null) { logger(__function__.":".$token.", ". $consumer.", ". $verifier); From e997128c9fd896aac26a9305e725a69e673e0530 Mon Sep 17 00:00:00 2001 From: Adam Magness Date: Mon, 4 Dec 2017 21:03:39 -0500 Subject: [PATCH 3/6] Static --- src/Network/FKOAuth1.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Network/FKOAuth1.php b/src/Network/FKOAuth1.php index 31960a91da..9197d1aec0 100644 --- a/src/Network/FKOAuth1.php +++ b/src/Network/FKOAuth1.php @@ -34,7 +34,7 @@ class FKOAuth1 extends OAuthServer * @param string $uid user id * @return void */ - public static function loginUser($uid) + public function loginUser($uid) { logger("FKOAuth1::loginUser $uid"); $a = get_app(); From 0c48b4188bf7f68dbb28f7ebc9754aa4fd827475 Mon Sep 17 00:00:00 2001 From: Adam Magness Date: Mon, 4 Dec 2017 21:10:54 -0500 Subject: [PATCH 4/6] Non Static calls update calls to non static --- include/api.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/include/api.php b/include/api.php index 740abf1e2e..b5799d4786 100644 --- a/include/api.php +++ b/include/api.php @@ -157,11 +157,12 @@ function api_register_func($path, $func, $auth = false, $method = API_METHOD_ANY */ function api_login(App $a) { + $oauth1 = new FKOAuth1(); // login with oauth try { - list($consumer, $token) = FKOAuth1::verify_request(OAuthRequest::from_request()); + list($consumer, $token) = $oauth1->verify_request(OAuthRequest::from_request()); if (!is_null($token)) { - FKOAuth1::loginUser($token->uid); + $oauth1->loginUser($token->uid); call_hooks('logged_in', $a->user); return; } @@ -3363,8 +3364,9 @@ api_register_func('api/direct_messages', 'api_direct_messages_inbox', true); function api_oauth_request_token($type) { + $oauth1 = new FKOAuth1(); try { - $r = FKOAuth1::fetch_request_token(OAuthRequest::from_request()); + $r = $oauth1->fetch_request_token(OAuthRequest::from_request()); } catch (Exception $e) { echo "error=" . OAuthUtil::urlencode_rfc3986($e->getMessage()); killme(); @@ -3375,8 +3377,9 @@ function api_oauth_request_token($type) function api_oauth_access_token($type) { + $oauth1 = new FKOAuth1(); try { - $r = FKOAuth1::fetch_access_token(OAuthRequest::from_request()); + $r = $oauth1->fetch_access_token(OAuthRequest::from_request()); } catch (Exception $e) { echo "error=". OAuthUtil::urlencode_rfc3986($e->getMessage()); killme(); From f1a5560804748e124f0c74b9d3d294b485b2864c Mon Sep 17 00:00:00 2001 From: Adam Magness Date: Mon, 4 Dec 2017 21:13:58 -0500 Subject: [PATCH 5/6] Use statement missing use --- src/Network/FKOAuthDataStore.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Network/FKOAuthDataStore.php b/src/Network/FKOAuthDataStore.php index 6cb080ba71..b836a4d01c 100644 --- a/src/Network/FKOAuthDataStore.php +++ b/src/Network/FKOAuthDataStore.php @@ -12,6 +12,7 @@ use Friendica\Core\Config; use Friendica\Core\System; use Friendica\Database\DBM; use dba; +use OAuthDataStore; define('REQUEST_TOKEN_DURATION', 300); define('ACCESS_TOKEN_DURATION', 31536000); From e32b4ed670b5ca3f0e8f3dbb735e3fef376c952c Mon Sep 17 00:00:00 2001 From: Adam Magness Date: Mon, 4 Dec 2017 21:18:48 -0500 Subject: [PATCH 6/6] More use more missing use --- src/Network/FKOAuth1.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Network/FKOAuth1.php b/src/Network/FKOAuth1.php index 9197d1aec0..ce2d4a6b8b 100644 --- a/src/Network/FKOAuth1.php +++ b/src/Network/FKOAuth1.php @@ -11,6 +11,8 @@ use Friendica\Database\DBM; use Friendica\Network\FKOAuthDataStore; use dba; use OAuthServer; +use OAuthSignatureMethod_PLAINTEXT; +use OAuthSignatureMethod_HMAC_SHA1; require_once "library/OAuth1.php"; require_once "include/plugin.php";