Merge branch 'hotfix/0.10.1'

Author: LaurentTreguier

src/main/java/app/fyreplace/api/data/dev/DataSeeder.java

@@ -15,11 +15,13 @@
 import app.fyreplace.api.data.Subscription;
 import app.fyreplace.api.data.User;
 import app.fyreplace.api.data.Vote;
+import app.fyreplace.api.services.RandomService;
 import io.quarkus.elytron.security.common.BcryptUtil;
 import io.quarkus.runtime.ShutdownEvent;
 import io.quarkus.runtime.StartupEvent;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
 import java.io.IOException;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
@@ -33,6 +35,9 @@ public final class DataSeeder {
     @ConfigProperty(name = "app.posts.starting-life")
     int postsStartingLife;
 
+    @Inject
+    RandomService randomService;
+
     public void onStartup(@Observes final StartupEvent event) {
         if (localDev) {
             insertData();
@@ -110,6 +115,13 @@ public User createUser(
             email.persist();
             user.mainEmail = email;
             user.persist();
+
+            if (!active) {
+                final var randomCode = new RandomCode();
+                randomCode.email = email;
+                randomCode.code = BcryptUtil.bcryptHash(randomService.generateCode(RandomCode.LENGTH));
+                randomCode.persist();
+            }
         }
 
         sleep();

src/main/java/app/fyreplace/api/tasks/CleanupTasks.java

@@ -1,6 +1,7 @@
 package app.fyreplace.api.tasks;
 
 import app.fyreplace.api.data.Comment;
+import app.fyreplace.api.data.Email;
 import app.fyreplace.api.data.Post;
 import app.fyreplace.api.data.RandomCode;
 import app.fyreplace.api.data.User;
@@ -14,7 +15,6 @@
 
 @ApplicationScoped
 public final class CleanupTasks {
-
     @Scheduled(cron = "0 0 0 * * ?")
     @Transactional
     public void scrubSoftDeletedEntities() {
@@ -43,6 +43,13 @@ public void removeOldRandomCodes() {
         RandomCode.delete("dateCreated < ?1", Instant.now().minus(RandomCode.LIFETIME));
     }
 
+    @Scheduled(cron = "0 15 * * * ?")
+    @Transactional
+    public void removeOldUnverifiedEmails() {
+        Email.delete(
+                "from Email e where verified = false and (select count(*) from RandomCode where email.id = e.id) = 0");
+    }
+
     private String scrubConditions(final String... fields) {
         return "scrubbed = false and ("
                 + Stream.concat(Stream.of(""), Arrays.stream(fields).map(field -> field + '.'))

src/test/java/app/fyreplace/api/testing/tasks/cleanup/RemoveOldRandomCodesTests.java

@@ -8,6 +8,7 @@
 import app.fyreplace.api.services.RandomService;
 import app.fyreplace.api.tasks.CleanupTasks;
 import app.fyreplace.api.testing.UserTestsBase;
+import io.quarkus.elytron.security.common.BcryptUtil;
 import io.quarkus.test.junit.QuarkusTest;
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
@@ -28,10 +29,10 @@ public final class RemoveOldRandomCodesTests extends UserTestsBase {
     public void removeOldRandomCodes() {
         final var randomCode = new RandomCode();
         randomCode.email = requireNonNull(User.findByUsername("user_0")).mainEmail;
-        randomCode.code = randomService.generateCode(RandomCode.LENGTH);
+        randomCode.code = BcryptUtil.bcryptHash(randomService.generateCode(RandomCode.LENGTH));
         randomCode.persist();
         final var randomCodeCount = RandomCode.count();
-        RandomCode.update("dateCreated", Instant.now().minus(Duration.ofDays(2)));
+        RandomCode.update("dateCreated = ?1 where id = ?2", Instant.now().minus(Duration.ofDays(2)), randomCode.id);
         cleanupTasks.removeOldRandomCodes();
         assertEquals(randomCodeCount - 1, RandomCode.count());
     }

src/test/java/app/fyreplace/api/testing/tasks/cleanup/RemoveOldUnverifiedEmailsTests.java

@@ -0,0 +1,55 @@
+package app.fyreplace.api.testing.tasks.cleanup;
+
+import static java.util.Objects.requireNonNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import app.fyreplace.api.data.Email;
+import app.fyreplace.api.data.RandomCode;
+import app.fyreplace.api.data.User;
+import app.fyreplace.api.services.RandomService;
+import app.fyreplace.api.tasks.CleanupTasks;
+import app.fyreplace.api.testing.UserTestsBase;
+import io.quarkus.elytron.security.common.BcryptUtil;
+import io.quarkus.test.junit.QuarkusTest;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
+import org.junit.jupiter.api.Test;
+
+@QuarkusTest
+public final class RemoveOldUnverifiedEmailsTests extends UserTestsBase {
+    @Inject
+    RandomService randomService;
+
+    @Inject
+    CleanupTasks cleanupTasks;
+
+    @Test
+    @Transactional
+    public void removeOldUnverifiedEmails() {
+        final var email = new Email();
+        email.user = requireNonNull(User.findByUsername("user_0"));
+        email.email = "unverified@example";
+        email.verified = false;
+        email.persist();
+        final var emailCount = Email.count();
+        cleanupTasks.removeOldUnverifiedEmails();
+        assertEquals(emailCount - 1, Email.count());
+    }
+
+    @Test
+    @Transactional
+    public void removeNewUnverifiedEmails() {
+        final var email = new Email();
+        email.user = requireNonNull(User.findByUsername("user_0"));
+        email.email = "unverified@example";
+        email.verified = false;
+        email.persist();
+        final var emailCount = Email.count();
+        final var randomCode = new RandomCode();
+        randomCode.email = email;
+        randomCode.code = BcryptUtil.bcryptHash(randomService.generateCode(RandomCode.LENGTH));
+        randomCode.persist();
+        cleanupTasks.removeOldUnverifiedEmails();
+        assertEquals(emailCount, Email.count());
+    }
+}