tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Remove require calls to library/OAuth1

Browse source
This commit is contained in:
Hypolite Petovan 2018-01-30 23:29:05 -05:00
parent 6edf84f528
commit 13849299f9
2 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Network/FKOAuth1.php
View file

@ -1,10 +1,9 @@
<?php <?php
/** /**
* @file src/Protocol/OAuth1.php * @file src/Network/FKOAuth1.php
*/ */
namespace Friendica\Network; namespace Friendica\Network;
use Friendica\App;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
@ -12,10 +11,8 @@ use Friendica\Database\DBM;
use Friendica\Network\FKOAuthDataStore; use Friendica\Network\FKOAuthDataStore;
use dba; use dba;
use OAuthServer; use OAuthServer;
use OAuthSignatureMethod_PLAINTEXT;
use OAuthSignatureMethod_HMAC_SHA1; use OAuthSignatureMethod_HMAC_SHA1;
use OAuthSignatureMethod_PLAINTEXT;
require_once "library/OAuth1.php";
/** /**
* @brief OAuth protocol * @brief OAuth protocol

18
src/Network/FKOAuthDataStore.php
View file

@ -1,7 +1,7 @@
<?php <?php
/** /**
* @file src/Protocol/FKOAuthDataStore.php * @file src/Network/FKOAuthDataStore.php
* OAuth server * OAuth server
* Based on oauth2-php <http://code.google.com/p/oauth2-php/> * Based on oauth2-php <http://code.google.com/p/oauth2-php/>
* *
@ -9,20 +9,18 @@
namespace Friendica\Network; namespace Friendica\Network;
use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use dba; use dba;
use OAuthConsumer;
use OAuthDataStore; use OAuthDataStore;
use OAuthToken;
define('REQUEST_TOKEN_DURATION', 300); define('REQUEST_TOKEN_DURATION', 300);
define('ACCESS_TOKEN_DURATION', 31536000); define('ACCESS_TOKEN_DURATION', 31536000);
require_once 'include/dba.php'; require_once 'include/dba.php';
require_once "library/OAuth1.php";
/** /**
* @brief OAuthDataStore class * @brief OAuthDataStore class
*/ */
@ -48,7 +46,7 @@ class FKOAuthDataStore extends OAuthDataStore
$r = dba::inArray($s); $r = dba::inArray($s);
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
return new \OAuthConsumer($r[0]['client_id'], $r[0]['pw'], $r[0]['redirect_uri']); return new OAuthConsumer($r[0]['client_id'], $r[0]['pw'], $r[0]['redirect_uri']);
} }
return null; return null;
@ -68,7 +66,7 @@ class FKOAuthDataStore extends OAuthDataStore
$r = dba::inArray($s); $r = dba::inArray($s);
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$ot = new \OAuthToken($r[0]['id'], $r[0]['secret']); $ot = new OAuthToken($r[0]['id'], $r[0]['secret']);
$ot->scope = $r[0]['scope']; $ot->scope = $r[0]['scope'];
$ot->expires = $r[0]['expires']; $ot->expires = $r[0]['expires'];
$ot->uid = $r[0]['uid']; $ot->uid = $r[0]['uid'];
@ -89,7 +87,7 @@ class FKOAuthDataStore extends OAuthDataStore
{ {
$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 (DBM::is_result($token)) { if (DBM::is_result($token)) {
return new \OAuthToken($token['id'], $token['secret']); return new OAuthToken($token['id'], $token['secret']);
} }
return null; return null;
@ -126,7 +124,7 @@ class FKOAuthDataStore extends OAuthDataStore
return null; return null;
} }
return new \OAuthToken($key, $sec); return new OAuthToken($key, $sec);
} }
/** /**
@ -165,7 +163,7 @@ class FKOAuthDataStore extends OAuthDataStore
); );
if ($r) { if ($r) {
$ret = new \OAuthToken($key, $sec); $ret = new OAuthToken($key, $sec);
} }
} }