Store in lowercase to avoid duplicates

[friendica.git] / src / Network / FKOAuthDataStore.php

diff --git a/src/Network/FKOAuthDataStore.php b/src/Network/FKOAuthDataStore.php
index d7fa14518903b981bb8cbf0f470ee13faf5a8f19..7a3329776aed4d18b20ee11384f608ae92b31c36 100644 (file)
--- a/src/Network/FKOAuthDataStore.php
+++ b/src/Network/FKOAuthDataStore.php
@@ -1,24 +1,25 @@
 <?php
+
 /**
- * @file src/Protocol/FKOAuthDataStore.php
+ * @file src/Network/FKOAuthDataStore.php
  * OAuth server
  * Based on oauth2-php <http://code.google.com/p/oauth2-php/>
  *
  */
+
 namespace Friendica\Network;
 
-use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Core\System;
 use Friendica\Database\DBM;
 use dba;
+use OAuthConsumer;
 use OAuthDataStore;
+use OAuthToken;
 
 define('REQUEST_TOKEN_DURATION', 300);
 define('ACCESS_TOKEN_DURATION', 31536000);
 
-require_once "library/OAuth1.php";
-require_once "library/oauth2-php/lib/OAuth2.inc";
+require_once 'include/dba.php';
 
 /**
  * @brief OAuthDataStore class
@@ -39,10 +40,10 @@ class FKOAuthDataStore extends OAuthDataStore
         */
        public function lookup_consumer($consumer_key)
        {
-               logger(__function__.":".$consumer_key);
-               
-               $s = dba::select('clients', array('client_id', 'pw', 'redirect_uri'), array('client_id' => $consumer_key));
-               $r = dba::inArray($r);
+               logger(__function__ . ":" . $consumer_key);
+
+               $s = dba::select('clients', ['client_id', 'pw', 'redirect_uri'], ['client_id' => $consumer_key]);
+               $r = dba::inArray($s);
 
                if (DBM::is_result($r)) {
                        return new OAuthConsumer($r[0]['client_id'], $r[0]['pw'], $r[0]['redirect_uri']);
@@ -59,13 +60,13 @@ class FKOAuthDataStore extends OAuthDataStore
         */
        public function lookup_token($consumer, $token_type, $token)
        {
-               logger(__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));
+               logger(__function__ . ":" . $consumer . ", " . $token_type . ", " . $token);
+
+               $s = dba::select('tokens', ['id', 'secret', 'scope', 'expires', 'uid'], ['client_id' => $consumer->key, 'scope' => $token_type, 'id' => $token]);
                $r = dba::inArray($s);
 
                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->expires = $r[0]['expires'];
                        $ot->uid = $r[0]['uid'];
@@ -84,10 +85,9 @@ class FKOAuthDataStore extends OAuthDataStore
         */
        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 (DBM::is_result($token)) {
+                       return new OAuthToken($token['id'], $token['secret']);
                }
 
                return null;
@@ -100,7 +100,7 @@ class FKOAuthDataStore extends OAuthDataStore
         */
        public function new_request_token($consumer, $callback = null)
        {
-               logger(__function__.":".$consumer.", ". $callback);
+               logger(__function__ . ":" . $consumer . ", " . $callback);
                $key = self::genToken();
                $sec = self::genToken();
 
@@ -112,12 +112,12 @@ class FKOAuthDataStore extends OAuthDataStore
 
                $r = dba::insert(
                        'tokens',
-                       array(
+                       [
                                'id' => $key,
                                'secret' => $sec,
                                'client_id' => $k,
                                'scope' => 'request',
-                               'expires' => UNIX_TIMESTAMP() + REQUEST_TOKEN_DURATION)
+                               'expires' => time() + REQUEST_TOKEN_DURATION]
                );
 
                if (!$r) {
@@ -135,7 +135,7 @@ class FKOAuthDataStore extends OAuthDataStore
         */
        public function new_access_token($token, $consumer, $verifier = null)
        {
-               logger(__function__.":".$token.", ". $consumer.", ". $verifier);
+               logger(__function__ . ":" . $token . ", " . $consumer . ", " . $verifier);
 
                // return a new access token attached to this consumer
                // for the user associated with this token if the request token
@@ -146,20 +146,20 @@ class FKOAuthDataStore extends OAuthDataStore
 
                // get user for this verifier
                $uverifier = Config::get("oauth", $verifier);
-               logger(__function__.":".$verifier.",".$uverifier);
+               logger(__function__ . ":" . $verifier . "," . $uverifier);
 
-               if (is_null($verifier) || ($uverifier!==false)) {
+               if (is_null($verifier) || ($uverifier !== false)) {
                        $key = self::genToken();
                        $sec = self::genToken();
                        $r = dba::insert(
                                'tokens',
-                               array(
+                               [
                                        'id' => $key,
                                        'secret' => $sec,
                                        'client_id' => $consumer->key,
                                        'scope' => 'access',
-                                       'expires' => UNIX_TIMESTAMP() + ACCESS_TOKEN_DURATION,
-                                       'uid' => $uverifier)
+                                       'expires' => time() + ACCESS_TOKEN_DURATION,
+                                       'uid' => $uverifier]
                        );
 
                        if ($r) {
@@ -167,9 +167,7 @@ class FKOAuthDataStore extends OAuthDataStore
                        }
                }
 
-
-               dba::delete('tokens', array('id' => $token->key));
-
+               dba::delete('tokens', ['id' => $token->key]);
 
                if (!is_null($ret) && !is_null($uverifier)) {
                        Config::delete("oauth", $verifier);