Merge pull request #8142 from nupplaphil/task/di_config

[friendica.git] / src / Module / Security / OpenID.php

diff --git a/src/Module/Security/OpenID.php b/src/Module/Security/OpenID.php
index b11afa1b989730d348139b42d490c00baad5f68b..331c709b2c778aeaa12f6b3d4194db208fb2b077 100644 (file)
--- a/src/Module/Security/OpenID.php
+++ b/src/Module/Security/OpenID.php
@@ -2,16 +2,10 @@
 
 namespace Friendica\Module\Security;
 
-use Friendica\App\Authentication;
-use Friendica\App\BaseURL;
 use Friendica\BaseModule;
-use Friendica\Core\Config\Configuration;
-use Friendica\Core\L10n\L10n;
-use Friendica\Core\Session\ISession;
-use Friendica\Database\Database;
+use Friendica\DI;
 use Friendica\Util\Strings;
 use LightOpenID;
-use Psr\Log\LoggerInterface;
 
 /**
  * Performs an login with OpenID
@@ -20,37 +14,26 @@ class OpenID extends BaseModule
 {
        public static function content(array $parameters = [])
        {
-               /** @var Configuration $config */
-               $config = self::getClass(Configuration::class);
-
-               /** @var BaseURL $baseUrl */
-               $baseUrl = self::getClass(BaseURL::class);
-
-               if ($config->get('system', 'no_openid')) {
-                       $baseUrl->redirect();
+               if (DI::config()->get('system', 'no_openid')) {
+                       DI::baseUrl()->redirect();
                }
 
-               /** @var LoggerInterface $logger */
-               $logger = self::getClass(LoggerInterface::class);
-
-               $logger->debug('mod_openid.', ['request' => $_REQUEST]);
+               DI::logger()->debug('mod_openid.', ['request' => $_REQUEST]);
 
-               /** @var ISession $session */
-               $session = self::getClass(ISession::class);
+               $session = DI::session();
 
                if (!empty($_GET['openid_mode']) && !empty($session->get('openid'))) {
 
-                       $openid = new LightOpenID($baseUrl->getHostname());
+                       $openid = new LightOpenID(DI::baseUrl()->getHostname());
 
-                       /** @var L10n $l10n */
-                       $l10n = self::getClass(L10n::class);
+                       $l10n = DI::l10n();
 
                        if ($openid->validate()) {
                                $authId = $openid->data['openid_identity'];
 
                                if (empty($authId)) {
-                                       $logger->info($l10n->t('OpenID protocol error. No ID returned'));
-                                       $baseUrl->redirect();
+                                       DI::logger()->info($l10n->t('OpenID protocol error. No ID returned'));
+                                       DI::baseUrl()->redirect();
                                }
 
                                // NOTE: we search both for normalised and non-normalised form of $authid
@@ -61,7 +44,7 @@ class OpenID extends BaseModule
                                $condition = ['blocked' => false, 'account_expired' => false, 'account_removed' => false, 'verified' => true,
                                              'openid' => [$authId, Strings::normaliseOpenID($authId)]];
 
-                               $dba = self::getClass(Database::class);
+                               $dba = DI::dba();
 
                                $user  = $dba->selectFirst('user', [], $condition);
                                if ($dba->isResult($user)) {
@@ -69,13 +52,11 @@ class OpenID extends BaseModule
                                        // successful OpenID login
                                        $session->remove('openid');
 
-                                       /** @var Authentication $auth */
-                                       $auth = self::getClass(Authentication::class);
-                                       $auth->setForUser(self::getApp(), $user, true, true);
+                                       DI::auth()->setForUser(DI::app(), $user, true, true);
 
                                        // just in case there was no return url set
                                        // and we fell through
-                                       $baseUrl->redirect();
+                                       DI::baseUrl()->redirect();
                                }
 
                                // Successful OpenID login - but we can't match it to an existing account.
@@ -84,17 +65,17 @@ class OpenID extends BaseModule
                                $session->set('openid_identity', $authId);
 
                                // Detect the server URL
-                               $open_id_obj = new LightOpenID($baseUrl->getHostName());
+                               $open_id_obj = new LightOpenID(DI::baseUrl()->getHostName());
                                $open_id_obj->identity = $authId;
                                $session->set('openid_server', $open_id_obj->discover($open_id_obj->identity));
 
-                               if (intval($config->get('config', 'register_policy')) === \Friendica\Module\Register::CLOSED) {
+                               if (intval(DI::config()->get('config', 'register_policy')) === \Friendica\Module\Register::CLOSED) {
                                        notice($l10n->t('Account not found. Please login to your existing account to add the OpenID to it.'));
                                } else {
                                        notice($l10n->t('Account not found. Please register a new account or login to your existing account to add the OpenID to it.'));
                                }
 
-                               $baseUrl->redirect('login');
+                               DI::baseUrl()->redirect('login');
                        }
                }
        }