Merge pull request #3976 from rabuzarus/20171126_-_acl_forum

[friendica.git] / include / oauth.php

diff --git a/include/oauth.php b/include/oauth.php
index f89aedf6b72300dc8b983adea0b3d1b803992cc5..8834b935558a73e690991fa674e68c35602fa1bc 100644 (file)
--- a/include/oauth.php
+++ b/include/oauth.php
@@ -9,6 +9,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 define('REQUEST_TOKEN_DURATION', 300);
 define('ACCESS_TOKEN_DURATION', 31536000);
@@ -28,7 +29,7 @@ class FKOAuthDataStore extends OAuthDataStore {
                $r = q("SELECT client_id, pw, redirect_uri FROM clients WHERE client_id='%s'",
                        dbesc($consumer_key)
                );
-               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 null;
   }
@@ -40,7 +41,7 @@ class FKOAuthDataStore extends OAuthDataStore {
                        dbesc($token_type),
                        dbesc($token)
                );
-               if (dbm::is_result($r)){
+               if (DBM::is_result($r)){
                        $ot=new OAuthToken($r[0]['id'],$r[0]['secret']);
                        $ot->scope=$r[0]['scope'];
                        $ot->expires = $r[0]['expires'];
@@ -57,7 +58,7 @@ class FKOAuthDataStore extends OAuthDataStore {
                        dbesc($nonce),
                        intval($timestamp)
                );
-               if (dbm::is_result($r))
+               if (DBM::is_result($r))
                        return new OAuthToken($r[0]['id'],$r[0]['secret']);
                return null;
   }
@@ -112,7 +113,7 @@ class FKOAuthDataStore extends OAuthDataStore {
        }
 
 
-       q("DELETE FROM tokens WHERE id='%s'", $token->key);
+       dba::delete('tokens', array('id' => $token->key));
 
 
        if (!is_null($ret) && $uverifier!==false){
@@ -141,7 +142,7 @@ class FKOAuth1 extends OAuthServer {
                $r = q("SELECT * FROM `user` WHERE uid=%d AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1",
                        intval($uid)
                );
-               if (dbm::is_result($r)){
+               if (DBM::is_result($r)){
                        $record = $r[0];
                } else {
                   logger('FKOAuth1::loginUser failure: ' . print_r($_SERVER,true), LOGGER_DEBUG);
@@ -167,7 +168,7 @@ class FKOAuth1 extends OAuthServer {
 
                $r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1",
                        intval($_SESSION['uid']));
-               if (dbm::is_result($r)) {
+               if (DBM::is_result($r)) {
                        $a->contact = $r[0];
                        $a->cid = $r[0]['id'];
                        $_SESSION['cid'] = $a->cid;
@@ -181,93 +182,3 @@ class FKOAuth1 extends OAuthServer {
        }
 
 }
-/*
-class FKOAuth2 extends OAuth2 {
-
-       private function db_secret($client_secret){
-               return hash('whirlpool',$client_secret);
-       }
-
-       public function addClient($client_id, $client_secret, $redirect_uri) {
-               $client_secret = $this->db_secret($client_secret);
-               $r = q("INSERT INTO clients (client_id, pw, redirect_uri) VALUES ('%s', '%s', '%s')",
-                       dbesc($client_id),
-                       dbesc($client_secret),
-                       dbesc($redirect_uri)
-               );
-
-               return $r;
-       }
-
-       protected function checkClientCredentials($client_id, $client_secret = NULL) {
-               $client_secret = $this->db_secret($client_secret);
-
-               $r = q("SELECT pw FROM clients WHERE client_id = '%s'",
-                       dbesc($client_id));
-
-               if ($client_secret === NULL)
-                       return $result !== FALSE;
-
-               return $result["client_secret"] == $client_secret;
-       }
-
-       protected function getRedirectUri($client_id) {
-               $r = q("SELECT redirect_uri FROM clients WHERE client_id = '%s'",
-                               dbesc($client_id));
-               if ($r === FALSE)
-                       return FALSE;
-
-               return isset($r[0]["redirect_uri"]) && $r[0]["redirect_uri"] ? $r[0]["redirect_uri"] : NULL;
-       }
-
-       protected function getAccessToken($oauth_token) {
-               $r = q("SELECT client_id, expires, scope FROM tokens WHERE id = '%s'",
-                               dbesc($oauth_token));
-
-               if (dbm::is_result($r))
-                       return $r[0];
-               return null;
-       }
-
-
-
-       protected function setAccessToken($oauth_token, $client_id, $expires, $scope = NULL) {
-               $r = q("INSERT INTO tokens (id, client_id, expires, scope) VALUES ('%s', '%s', %d, '%s')",
-                               dbesc($oauth_token),
-                               dbesc($client_id),
-                               intval($expires),
-                               dbesc($scope));
-
-               return $r;
-       }
-
-       protected function getSupportedGrantTypes() {
-               return array(
-                 OAUTH2_GRANT_TYPE_AUTH_CODE,
-               );
-       }
-
-
-       protected function getAuthCode($code) {
-               $r = q("SELECT id, client_id, redirect_uri, expires, scope FROM auth_codes WHERE id = '%s'",
-                               dbesc($code));
-
-               if (dbm::is_result($r))
-                       return $r[0];
-               return null;
-       }
-
-       protected function setAuthCode($code, $client_id, $redirect_uri, $expires, $scope = NULL) {
-               $r = q("INSERT INTO auth_codes
-                                       (id, client_id, redirect_uri, expires, scope) VALUES
-                                       ('%s', '%s', '%s', %d, '%s')",
-                               dbesc($code),
-                               dbesc($client_id),
-                               dbesc($redirect_uri),
-                               intval($expires),
-                               dbesc($scope));
-               return $r;
-       }
-
-}
-*/