bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Reformat library/OAuth1

Browse source 
- Add type hints to Network\FKOAuthDataStore
This commit is contained in:
Hypolite Petovan 2019-12-03 23:24:32 -05:00
parent 010a7b7576
commit 17838366a0
2 changed files with 873 additions and 782 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1605
library/OAuth1.php
View file

File diff suppressed because it is too large Load diff

50
src/Network/FKOAuthDataStore.php
View file

@ -12,6 +12,7 @@ namespace Friendica\Network;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Util\Strings;
use OAuthConsumer; use OAuthConsumer;
use OAuthDataStore; use OAuthDataStore;
use OAuthToken; use OAuthToken;
@ -26,15 +27,16 @@ class FKOAuthDataStore extends OAuthDataStore
{ {
/** /**
* @return string * @return string
* @throws \Exception
*/ */
private static function genToken() private static function genToken()
{ {
return Friendica\Util\Strings::getRandomHex(32); return Strings::getRandomHex(32);
} }
/** /**
* @param string $consumer_key key * @param string $consumer_key key
* @return mixed * @return OAuthConsumer|null
* @throws \Exception * @throws \Exception
*/ */
public function lookup_consumer($consumer_key) public function lookup_consumer($consumer_key)
@ -52,17 +54,17 @@ class FKOAuthDataStore extends OAuthDataStore
} }
/** /**
* @param string $consumer consumer * @param OAuthConsumer $consumer
* @param string $token_type type * @param string $token_type
* @param string $token token * @param string $token_id
* @return mixed * @return OAuthToken|null
* @throws \Exception * @throws \Exception
*/ */
public function lookup_token($consumer, $token_type, $token) public function lookup_token(OAuthConsumer $consumer, $token_type, $token_id)
{ {
Logger::log(__function__ . ":" . $consumer . ", " . $token_type . ", " . $token); Logger::log(__function__ . ":" . $consumer . ", " . $token_type . ", " . $token_id);
$s = DBA::select('tokens', ['id', 'secret', 'scope', 'expires', 'uid'], ['client_id' => $consumer->key, 'scope' => $token_type, 'id' => $token]); $s = DBA::select('tokens', ['id', 'secret', 'scope', 'expires', 'uid'], ['client_id' => $consumer->key, 'scope' => $token_type, 'id' => $token_id]);
$r = DBA::toArray($s); $r = DBA::toArray($s);
if (DBA::isResult($r)) { if (DBA::isResult($r)) {
@ -77,14 +79,14 @@ class FKOAuthDataStore extends OAuthDataStore
} }
/** /**
* @param string $consumer consumer * @param OAuthConsumer $consumer
* @param string $token token * @param OAuthToken $token
* @param string $nonce nonce * @param string $nonce
* @param string $timestamp timestamp * @param int $timestamp
* @return mixed * @return mixed
* @throws \Exception * @throws \Exception
*/ */
public function lookup_nonce($consumer, $token, $nonce, $timestamp) public function lookup_nonce(OAuthConsumer $consumer, OAuthToken $token, $nonce, int $timestamp)
{ {
$token = DBA::selectFirst('tokens', ['id', 'secret'], ['client_id' => $consumer->key, 'id' => $nonce, 'expires' => $timestamp]); $token = DBA::selectFirst('tokens', ['id', 'secret'], ['client_id' => $consumer->key, 'id' => $nonce, 'expires' => $timestamp]);
if (DBA::isResult($token)) { if (DBA::isResult($token)) {
@ -95,12 +97,12 @@ class FKOAuthDataStore extends OAuthDataStore
} }
/** /**
* @param string $consumer consumer * @param OAuthConsumer $consumer
* @param string $callback optional, default null * @param string $callback
* @return mixed * @return OAuthToken|null
* @throws \Exception * @throws \Exception
*/ */
public function new_request_token($consumer, $callback = null) public function new_request_token(OAuthConsumer $consumer, $callback = null)
{ {
Logger::log(__function__ . ":" . $consumer . ", " . $callback); Logger::log(__function__ . ":" . $consumer . ", " . $callback);
$key = self::genToken(); $key = self::genToken();
@ -131,13 +133,13 @@ class FKOAuthDataStore extends OAuthDataStore
} }
/** /**
* @param string $token token * @param OAuthToken $token token
* @param string $consumer consumer * @param OAuthConsumer $consumer consumer
* @param string $verifier optional, defult null * @param string $verifier optional, defult null
* @return object * @return OAuthToken
* @throws HTTPException\InternalServerErrorException * @throws \Exception
*/ */
public function new_access_token($token, $consumer, $verifier = null) public function new_access_token(OAuthToken $token, OAuthConsumer $consumer, $verifier = null)
{ {
Logger::log(__function__ . ":" . $token . ", " . $consumer . ", " . $verifier); Logger::log(__function__ . ":" . $token . ", " . $consumer . ", " . $verifier);