OXDEV-9889 Add tests for services

Author: NikolaIvanovski

src/Authentication/OAuth2/Exception/UserBlockedException.php

@@ -0,0 +1,18 @@
+<?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 UserBlockedException extends \Exception
+{
+    public function __construct()
+    {
+        parent::__construct('ERROR_USER_BLOCKED');
+    }
+}

src/Authentication/OAuth2/Exception/UserNotFoundException.php

@@ -0,0 +1,18 @@
+<?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 UserNotFoundException extends \Exception
+{
+    public function __construct()
+    {
+        parent::__construct('ERROR_USER_NOT_FOUND');
+    }
+}

src/Authentication/OAuth2/Factory/services.yaml

@@ -0,0 +1,8 @@
+services:
+  _defaults:
+    autowire: true
+    public: false
+
+  OxidEsales\SecurityModule\Authentication\OAuth2\Factory\UserFactoryInterface:
+    class: OxidEsales\SecurityModule\Authentication\OAuth2\Factory\UserFactory
+    public: true

src/Authentication/OAuth2/Infrastructure/UserRepository.php

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

src/Authentication/OAuth2/Infrastructure/UserRepositoryInterface.php

@@ -0,0 +1,7 @@
+services:
+  _defaults:
+    autowire: true
+    public: false
+
+  OxidEsales\SecurityModule\Authentication\OAuth2\Service\Provider\Facebook\Facebook:
+    tags: [ 'security.oauth.tag.provider' ]

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

@@ -10,6 +10,7 @@
 namespace OxidEsales\SecurityModule\Authentication\OAuth2\Service;
 
 use OxidEsales\SecurityModule\Authentication\OAuth2\Service\Provider\ProviderInterface;
+use OxidEsales\SecurityModule\Authentication\OAuth2\Service\Provider\ProviderNotFound;
 
 class ProviderCollector implements ProviderCollectorInterface
 {

src/Authentication/OAuth2/Service/Provider/services.yaml

@@ -12,43 +12,44 @@
 use OxidEsales\Eshop\Application\Model\User;
 use OxidEsales\EshopCommunity\Internal\Framework\Session\SessionInterface;
 use OxidEsales\SecurityModule\Authentication\OAuth2\DataType\UserDataTypeInterface;
+use OxidEsales\SecurityModule\Authentication\OAuth2\Exception\UserBlockedException;
+use OxidEsales\SecurityModule\Authentication\OAuth2\Exception\UserNotFoundException;
 use OxidEsales\SecurityModule\Authentication\OAuth2\Factory\UserFactoryInterface;
-use OxidEsales\SecurityModule\Authentication\OAuth2\Infrastructure\UserRepositoryInterface;
 
 readonly class UserService implements UserServiceInterface
 {
     public function __construct(
         private UserFactoryInterface $userFactory,
         private SessionInterface $session,
-        private UserRepositoryInterface $userRepository,
     ) {
     }
 
     public function login(UserDataTypeInterface $userDataType): void
     {
-        $userModel = $this->getUserByUserId($userDataType->getEmail());
-        if (!$userModel instanceof User) {
+        try {
+            $userModel = $this->getUserByUserEmail($userDataType->getEmail());
+        } catch (UserNotFoundException $e) {
             $userModel = $this->createUser($userDataType);
         }
 
         if ($userModel->inGroup('oxidblocked')) {
-            throw new \Exception('Blocked');
+            throw new UserBlockedException();
         }
 
         $this->session->set('usr', $userModel->getId());
     }
 
-    public function getUserByUserId(string $username): User|bool
+    public function getUserByUserEmail(string $username): User|bool
     {
-        $userId = $this->userRepository->getUserByEmail($username);
-        if ($userId) {
-            $user = $this->userFactory->create();
-            $user->load($userId);
+        $userModel = $this->userFactory->create();
 
-            return $user;
+        $userId = $userModel->getIdByUserName($username);
+        $userLoaded = $userModel->load($userId);
+        if (!$userLoaded) {
+            throw new UserNotFoundException();
         }
 
-        return false;
+        return $userModel;
     }
 
     public function createUser(userDataTypeInterface $userDataType): User

src/Authentication/OAuth2/Service/ProviderCollector.php

@@ -14,7 +14,7 @@ interface UserServiceInterface
 {
     public function login(UserDataTypeInterface $userDataType): void;
 
-    public function getUserByUserId(string $username): User|bool;
+    public function getUserByUserEmail(string $username): User|bool;
 
     public function createUser(UserDataTypeInterface $userDataType): User;
 }