OXDEV-9919 Refactoring and code cleanup

Author: NikolaIvanovski

metadata.php

@@ -117,7 +117,7 @@
         //OAuth2 settings
         [
             'group' => 'oauth',
-            'name'  => ModuleSettingsService::FACEBOOK_ACTIVE,
+            'name'  => ModuleSettingsService::FACEBOOK_LOGIN_ENABLED,
             'type'  => 'bool',
             'value' => false
         ],

src/Authentication/OAuth2/Controller/OAuthController.php

@@ -14,7 +14,6 @@ public function login(): void
         $providerCollector = $this->getService(ProviderCollectorInterface::class);
 
         $provider = $providerCollector->getProvider($_GET['provider']);
-        $provider->getClient();
 
         Registry::getUtils()->redirect($provider->getAuthorizationUrl());
     }
@@ -25,15 +24,13 @@ public function redirect(): void
             ->getService(ProviderCollectorInterface::class)
             ->getProvider('facebook');
 
-        $provider->getClient();
-
         $accessToken = $provider->getAccessToken($_GET['code']);
 
-        $userDTO = $provider->getUserInfo($accessToken);
+        $userDataObject = $provider->getUserInfo($accessToken);
 
         $this
             ->getService(UserServiceInterface::class)
-            ->login($userDTO);
+            ->login($userDataObject);
 
         Registry::getUtils()->redirect('');
     }

src/Authentication/OAuth2/DTO/UserDTO.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Copyright © OXID eSales AG. All rights reserved.
+ * See LICENSE file for license details.
+ */
+
+declare(strict_types=1);
+
+namespace OxidEsales\SecurityModule\Authentication\OAuth2\DataObject;
+
+readonly class User implements UserInterface
+{
+    public function __construct(
+        private ?string $email,
+    ) {
+    }
+
+    public function getEmail(): ?string
+    {
+        return $this->email;
+    }
+}

src/Authentication/OAuth2/DTO/UserDTOInterface.php

@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * Copyright © OXID eSales AG. All rights reserved.
+ * See LICENSE file for license details.
+ */
+
+namespace OxidEsales\SecurityModule\Authentication\OAuth2\DataObject;
+
+interface UserInterface
+{
+    public function getEmail(): ?string;
+}

src/Authentication/OAuth2/DataObject/User.php

@@ -7,8 +7,8 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\SecurityModule\Authentication\OAuth2\Service\Provider;
+namespace OxidEsales\SecurityModule\Authentication\OAuth2\Exception;
 
-class ProviderNotFound extends \Exception
+class ProviderNotFoundException extends \Exception
 {
 }

src/Authentication/OAuth2/DataObject/UserInterface.php

@@ -11,8 +11,4 @@
 
 class UserBlockedException extends \Exception
 {
-    public function __construct()
-    {
-        parent::__construct('ERROR_USER_BLOCKED');
-    }
 }

…h2/Service/Provider/ProviderNotFound.php …/Exception/ProviderNotFoundException.phpsrc/Authentication/OAuth2/Service/Provider/ProviderNotFound.php renamed to src/Authentication/OAuth2/Exception/ProviderNotFoundException.php src/Authentication/OAuth2/Service/Provider/ProviderNotFound.php renamed to src/Authentication/OAuth2/Exception/ProviderNotFoundException.php

@@ -11,8 +11,4 @@
 
 class UserNotFoundException extends \Exception
 {
-    public function __construct()
-    {
-        parent::__construct('ERROR_USER_NOT_FOUND');
-    }
 }