From 4a63ec1e337a8a41f5d6ed98ad34a34212157274 Mon Sep 17 00:00:00 2001
From: Robert Baruck <robert.baruck@sandstorm.de>
Date: Mon, 12 Aug 2024 15:09:36 +0200
Subject: [PATCH 1/3] FEATURE: Add creationDate to SecondFactor and ordering to
 second factor list in backend

---
 Classes/Domain/Model/SecondFactor.php         | 16 ++++++++
 .../Repository/SecondFactorRepository.php     |  6 +++
 Migrations/Mysql/Version20240812091514.php    | 41 +++++++++++++++++++
 .../Components/SecondFactorList.fusion        |  2 +
 Resources/Private/Translations/de/Backend.xlf |  4 ++
 Resources/Private/Translations/en/Backend.xlf |  3 ++
 6 files changed, 72 insertions(+)
 create mode 100644 Migrations/Mysql/Version20240812091514.php

diff --git a/Classes/Domain/Model/SecondFactor.php b/Classes/Domain/Model/SecondFactor.php
index 036cf86..150366a 100644
--- a/Classes/Domain/Model/SecondFactor.php
+++ b/Classes/Domain/Model/SecondFactor.php
@@ -38,6 +38,12 @@ class SecondFactor
      */
     protected string $secret;
 
+    /**
+     * @var \DateTime
+     * @ORM\Column(type="datetime", nullable=false)
+     */
+    protected \DateTime $creationDate;
+
     /**
      * @return Account
      */
@@ -94,6 +100,16 @@ public function setSecret(string $secret): void
         $this->secret = $secret;
     }
 
+    public function getCreationDate(): \DateTime
+    {
+        return $this->creationDate;
+    }
+
+    public function setCreationDate(\DateTime $creationDate): void
+    {
+        $this->creationDate = $creationDate;
+    }
+
     public function __toString(): string
     {
         return $this->account->getAccountIdentifier() . " with " . self::typeToString($this->type);
diff --git a/Classes/Domain/Repository/SecondFactorRepository.php b/Classes/Domain/Repository/SecondFactorRepository.php
index b166d21..da3b984 100644
--- a/Classes/Domain/Repository/SecondFactorRepository.php
+++ b/Classes/Domain/Repository/SecondFactorRepository.php
@@ -16,6 +16,11 @@
  */
 class SecondFactorRepository extends Repository
 {
+    protected $defaultOrderings = [
+        'account' => 'DESC',
+        'creationDate' => 'DESC'
+    ];
+
     /**
      * @throws IllegalObjectTypeException
      */
@@ -25,6 +30,7 @@ public function createSecondFactorForAccount(string $secret, Account $account):
         $secondFactor->setAccount($account);
         $secondFactor->setSecret($secret);
         $secondFactor->setType(SecondFactor::TYPE_TOTP);
+        $secondFactor->setCreationDate(new \DateTime());
         $this->add($secondFactor);
         $this->persistenceManager->persistAll();
     }
diff --git a/Migrations/Mysql/Version20240812091514.php b/Migrations/Mysql/Version20240812091514.php
new file mode 100644
index 0000000..79fa08e
--- /dev/null
+++ b/Migrations/Mysql/Version20240812091514.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Neos\Flow\Persistence\Doctrine\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20240812091514 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->abortIf(
+            !$this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySqlPlatform,
+            "Migration can only be executed safely on '\Doctrine\DBAL\Platforms\MySqlPlatform,'."
+        );
+
+        $this->addSql('ALTER TABLE sandstorm_neostwofactorauthentication_domain_model_secondfactor ADD creationdate DATETIME NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->abortIf(
+            !$this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySqlPlatform,
+            "Migration can only be executed safely on '\Doctrine\DBAL\Platforms\MySqlPlatform,'."
+        );
+
+        $this->addSql('ALTER TABLE sandstorm_neostwofactorauthentication_domain_model_secondfactor DROP creationdate');
+    }
+}
diff --git a/Resources/Private/Fusion/Presentation/Components/SecondFactorList.fusion b/Resources/Private/Fusion/Presentation/Components/SecondFactorList.fusion
index 6c2e3b9..4e1c17f 100644
--- a/Resources/Private/Fusion/Presentation/Components/SecondFactorList.fusion
+++ b/Resources/Private/Fusion/Presentation/Components/SecondFactorList.fusion
@@ -7,6 +7,7 @@ prototype(Sandstorm.NeosTwoFactorAuthentication:Component.SecondFactorList) < pr
             <tr>
                 <th>{I18n.id('module.index.list.header.name').package('Sandstorm.NeosTwoFactorAuthentication').source('Backend').translate()}</th>
                 <th>{I18n.id('module.index.list.header.type').package('Sandstorm.NeosTwoFactorAuthentication').source('Backend').translate()}</th>
