Merge pull request #10969 from MrPetovan/task/remove-private-contacts

[friendica.git] / src / Security / ExAuth.php

diff --git a/src/Security/ExAuth.php b/src/Security/ExAuth.php
index 87f236d4eccce922da7c05fc9abea83123572fc8..3b4e8c5b1a302a3eeb358f2dfe3c3b2f2bc43117 100644 (file)
--- a/src/Security/ExAuth.php
+++ b/src/Security/ExAuth.php
@@ -36,8 +36,8 @@ namespace Friendica\Security;
 
 use Exception;
 use Friendica\App;
-use Friendica\Core\Config\IConfig;
-use Friendica\Core\PConfig\IPConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Database\Database;
 use Friendica\DI;
 use Friendica\Model\User;
@@ -54,11 +54,11 @@ class ExAuth
         */
        private $appMode;
        /**
-        * @var IConfig
+        * @var IManageConfigValues
         */
        private $config;
        /**
-        * @var IPConfig
+        * @var IManagePersonalConfigValues
         */
        private $pConfig;
        /**
@@ -71,14 +71,15 @@ class ExAuth
        private $baseURL;
 
        /**
-        * @param App\Mode    $appMode
-        * @param IConfig      $config
-        * @param IPConfig     $pConfig
-        * @param Database    $dba
-        * @param App\BaseURL $baseURL
+        * @param App\Mode                    $appMode
+        * @param IManageConfigValues         $config
+        * @param IManagePersonalConfigValues $pConfig
+        * @param Database                    $dba
+        * @param App\BaseURL                 $baseURL
+        *
         * @throws Exception
         */
-       public function __construct(App\Mode $appMode, IConfig $config, IPConfig $pConfig, Database $dba, App\BaseURL $baseURL)
+       public function __construct(App\Mode $appMode, IManageConfigValues $config, IManagePersonalConfigValues $pConfig, Database $dba, App\BaseURL $baseURL)
        {
                $this->appMode = $appMode;
                $this->config  = $config;
@@ -222,7 +223,7 @@ class ExAuth
 
                $url = ($ssl ? 'https' : 'http') . '://' . $host . '/noscrape/' . $user;
 
-               $curlResult = DI::httpRequest()->get($url);
+               $curlResult = DI::httpClient()->get($url);
 
                if (!$curlResult->isSuccess()) {
                        return false;