OXDEV-9885 Move provider to infrastructure

Author: NikolaIvanovski

metadata.php

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

src/Authentication/OAuth2/Exception/ProviderNotActiveException.php

@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * Copyright © OXID eSales AG. All rights reserved.
+ * See LICENSE file for license details.
+ */
+
+declare(strict_types=1);
+
+namespace OxidEsales\SecurityModule\Authentication\OAuth2\Exception;
+
+class ProviderNotActiveException extends \Exception
+{
+}

…/Service/Exception/ProviderNotActive.php …/Exception/ProviderNotFoundException.phpsrc/Authentication/OAuth2/Service/Exception/ProviderNotActive.php renamed to src/Authentication/OAuth2/Exception/ProviderNotFoundException.php src/Authentication/OAuth2/Service/Exception/ProviderNotActive.php renamed to src/Authentication/OAuth2/Exception/ProviderNotFoundException.php

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

…rvice/Exception/UserBlockedException.php …Auth2/Exception/UserBlockedException.phpsrc/Authentication/OAuth2/Service/Exception/UserBlockedException.php renamed to src/Authentication/OAuth2/Exception/UserBlockedException.php src/Authentication/OAuth2/Service/Exception/UserBlockedException.php renamed to src/Authentication/OAuth2/Exception/UserBlockedException.php

@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\SecurityModule\Authentication\OAuth2\Service\Exception;
+namespace OxidEsales\SecurityModule\Authentication\OAuth2\Exception;
 
 class UserBlockedException extends \Exception
 {

…vice/Exception/UserNotFoundException.php …uth2/Exception/UserNotFoundException.phpsrc/Authentication/OAuth2/Service/Exception/UserNotFoundException.php renamed to src/Authentication/OAuth2/Exception/UserNotFoundException.php src/Authentication/OAuth2/Service/Exception/UserNotFoundException.php renamed to src/Authentication/OAuth2/Exception/UserNotFoundException.php

@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\SecurityModule\Authentication\OAuth2\Service\Exception;
+namespace OxidEsales\SecurityModule\Authentication\OAuth2\Exception;
 
 class UserNotFoundException extends \Exception
 {

src/Authentication/OAuth2/Infrastructure/Factory/OAuth2UserDTOFactory.php

@@ -10,6 +10,7 @@
 namespace OxidEsales\SecurityModule\Authentication\OAuth2\Infrastructure\Factory;
 
 use League\OAuth2\Client\Provider\FacebookUser;
+use League\OAuth2\Client\Provider\GoogleUser;
 use OxidEsales\SecurityModule\Authentication\OAuth2\DTO\OAuth2UserDTO;
 use OxidEsales\SecurityModule\Authentication\OAuth2\DTO\OAuth2UserDTOInterface;
 
@@ -23,4 +24,14 @@ public function createFromFacebookUser(FacebookUser $facebookUser): OAuth2UserDT
             $facebookUser->getEmail(),
         );
     }
+
+    //TODO: use one factory for all providers
+    public function createFromGoogleUser(GoogleUser $googleUser): OAuth2UserDTOInterface
+    {
+        return new OAuth2UserDTO(
+            $googleUser->getFirstName(),
+            $googleUser->getLastName(),
+            $googleUser->getEmail(),
+        );
+    }
 }

src/Authentication/OAuth2/Infrastructure/Factory/OAuth2UserDTOFactoryInterface.php

@@ -8,9 +8,12 @@
 namespace OxidEsales\SecurityModule\Authentication\OAuth2\Infrastructure\Factory;
 
 use League\OAuth2\Client\Provider\FacebookUser;
+use League\OAuth2\Client\Provider\GoogleUser;
 use OxidEsales\SecurityModule\Authentication\OAuth2\DTO\OAuth2UserDTOInterface;
 
 interface OAuth2UserDTOFactoryInterface
 {
     public function createFromFacebookUser(FacebookUser $facebookUser): OAuth2UserDTOInterface;
+
+    public function createFromGoogleUser(GoogleUser $googleUser): OAuth2UserDTOInterface;
 }

src/Authentication/OAuth2/Infrastructure/Provider/Facebook/FacebookAdapter.php

@@ -25,20 +25,20 @@ class FacebookAdapter implements ProviderAdapterInterface
 
     public function __construct(
         private readonly ModuleSettingsServiceInterface $moduleSettings,
-        private readonly FacebookProviderFactoryInterface $facebookProviderFactory,
+        private readonly FacebookProviderFactoryInterface $facebookProvider,
         private readonly OAuth2UserDTOFactoryInterface $oAuth2UserDTOFactory,
     ) {
-        $this->provider = $this->facebookProviderFactory->create();
+        $this->provider = $this->facebookProvider->create();
     }
 