+                <th>{I18n.id('module.index.list.header.creationDate').package('Sandstorm.NeosTwoFactorAuthentication').source('Backend').translate()}</th>
                 <th>&nbsp;</th>
             </tr>
             </thead>
@@ -42,6 +43,7 @@ prototype(Sandstorm.NeosTwoFactorAuthentication:Component.SecondFactorList.Entry
         <tr>
             <td>{props.factorAndPerson.user.name.fullName} ({props.factorAndPerson.secondFactor.account.accountIdentifier})</td>
             <td>{props.factorAndPerson.secondFactor.typeAsName}</td>
+            <td>{Date.format(props.factorAndPerson.secondFactor.creationDate, 'U') < 0 ? '-' : Date.format(props.factorAndPerson.secondFactor.creationDate, 'Y-m-d H:i')}</td>
             <td>
                 <button class="neos-button neos-button-danger" data-toggle="modal"
                         href={'#user-' + props.iterator.index} title={I18n.id('module.index.list.action.delete').package('Sandstorm.NeosTwoFactorAuthentication').source('Backend').translate()} data-neos-toggle="tooltip">
diff --git a/Resources/Private/Translations/de/Backend.xlf b/Resources/Private/Translations/de/Backend.xlf
index 95322de..9ba96b8 100644
--- a/Resources/Private/Translations/de/Backend.xlf
+++ b/Resources/Private/Translations/de/Backend.xlf
@@ -23,6 +23,10 @@
         <source>Type</source>
         <target>Typ</target>
       </trans-unit>
+      <trans-unit id="module.index.list.header.creationDate" xml:space="preserve">
+        <source>Creation Date</source>
+        <target>Erstellungsdatum</target>
+      </trans-unit>
       <trans-unit id="module.index.list.action.delete" xml:space="preserve">
         <source>Delete second factor</source>
         <target>Zweiten Faktor löschen</target>
diff --git a/Resources/Private/Translations/en/Backend.xlf b/Resources/Private/Translations/en/Backend.xlf
index d0f5dc6..4c0f5e4 100644
--- a/Resources/Private/Translations/en/Backend.xlf
+++ b/Resources/Private/Translations/en/Backend.xlf
@@ -18,6 +18,9 @@
       <trans-unit id="module.index.list.header.type" xml:space="preserve">
         <source>Type</source>
       </trans-unit>
+      <trans-unit id="module.index.list.header.creationDate" xml:space="preserve">
+        <source>Creation Date</source>
+      </trans-unit>
       <trans-unit id="module.index.list.action.delete" xml:space="preserve">
         <source>Delete second factor</source>
       </trans-unit>

From b28ff70c2e95d7a34e14c748e8ab931a211843e5 Mon Sep 17 00:00:00 2001
From: Robert Baruck <robert.baruck@sandstorm.de>
Date: Wed, 25 Sep 2024 09:42:53 +0200
Subject: [PATCH 2/3] TASK: Change default orderings to a more widely used
 default (account ASC, 2FA creationDate DESC)

---
 Classes/Domain/Repository/SecondFactorRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Classes/Domain/Repository/SecondFactorRepository.php b/Classes/Domain/Repository/SecondFactorRepository.php
index da3b984..08aa1fe 100644
--- a/Classes/Domain/Repository/SecondFactorRepository.php
+++ b/Classes/Domain/Repository/SecondFactorRepository.php
@@ -17,7 +17,7 @@
 class SecondFactorRepository extends Repository
 {
     protected $defaultOrderings = [
-        'account' => 'DESC',
+        'account' => 'ASC',
         'creationDate' => 'DESC'
     ];
 

From 0b2458c3127731bbfb1544fdc7dd2ef58031f54d Mon Sep 17 00:00:00 2001
From: Robert Baruck <robert.baruck@sandstorm.de>
Date: Thu, 26 Sep 2024 14:33:41 +0200
Subject: [PATCH 3/3] TASK: Make SecondFactor creationDate nullable

---
 Classes/Domain/Model/SecondFactor.php              | 14 +++++++++-----
 Migrations/Mysql/Version20240812091514.php         |  2 +-
 .../Components/SecondFactorList.fusion             |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Classes/Domain/Model/SecondFactor.php b/Classes/Domain/Model/SecondFactor.php
index 150366a..569d9d4 100644
--- a/Classes/Domain/Model/SecondFactor.php
+++ b/Classes/Domain/Model/SecondFactor.php
@@ -2,6 +2,7 @@
 
 namespace Sandstorm\NeosTwoFactorAuthentication\Domain\Model;
 
+use DateTime;
 use Neos\Flow\Http\InvalidArgumentException;
 use Neos\Flow\Security\Account;
 use Doctrine\ORM\Mapping as ORM;
@@ -39,10 +40,13 @@ class SecondFactor
     protected string $secret;
 
     /**
-     * @var \DateTime
-     * @ORM\Column(type="datetime", nullable=false)
+     * Introduced with version 1.4.0
+     * Nullable for backwards compatibility. Null values will be shown as '-' in backend module.
+     *
+     * @var DateTime|null
+     * @ORM\Column(type="datetime", nullable=true)
      */
-    protected \DateTime $creationDate;
+    protected DateTime|null $creationDate;
 
     /**
      * @return Account
@@ -100,12 +104,12 @@ public function setSecret(string $secret): void
         $this->secret = $secret;
     }
 
-    public function getCreationDate(): \DateTime
+    public function getCreationDate(): DateTime|null
     {
         return $this->creationDate;
     }
 
-    public function setCreationDate(\DateTime $creationDate): void
+    public function setCreationDate(DateTime $creationDate): void
     {
         $this->creationDate = $creationDate;
     }
diff --git a/Migrations/Mysql/Version20240812091514.php b/Migrations/Mysql/Version20240812091514.php
index 79fa08e..6a1e36d 100644
--- a/Migrations/Mysql/Version20240812091514.php
+++ b/Migrations/Mysql/Version20240812091514.php
@@ -25,7 +25,7 @@ public function up(Schema $schema): void
             "Migration can only be executed safely on '\Doctrine\DBAL\Platforms\MySqlPlatform,'."
         );
 
-        $this->addSql('ALTER TABLE sandstorm_neostwofactorauthentication_domain_model_secondfactor ADD creationdate DATETIME NOT NULL');
+        $this->addSql('ALTER TABLE sandstorm_neostwofactorauthentication_domain_model_secondfactor ADD creationdate DATETIME DEFAULT NULL');
     }
 
     public function down(Schema $schema): void
diff --git a/Resources/Private/Fusion/Presentation/Components/SecondFactorList.fusion b/Resources/Private/Fusion/Presentation/Components/SecondFactorList.fusion
index 4e1c17f..f7275d2 100644
--- a/Resources/Private/Fusion/Presentation/Components/SecondFactorList.fusion
+++ b/Resources/Private/Fusion/Presentation/Components/SecondFactorList.fusion
@@ -43,7 +43,7 @@ prototype(Sandstorm.NeosTwoFactorAuthentication:Component.SecondFactorList.Entry
         <tr>
             <td>{props.factorAndPerson.user.name.fullName} ({props.factorAndPerson.secondFactor.account.accountIdentifier})</td>
             <td>{props.factorAndPerson.secondFactor.typeAsName}</td>
-            <td>{Date.format(props.factorAndPerson.secondFactor.creationDate, 'U') < 0 ? '-' : Date.format(props.factorAndPerson.secondFactor.creationDate, 'Y-m-d H:i')}</td>
+            <td>{props.factorAndPerson.secondFactor.creationDate == null ? '-' : Date.format(props.factorAndPerson.secondFactor.creationDate, 'Y-m-d H:i')}</td>
             <td>
                 <button class="neos-button neos-button-danger" data-toggle="modal"
                         href={'#user-' + props.iterator.index} title={I18n.id('module.index.list.action.delete').package('Sandstorm.NeosTwoFactorAuthentication').source('Backend').translate()} data-neos-toggle="tooltip">