From 301566002595d55c97a7ef81bf39f5115e94d96b Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 30 Sep 2020 11:21:58 +0200 Subject: [PATCH 1/2] Move library\OAuth1.php to class structure Friendica\Security\OAuth1 --- statusnet/library/twitteroauth.php | 6 ++++++ tumblr/library/tumblroauth.php | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/statusnet/library/twitteroauth.php b/statusnet/library/twitteroauth.php index 5ac2ab12..7bd53d28 100644 --- a/statusnet/library/twitteroauth.php +++ b/statusnet/library/twitteroauth.php @@ -8,6 +8,12 @@ * Version 0.2.0 kept for compatibility purpose with StatusNetOAuth */ +use Friendica\Security\OAuth1\OAuthConsumer; +use Friendica\Security\OAuth1\OAuthRequest; +use Friendica\Security\OAuth1\OAuthSignatureMethod_HMAC_SHA1; +use Friendica\Security\OAuth1\OAuthToken; +use Friendica\Security\OAuth1\OAuthUtil; + /** * Twitter OAuth class */ diff --git a/tumblr/library/tumblroauth.php b/tumblr/library/tumblroauth.php index 4e21a6ab..ac96456f 100644 --- a/tumblr/library/tumblroauth.php +++ b/tumblr/library/tumblroauth.php @@ -6,6 +6,12 @@ * The first PHP Library to support OAuth for Tumblr's REST API. (Originally for Twitter, modified for Tumblr by Lucas) */ +use Friendica\Security\OAuth1\OAuthConsumer; +use Friendica\Security\OAuth1\OAuthRequest; +use Friendica\Security\OAuth1\OAuthSignatureMethod_HMAC_SHA1; +use Friendica\Security\OAuth1\OAuthToken; +use Friendica\Security\OAuth1\OAuthUtil; + /** * Tumblr OAuth class */ From 38bbdb4acb20df84a5a361030b9e0bf665c8c1b4 Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 30 Sep 2020 11:26:52 +0200 Subject: [PATCH 2/2] Cleanup OAuth1 library --- statusnet/library/twitteroauth.php | 4 ++-- tumblr/library/tumblroauth.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/statusnet/library/twitteroauth.php b/statusnet/library/twitteroauth.php index 7bd53d28..b33b5f9d 100644 --- a/statusnet/library/twitteroauth.php +++ b/statusnet/library/twitteroauth.php @@ -10,7 +10,7 @@ use Friendica\Security\OAuth1\OAuthConsumer; use Friendica\Security\OAuth1\OAuthRequest; -use Friendica\Security\OAuth1\OAuthSignatureMethod_HMAC_SHA1; +use Friendica\Security\OAuth1\Signature\OAuthSignatureMethod_HMAC_SHA1; use Friendica\Security\OAuth1\OAuthToken; use Friendica\Security\OAuth1\OAuthUtil; @@ -53,7 +53,7 @@ class TwitterOAuth private $token; /** @var OAuthConsumer */ private $consumer; - /** @var OAuthSignatureMethod_HMAC_SHA1 */ + /** @var \Friendica\Security\OAuth1\Signature\OAuthSignatureMethod_HMAC_SHA1 */ private $sha1_method; /** diff --git a/tumblr/library/tumblroauth.php b/tumblr/library/tumblroauth.php index ac96456f..418f4c86 100644 --- a/tumblr/library/tumblroauth.php +++ b/tumblr/library/tumblroauth.php @@ -8,7 +8,7 @@ use Friendica\Security\OAuth1\OAuthConsumer; use Friendica\Security\OAuth1\OAuthRequest; -use Friendica\Security\OAuth1\OAuthSignatureMethod_HMAC_SHA1; +use Friendica\Security\OAuth1\Signature\OAuthSignatureMethod_HMAC_SHA1; use Friendica\Security\OAuth1\OAuthToken; use Friendica\Security\OAuth1\OAuthUtil; @@ -51,7 +51,7 @@ class TumblrOAuth private $token; /** @var OAuthConsumer */ private $consumer; - /** @var OAuthSignatureMethod_HMAC_SHA1 */ + /** @var \Friendica\Security\OAuth1\Signature\OAuthSignatureMethod_HMAC_SHA1 */ private $sha1_method; /**