WIP Add code generation on login

Author: TitaKoleva

migration/data/Version20251128093245.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Copyright © OXID eSales AG. All rights reserved.
+ * See LICENSE file for license details.
+ */
+
+namespace OxidEsales\SecurityModule\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20251128093245 extends AbstractMigration
+{
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE `oxuser` ADD column `OESMOTPCODE` VARCHAR(128) default NULL COMMENT "OTP code"');
+        $this->addSql('ALTER TABLE `oxuser` ADD column `OESMOTPEXPTIME` DATETIME default NULL COMMENT "OTP code expiration time"');
+        $this->addSql('ALTER TABLE `oxuser` ADD column `OESMOTPATTEMPTS` INT NOT NULL default 0 COMMENT "OTP code attempts"');
+    }
+
+    public function down(Schema $schema): void
+    {
+    }
+}

migration/migrations.yml

@@ -0,0 +1,4 @@
+table_storage:
+    table_name: oxmigrations_oe_security_module
+migrations_paths:
+    'OxidEsales\SecurityModule\Migrations': data

…entication/TwoFactorAuth/DTO/UserDTO.php …cation/TwoFactorAuth/DataObject/User.phpsrc/Authentication/TwoFactorAuth/DTO/UserDTO.php renamed to src/Authentication/TwoFactorAuth/DataObject/User.php src/Authentication/TwoFactorAuth/DTO/UserDTO.php renamed to src/Authentication/TwoFactorAuth/DataObject/User.php

@@ -11,7 +11,7 @@
 
 use DateTimeInterface;
 
-class UserDTO implements UserDTOInterface
+class User implements UserInterface
 {
     public function __construct(
         private readonly ?string $code,

…n/TwoFactorAuth/DTO/UserDTOInterface.php …oFactorAuth/DataObject/UserInterface.phpsrc/Authentication/TwoFactorAuth/DTO/UserDTOInterface.php renamed to src/Authentication/TwoFactorAuth/DataObject/UserInterface.php src/Authentication/TwoFactorAuth/DTO/UserDTOInterface.php renamed to src/Authentication/TwoFactorAuth/DataObject/UserInterface.php

@@ -9,7 +9,7 @@
 
 use DateTimeInterface;
 
-interface UserDTOInterface
+interface UserInterface
 {
     public function getCode(): ?string;
 

src/Authentication/TwoFactorAuth/Infrastructure/UserFactory.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\TwoFactorAuth\Infrastructure;
+
+use OxidEsales\Eshop\Application\Model\User;
+
+class UserFactory implements UserFactoryInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function create(): User
+    {
+        return oxNew(User::class);
+    }
+}

src/Authentication/TwoFactorAuth/Infrastructure/UserFactoryInterface.php

@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * Copyright © OXID eSales AG. All rights reserved.
+ * See LICENSE file for license details.
+ */
+
+namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure;
+
+use OxidEsales\Eshop\Application\Model\User;
+
+interface UserFactoryInterface
+{
+    public function create(): User;
+}

src/Authentication/TwoFactorAuth/Repository/UserRepository.php

@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Copyright © OXID eSales AG. All rights reserved.
+ * See LICENSE file for license details.
+ */
+
+declare(strict_types=1);
+
+namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Repository;
+
+use OxidEsales\Eshop\Application\Model\User as UserModel;
+use OxidEsales\SecurityModule\Authentication\OAuth2\DataObject\UserInterface;
+use OxidEsales\SecurityModule\Authentication\OAuth2\Exception\UserNotFoundException;
+use OxidEsales\SecurityModule\Authentication\OAuth2\Infrastructure\UserFactoryInterface;
+
+class UserRepository implements UserRepositoryInterface
+{
+    public function __construct(
+        private UserFactoryInterface $userFactory
+    ) {
+    }
+
+    public function addOTPtoUser(string $userId, string $otp, int $expiresAt): bool
+    {
+        $userModel = $this->userFactory->create();
+        $userModel->load($userId);
+        $userModel->assign([
+            'OESMOTPCODE'       => $otp,
+            'OESMOTPEXPTIME' => $expiresAt,
+            'OESMOTPATTEMPTS'   => 0,
+        ]);
+        $userModel->save();
+
+        return true;
+    }
+
+    public function updateAttempts(string $userId, int $attempts): int
+    {
+        $userModel = $this->userFactory->create();
+        $userModel->load($userId);
+        $userModel->assign([
+            'OESMOTPATTEMPTS' => $attempts
+        ]);
+        $userModel->save();
+    }
+
+    public function resetCodeFields(string $userId): void
+    {
+        $userModel = $this->userFactory->create();
+        $userModel->load($userId);
+        $userModel->assign([
+            'OESMOTPCODE'       => '',
+            'OESMOTPEXPTIME' => 0,
+            'OESMOTPATTEMPTS'   => 0,
+        ]);
+        $userModel->save();
+    }
+}

src/Authentication/TwoFactorAuth/Repository/UserRepositoryInterface.php

@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * Copyright © OXID eSales AG. All rights reserved.
+ * See LICENSE file for license details.
+ */
+
+namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Repository;
+
+use OxidEsales\SecurityModule\Authentication\OAuth2\DataObject\UserInterface;
+
+interface UserRepositoryInterface
+{
+    public function updateAttempts(string $userId, int $attempts): int;
+
+    public function resetCodeFields(string $userId): void;
+
+    public function addOTPtoUser(string $userId, string $otp, int $expiresAt): bool;
+}

src/Authentication/TwoFactorAuth/Service/AuthorizeService.php

@@ -15,4 +15,9 @@ public function validate()
     {
         //todo: call correct provider service to validate the code
     }
+
+    public function generate($userName)
+    {
+        //todo: call correct provider service to generate the code
+    }
 }

src/Authentication/TwoFactorAuth/Service/Provider/OTP/Generator/OTPGenerator.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Service\Provider\OTP\Service;
+
+use OxidEsales\Eshop\Application\Model\User as UserModel;
+use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\DTO\User;
+use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Repository\UserRepositoryInterface;
+use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Service\Provider\OTP\Validator\OTPValidatorInterface;
+
+readonly class OTPGenerator implements OTPGeneratorInterface
+{
+    private const OTP_LENGTH = 6;
+    private const OTP_EXPIRATION = 300; // 5 minutes
+
+    public function __construct(
+        private UserRepositoryInterface $userRepository,
+    ) {
+    }
+
+    public function generateCode(UserModel $user): User
+    {
+        $otp = str_pad(random_int(0, 999999), self::OTP_LENGTH, '0', STR_PAD_LEFT);
+        $expiresAt = time() + self::OTP_EXPIRATION;
+
+        $this->userRepository->addOTPtoUser($user->getId(), $otp, $expiresAt);
+
+        return new User($otp, 0, $expiresAt);
+    }
+}