X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FNetwork%2FFKOAuth1.php;h=26b5637a62676358283c51f4fed890208c2bcf60;hb=ebaf7267440699fd5d34e7399e9d0ff754222e0a;hp=ce2d4a6b8bb382f47701c13a7d27ba0c3447442c;hpb=e32b4ed670b5ca3f0e8f3dbb735e3fef376c952c;p=friendica.git

diff --git a/src/Network/FKOAuth1.php b/src/Network/FKOAuth1.php
index ce2d4a6b8b..26b5637a62 100644
--- a/src/Network/FKOAuth1.php
+++ b/src/Network/FKOAuth1.php
@@ -1,21 +1,15 @@
 <?php
 /**
- * @file src/Protocol/OAuth1.php
+ * @file src/Network/FKOAuth1.php
  */
 namespace Friendica\Network;
 
-use Friendica\App;
-use Friendica\Core\PConfig;
-use Friendica\Core\System;
-use Friendica\Database\DBM;
-use Friendica\Network\FKOAuthDataStore;
-use dba;
+use Friendica\Core\Logger;
+use Friendica\Database\DBA;
+use Friendica\DI;
 use OAuthServer;
-use OAuthSignatureMethod_PLAINTEXT;
 use OAuthSignatureMethod_HMAC_SHA1;
-
-require_once "library/OAuth1.php";
-require_once "include/plugin.php";
+use OAuthSignatureMethod_PLAINTEXT;
 
 /**
  * @brief OAuth protocol
@@ -35,44 +29,21 @@ class FKOAuth1 extends OAuthServer
 	/**
 	 * @param string $uid user id
 	 * @return void
+	 * @throws HTTPException\ForbiddenException
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	public function loginUser($uid)
 	{
-		logger("FKOAuth1::loginUser $uid");
-		$a = get_app();
-		$record = dba::select('user', array(), array('uid' => $uid, 'blocked' => 0, 'account_expired' => 0, 'account_removed' => 0, 'verified' => 1), array('limit' => 1));
+		Logger::log("FKOAuth1::loginUser $uid");
+		$a = DI::app();
+		$record = DBA::selectFirst('user', [], ['uid' => $uid, 'blocked' => 0, 'account_expired' => 0, 'account_removed' => 0, 'verified' => 1]);
 
-		if (!DBM::is_result($record)) {
-			logger('FKOAuth1::loginUser failure: ' . print_r($_SERVER, true), LOGGER_DEBUG);
+		if (!DBA::isResult($record)) {
+			Logger::log('FKOAuth1::loginUser failure: ' . print_r($_SERVER, true), Logger::DEBUG);
 			header('HTTP/1.0 401 Unauthorized');
 			die('This api requires login');
 		}
-		$_SESSION['uid'] = $record['uid'];
-		$_SESSION['theme'] = $record['theme'];
-		$_SESSION['mobile-theme'] = PConfig::get($record['uid'], 'system', 'mobile_theme');
-		$_SESSION['authenticated'] = 1;
-		$_SESSION['page_flags'] = $record['page-flags'];
-		$_SESSION['my_url'] = System::baseUrl() . '/profile/' . $record['nickname'];
-		$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
-		$_SESSION["allow_api"] = true;
-
-		$a->user = $record;
-
-		if (strlen($a->user['timezone'])) {
-			date_default_timezone_set($a->user['timezone']);
-			$a->timezone = $a->user['timezone'];
-		}
-
-		$r = dba::select('contact', array(), array('uid' => $_SESSION['uid'], 'self' => 1), array('limit' => 1));
-		
-		if (DBM::is_result($r)) {
-			$a->contact = $r;
-			$a->cid = $r['id'];
-			$_SESSION['cid'] = $a->cid;
-		}
-
-		dba::update('user', ['login_date' => datetime_convert()], ['uid' => $_SESSION['uid']]);
 
-		call_hooks('logged_in', $a->user);
+		DI::auth()->setForUser($a, $record, true);
 	}
 }