-    public function isActive(): bool
+    public function getName(): string
     {
-        return $this->moduleSettings->isFacebookLoginEnabled();
+        return 'facebook';
     }
 
-    public function getName(): string
+    public function isActive(): bool
     {
-        return 'facebook';
+        return $this->moduleSettings->isFacebookLoginEnabled();
     }
 
     public function getAuthorizationUrl(array $options = []): string

src/Authentication/OAuth2/Infrastructure/Provider/Google/GoogleAdapter.php

@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * Copyright © OXID eSales AG. All rights reserved.
+ * See LICENSE file for license details.
+ */
+
+declare(strict_types=1);
+
+namespace OxidEsales\SecurityModule\Authentication\OAuth2\Infrastructure\Provider\Google;
+
+use League\OAuth2\Client\Provider\Google as GoogleProvider;
+use League\OAuth2\Client\Provider\GoogleUser;
+use League\OAuth2\Client\Token\AccessToken;
+use League\OAuth2\Client\Token\AccessTokenInterface;
+use OxidEsales\SecurityModule\Authentication\OAuth2\DTO\OAuth2UserDTO;
+use OxidEsales\SecurityModule\Authentication\OAuth2\DTO\OAuth2UserDTOInterface;
+use OxidEsales\SecurityModule\Authentication\OAuth2\Infrastructure\Factory\OAuth2UserDTOFactoryInterface;
+use OxidEsales\SecurityModule\Authentication\OAuth2\Infrastructure\Provider\ProviderAdapterInterface;
+use OxidEsales\SecurityModule\Authentication\OAuth2\Service\ModuleSettingsServiceInterface;
+use Exception;
+
+class GoogleAdapter implements ProviderAdapterInterface
+{
+    private GoogleProvider $provider;
+
+    public function __construct(
+        private readonly ModuleSettingsServiceInterface $moduleSettings,
+        private readonly GoogleProviderFactoryInterface $googleProvider,
+        private readonly OAuth2UserDTOFactoryInterface $oAuth2UserDTOFactory,
+    ) {
+        $this->provider = $this->googleProvider->create();
+    }
+
+    public function getName(): string
+    {
+        return 'google';
+    }
+
+    public function isActive(): bool
+    {
+        return $this->moduleSettings->isGoogleLoginEnabled();
+    }
+
+    public function getAuthorizationUrl(array $options = []): string
+    {
+        return $this->provider->getAuthorizationUrl($options);
+    }
+
+    public function getAccessToken(string $code): AccessTokenInterface
+    {
+        return $this->provider->getAccessToken('authorization_code', [
+            'code' => $code,
+        ]);
+    }
+
+    public function getUserInfo(AccessTokenInterface $token): OAuth2UserDTOInterface
+    {
+        if (!$token instanceof AccessToken) {
+            throw new Exception('Access token must be an instance of AccessToken.');
+        }
+
+        /** @var GoogleUser $user */
+        $user = $this->provider->getResourceOwner($token);
+
+        return $this->oAuth2UserDTOFactory->createFromGoogleUser($user);
+    }
+}

src/Authentication/OAuth2/Infrastructure/Provider/Google/GoogleProviderFactory.php

@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Copyright © OXID eSales AG. All rights reserved.
+ * See LICENSE file for license details.
+ */
+
+declare(strict_types=1);
+
+namespace OxidEsales\SecurityModule\Authentication\OAuth2\Infrastructure\Provider\Google;
+
+use League\OAuth2\Client\Provider\Google as GoogleProvider;
+use OxidEsales\SecurityModule\Authentication\OAuth2\Service\ModuleSettingsServiceInterface;
+
+class GoogleProviderFactory implements GoogleProviderFactoryInterface
+{
+    public function __construct(
+        private readonly ModuleSettingsServiceInterface $moduleSettings,
+    ) {
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function create(): GoogleProvider
+    {
+        return new GoogleProvider([
+            'clientId'        => $this->moduleSettings->getGoogleClientId(),
+            'clientSecret'    => $this->moduleSettings->getFacebookClientSecret(),
+            'redirectUri'     => $this->moduleSettings->getGoogleRedirectUrl(),
+        ]);
+    }
+}