OXDEV-9885 Use factory, repository and service for user

Author: TitaKoleva

src/Authentication/OAuth2/Infrastructure/UserRepository.php

@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Copyright © OXID eSales AG. All rights reserved.
+ * See LICENSE file for license details.
+ */
+
+declare(strict_types=1);
+
+namespace OxidEsales\SecurityModule\Authentication\OAuth2\Infrastructure;
+
+use Doctrine\DBAL\Result;
+use OxidEsales\EshopCommunity\Internal\Framework\Database\QueryBuilderFactoryInterface;
+
+readonly class UserRepository implements UserRepositoryInterface
+{
+    public function __construct(
+        private QueryBuilderFactoryInterface $queryBuilderFactory,
+    ) {
+    }
+
+    public function getUserByEmail(string $username): string|bool
+    {
+        $queryBuilder = $this->queryBuilderFactory->create();
+
+        $queryBuilder
+            ->select('u.oxid')
+            ->from('oxuser', 'u')
+            ->where('u.oxusername = :oxusername')
+            ->setParameter('oxusername', $username);
+
+        /** @var Result<array> $result */
+        $result = $queryBuilder->execute();
+
+        return $result->fetchOne();
+    }
+}

src/Authentication/OAuth2/Infrastructure/UserRepositoryInterface.php

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

src/Authentication/OAuth2/Service/Exception/ProviderNotFound.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\Service\Exception;
+
+class ProviderNotFound extends \Exception
+{
+}

src/Authentication/OAuth2/Service/Provider/Google.php

@@ -4,6 +4,8 @@
 
 use League\OAuth2\Client\Provider\Google as GoogleProvider;
 use League\OAuth2\Client\Token\AccessTokenInterface;
+use OxidEsales\SecurityModule\Authentication\OAuth2\DataType\UserDataType;
+use OxidEsales\SecurityModule\Authentication\OAuth2\DataType\UserDataTypeInterface;
 use OxidEsales\SecurityModule\Authentication\OAuth2\Service\ModuleSettingsServiceInterface;
 
 class Google implements ProviderInterface
@@ -22,7 +24,7 @@ public function getName(): string
 
     public function getClient(): GoogleProvider
     {
-        return new GoogleProvider([
+        return $this->client = new GoogleProvider([
             'clientId'     => $this->moduleSettings->getGoogleClientId(),
             'clientSecret' => $this->moduleSettings->getGoogleClientSecret(),
             'redirectUri'  => $this->moduleSettings->getGoogleRedirectUrl(),
@@ -31,7 +33,7 @@ public function getClient(): GoogleProvider
 
     public function isActive(): bool
     {
-        return true; //todo: add admin setting
+        return $this->moduleSettings->isGoogleActive();
     }
 
     public function getAuthorizationUrl(string $state): string
@@ -49,20 +51,19 @@ public function getAccessToken(string $code): AccessTokenInterface
         ]);
     }
 
-    public function getUserInfo(AccessTokenInterface $token): array
+    public function getUserInfo(AccessTokenInterface $token): UserDataTypeInterface
     {
         $user = $this->client->getResourceOwner($token);
 
-        return [
-            'id'     => $user->getId(),
-            'email'  => $user->getEmail(),
-            'name'   => $user->getName(),
-            'avatar' => $user->getAvatar(),
-        ];
+        return new UserDataType(
+            $user->getFirstName(),
+            $user->getLastName(),
+            $user->getEmail(),
+        );
     }
 
     public function validateToken(AccessTokenInterface $token): bool
     {
-        return !$token->hasExpired();
+        return true;
     }
 }