OXDEV-10116 Extract removeExternalAuthFlag to service layer

Author: tkcreateit

src/Authentication/OAuth2/Infrastructure/Repository/UserRepository.php

@@ -37,6 +37,18 @@ public function getUserByEmail(string $username): UserDTOInterface
         return $this->userDTOFactory->createFromModel($userModel);
     }
 
+    public function removeExternalAuthFlag(string $userId): void
+    {
+        $userModel = $this->userFactory->create();
+
+        if (!$userModel->load($userId)) {
+            throw new UserNotFoundException();
+        }
+
+        $userModel->assign(['OESMEXTERNALAUTH' => 0]);
+        $userModel->save();
+    }
+
     public function createUser(OAuth2UserDTOInterface $userDTO): UserDTOInterface
     {
         $userModel = $this->userFactory->create();

src/Authentication/OAuth2/Infrastructure/Repository/UserRepositoryInterface.php

@@ -18,5 +18,10 @@ interface UserRepositoryInterface
      */
     public function getUserByEmail(string $username): UserDTOInterface;
 
+    /**
+     * @throws UserNotFoundException
+     */
+    public function removeExternalAuthFlag(string $userId): void;
+
     public function createUser(OAuth2UserDTOInterface $userDTO): UserDTOInterface;
 }

src/Authentication/OAuth2/Service/UserService.php

@@ -42,4 +42,12 @@ public function login(OAuth2UserDTOInterface $auth2UserDTO): void
 
         $this->session->set('usr', $userDTO->getId());
     }
+
+    public function removeExternalAuthFlag(): void
+    {
+        $userId = $this->session->get('usr');
+        if ($userId) {
+            $this->userRepository->removeExternalAuthFlag((string)$userId);
+        }
+    }
 }

src/Authentication/OAuth2/Service/UserServiceInterface.php

@@ -18,4 +18,6 @@ interface UserServiceInterface
      * @throws UserBlockedException If the user is blocked.
      */
     public function login(OAuth2UserDTOInterface $auth2UserDTO): void;
+
+    public function removeExternalAuthFlag(): void;
 }

src/Shared/Controller/ForgotPasswordController.php

@@ -9,9 +9,9 @@
 
 namespace OxidEsales\SecurityModule\Shared\Controller;
 
-use OxidEsales\Eshop\Application\Model\User;
 use OxidEsales\Eshop\Core\Exception\StandardException;
 use OxidEsales\Eshop\Core\Registry;
+use OxidEsales\SecurityModule\Authentication\OAuth2\Service\UserServiceInterface;
 use OxidEsales\SecurityModule\Captcha\Service\CaptchaServiceInterface;
 use OxidEsales\SecurityModule\Captcha\Service\ModuleSettingsServiceInterface;
 
@@ -47,12 +47,8 @@ public function updatePassword()
         $result = parent::updatePassword();
 
         if ($result === 'forgotpwd?success=1') {
-            $userId = Registry::getSession()->getVariable('usr');
-            $user = oxNew(User::class);
-            if ($userId && $user->load($userId) && $user->getFieldData('oesmexternalauth')) {
-                $user->assign(['OESMEXTERNALAUTH' => 0]);
-                $user->save();
-            }
+            $this->getService(UserServiceInterface::class)
+                ->removeExternalAuthFlag();
         }
 
         return $result;

tests/Unit/Authentication/OAuth2/Infrastructure/Repository/UserRepositoryTest.php

@@ -90,6 +90,40 @@ public function testGetUserByEmailThrowsExceptionIfUserCannotBeLoaded(): void
         $repository->getUserByEmail($username);
     }
 
+    public function testRemoveExternalAuthFlag(): void
+    {
+        $userId = uniqid();
+
+        $userModelMock = $this->createMock(UserModel::class);
+        $userModelMock->method('load')->with($userId)->willReturn(true);
+        $userModelMock->expects($this->once())->method('assign')->with(['OESMEXTERNALAUTH' => 0]);
+        $userModelMock->expects($this->once())->method('save');
+
+        $userFactoryStub = $this->createStub(UserFactoryInterface::class);
+        $userFactoryStub->method('create')->willReturn($userModelMock);
+
+        $repository = $this->getSut(userFactory: $userFactoryStub);
+
+        $repository->removeExternalAuthFlag($userId);
+    }
+
+    public function testRemoveExternalAuthFlagThrowsExceptionIfUserNotFound(): void
+    {
+        $userId = uniqid();
+
+        $userModelStub = $this->createStub(UserModel::class);
+        $userModelStub->method('load')->willReturn(false);
+
+        $userFactoryStub = $this->createStub(UserFactoryInterface::class);
+        $userFactoryStub->method('create')->willReturn($userModelStub);
+
+        $repository = $this->getSut(userFactory: $userFactoryStub);
+
+        $this->expectException(UserNotFoundException::class);
+
+        $repository->removeExternalAuthFlag($userId);
+    }
+
     public function testCreateUser(): void
     {
         $firstName = uniqid();

tests/Unit/Authentication/OAuth2/Service/UserServiceTest.php

@@ -115,6 +115,42 @@ public function testCannotLoginWithoutEmail(): void
         $sut->login($oAuth2UserStub);
     }
 
+    public function testRemoveExternalAuthFlag(): void
+    {
+        $userId = uniqid();
+
+        $sessionStub = $this->createStub(SessionInterface::class);
+        $sessionStub->method('get')->with('usr')->willReturn($userId);
+
+        $userRepositoryMock = $this->createMock(UserRepositoryInterface::class);
+        $userRepositoryMock->expects($this->once())
+            ->method('removeExternalAuthFlag')
+            ->with($userId);
+
+        $sut = $this->getSut(
+            userRepository: $userRepositoryMock,
+            session: $sessionStub
+        );
+
+        $sut->removeExternalAuthFlag();
+    }
+
+    public function testRemoveExternalAuthFlagSkipsWhenNoUserInSession(): void
+    {
+        $sessionStub = $this->createStub(SessionInterface::class);
+        $sessionStub->method('get')->with('usr')->willReturn(null);
+
+        $userRepositoryMock = $this->createMock(UserRepositoryInterface::class);
+        $userRepositoryMock->expects($this->never())->method('removeExternalAuthFlag');
+
+        $sut = $this->getSut(
+            userRepository: $userRepositoryMock,
+            session: $sessionStub
+        );
+
+        $sut->removeExternalAuthFlag();
+    }
+
     private function getSut(
         UserRepositoryInterface $userRepository = null,
         SessionInterface $session = null,