From 00a75f154e001f72f2d200aa39f57057d280965e Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Wed, 21 Feb 2024 01:14:58 -0500
Subject: [PATCH] [F] Fix asking for email confirmation when email feature is
 disabled

---
 src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt b/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt
index 06af4dcb..63cc7c75 100644
--- a/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt
+++ b/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt
@@ -1,15 +1,9 @@
 package icu.samnyan.aqua.net
 
 import ext.*
-import icu.samnyan.aqua.net.components.EmailService
-import icu.samnyan.aqua.net.components.GeoIP
-import icu.samnyan.aqua.net.components.JWT
-import icu.samnyan.aqua.net.components.TurnstileService
-import icu.samnyan.aqua.net.db.AquaNetUser
-import icu.samnyan.aqua.net.db.AquaNetUserRepo
-import icu.samnyan.aqua.net.db.AquaUserValidator
+import icu.samnyan.aqua.net.components.*
+import icu.samnyan.aqua.net.db.*
 import icu.samnyan.aqua.net.db.AquaUserValidator.Companion.SETTING_FIELDS
-import icu.samnyan.aqua.net.db.EmailConfirmationRepo
 import icu.samnyan.aqua.net.utils.SUCCESS
 import icu.samnyan.aqua.sega.general.dao.CardRepository
 import icu.samnyan.aqua.sega.general.model.Card
@@ -33,6 +27,7 @@ class UserRegistrar(
     val cardRepo: CardRepository,
     val cardService: CardService,
     val validator: AquaUserValidator,
+    val emailProps: EmailProperties
 ) {
     companion object {
         // Random long with length 17 (10^18 possibilities)
@@ -103,7 +98,7 @@ class UserRegistrar(
         if (!hasher.matches(password, user.pwHash)) 400 - "Invalid password"
 
         // Check if email is verified
-        if (!user.emailConfirmed) {
+        if (!user.emailConfirmed && emailProps.enable) {
             // Check if last confirmation email was sent within a minute
             val confirmations = async { confirmationRepo.findByAquaNetUserAuId(user.auId) }
             val lastConfirmation = confirmations.maxByOrNull { it.createdAt }