fix: Fixes and refactors SignUp, Reset and Mail Services. Closes #62

Author: drorganvidez

.env.docker.example

@@ -2,7 +2,7 @@ FLASK_APP_NAME="UVLHUB.IO(dev)"
 FLASK_ENV=development
 FLASK_APP=app
 SECRET_KEY=dev_test_key_1234567890abcdefghijklmnopqrstu
-DOMAIN=localhost
+SERVER_NAME=localhost
 MARIADB_HOSTNAME=db
 MARIADB_PORT=3306
 MARIADB_DATABASE=uvlhubdb
@@ -13,3 +13,12 @@ MARIADB_ROOT_PASSWORD=uvlhubdb_root_password
 WORKING_DIR=/app/
 REDIS_URL=redis://redis:6379
 REDIS_WORKER_TIMEOUT=180
+MAIL_SERVER="mailhog"
+MAIL_PORT=1025
+MAIL_USE_TLS=False
+MAIL_USE_SSL=False
+MAIL_DEBUG=True
+MAIL_USERNAME=""
+MAIL_PASSWORD=""
+MAIL_DEFAULT_SENDER="dev@mailhog"
+ZENODO_ACCESS_TOKEN=<CHANGE_THIS>

.env.docker.production.example

@@ -2,7 +2,7 @@ FLASK_APP_NAME="UVLHUB.IO"
 FLASK_ENV=production
 FLASK_APP=app
 SECRET_KEY=<CHANGE_THIS>
-DOMAIN=<CHANGE_THIS>
+SERVER_NAME=<CHANGE_THIS>
 MARIADB_HOSTNAME=db
 MARIADB_PORT=3306
 MARIADB_DATABASE=uvlhubdb
@@ -12,4 +12,12 @@ MARIADB_ROOT_PASSWORD=<CHANGE_THIS>
 WEBHOOK_TOKEN=<CHANGE_THIS>
 WORKING_DIR=/app/
 REDIS_URL=redis://redis:6379
-REDIS_WORKER_TIMEOUT=180
+REDIS_WORKER_TIMEOUT=180
+MAIL_SERVER=<CHANGE_THIS>
+MAIL_PORT=<CHANGE_THIS>
+MAIL_USE_TLS=False
+MAIL_USE_SSL=False
+MAIL_USERNAME=<CHANGE_THIS>
+MAIL_PASSWORD=<CHANGE_THIS>
+MAIL_DEFAULT_SENDER=<CHANGE_THIS>
+ZENODO_ACCESS_TOKEN=<CHANGE_THIS>

.env.docker.production.webhook.example

@@ -2,7 +2,7 @@ FLASK_APP_NAME="UVLHUB.IO"
 FLASK_ENV=production
 FLASK_APP=app
 SECRET_KEY=<CHANGE_THIS>
-DOMAIN=<CHANGE_THIS>
+SERVER_NAME=<CHANGE_THIS>
 MARIADB_HOSTNAME=db
 MARIADB_PORT=3306
 MARIADB_DATABASE=uvlhubdb
@@ -13,4 +13,12 @@ WEBHOOK_TOKEN=<CHANGE_THIS>
 WORKING_DIR=/app/
 REDIS_URL=redis://redis:6379
 REDIS_WORKER_TIMEOUT=180
+MAIL_SERVER=<CHANGE_THIS>
+MAIL_PORT=<CHANGE_THIS>
+MAIL_USE_TLS=False
+MAIL_USE_SSL=False
+MAIL_USERNAME=<CHANGE_THIS>
+MAIL_PASSWORD=<CHANGE_THIS>
+MAIL_DEFAULT_SENDER=<CHANGE_THIS>
+ZENODO_ACCESS_TOKEN=<CHANGE_THIS>
 WEBHOOK_TOKEN=<CHANGE_THIS>

.env.local.example

@@ -2,7 +2,7 @@ FLASK_APP_NAME="UVLHUB.IO(dev)"
 FLASK_ENV=development
 FLASK_APP=app
 SECRET_KEY=dev_test_key_1234567890abcdefghijklmnopqrstu
-DOMAIN=localhost:5000
+SERVER_NAME=localhost:5000
 MARIADB_HOSTNAME=localhost
 MARIADB_PORT=3306
 MARIADB_DATABASE=uvlhubdb
@@ -12,4 +12,12 @@ MARIADB_PASSWORD=uvlhubdb_password
 MARIADB_ROOT_PASSWORD=uvlhubdb_root_password
 WORKING_DIR=""
 REDIS_URL=redis://localhost:6379
-REDIS_WORKER_TIMEOUT=180
+REDIS_WORKER_TIMEOUT=180
+MAIL_SERVER=<CHANGE_THIS>
+MAIL_PORT=<CHANGE_THIS>
+MAIL_USE_TLS=False
+MAIL_USE_SSL=False
+MAIL_USERNAME=<CHANGE_THIS>
+MAIL_PASSWORD=<CHANGE_THIS>
+MAIL_DEFAULT_SENDER=<CHANGE_THIS>
+ZENODO_ACCESS_TOKEN=<CHANGE_THIS>

app/__init__.py

@@ -93,9 +93,6 @@ def inject_vars_into_jinja():
         # Add the application version manually
         env_vars["APP_VERSION"] = get_app_version()
 
-        # Ensure DOMAIN variable has a default value if not set
-        env_vars["DOMAIN"] = os.getenv("DOMAIN", "localhost")
-
         # Set Boolean variables for the environment
         flask_env = os.getenv("FLASK_ENV")
         env_vars["DEVELOPMENT"] = flask_env == "development"

app/modules/auth/forms.py

@@ -1,13 +1,20 @@
 from flask_wtf import FlaskForm
 from wtforms import BooleanField, PasswordField, StringField, SubmitField
-from wtforms.validators import DataRequired, Email, Length
+from wtforms.validators import DataRequired, Email, EqualTo, Length
 
 
 class SignupForm(FlaskForm):
     name = StringField("Name", validators=[DataRequired(), Length(max=100)])
     surname = StringField("Surname", validators=[DataRequired(), Length(max=100)])
-    password = PasswordField("Password", validators=[DataRequired()])
     email = StringField("Email", validators=[DataRequired(), Email()])
+    password = PasswordField("Password", validators=[DataRequired(), Length(min=6)])
+    confirm_password = PasswordField(
+        "Confirm Password",
+        validators=[
+            DataRequired(),
+            EqualTo("password", message="Passwords must match."),
+        ],
+    )
     submit = SubmitField("Submit")
 
 

app/modules/auth/repositories.py

@@ -17,5 +17,9 @@ def create(self, commit: bool = True, **kwargs):
             self.session.flush()
         return instance
 
-    def get_by_email(self, email: str, active: bool = True):
-        return self.model.query.filter_by(email=email, active=active).first()
+    def get_by_email(self, email: str, active: bool | None = None):
+        normalized_email = email.strip().lower()
+        query = self.model.query.filter_by(email=normalized_email)
+        if active is not None:
+            query = query.filter_by(active=active)
+        return query.first()

app/modules/auth/routes.py

@@ -1,5 +1,5 @@
 from flask import flash, redirect, render_template, request, url_for
-from flask_login import current_user, logout_user
+from flask_login import current_user, login_user, logout_user
 from pymysql import IntegrityError
 
 from app import db
@@ -10,6 +10,7 @@
 from app.modules.captcha.services import CaptchaService
 from app.modules.confirmemail.services import ConfirmemailService
 from app.modules.profile.services import UserProfileService
+from core.managers.task_queue_manager import TaskQueueManager
 
 authentication_service = AuthenticationService()
 user_profile_service = UserProfileService()
@@ -23,30 +24,34 @@ def signup():
         return redirect(url_for("public.index"))
 
     form = SignupForm()
-    if form.validate_on_submit():
-        user_input = request.form["captcha"]
-        if not captcha_service.validate_captcha(user_input):
-            flash("Please complete the reCAPTCHA", "danger")
-            return render_template("auth/signup_form.html", form=form)
 
-        email = form.email.data
+    if request.method == "POST" and form.validate_on_submit():
+        email = form.email.data.strip().lower()
+
         if not authentication_service.is_email_available(email):
-            flash(f"Email {email} is already in use", "danger")
+            flash(f"The email '{email}' is already registered.", "danger")
+            return render_template("auth/signup_form.html", form=form)
+
+        user_input = request.form.get("captcha", "")
+        if not captcha_service.validate_captcha(user_input):
+            flash("Please complete the CAPTCHA correctly.", "danger")
             return render_template("auth/signup_form.html", form=form)
 
         try:
-            # We try to create the user
             user = authentication_service.create_with_profile(**form.data)
-            confirmemail_service.send_confirmation_email(user.email)
-        except IntegrityError as exc:
-            db.session.rollback()
-            if "Duplicate entry" in str(exc):
-                flash(f"Email {email} is already in use", "danger")
-            else:
-                flash(f"Error creating user: {exc}", "danger")
-            return render_template("auth/signup_form.html", form=form)
+            login_user(user, remember=True)
+            flash("Account created successfully. Welcome!", "success")
 
-        return redirect(url_for("public.index"))
+            print(">>> SIGNUP reached end: before enqueuing email", flush=True)
+
+            task_manager = TaskQueueManager()
+            task_manager.enqueue_task("app.modules.auth.tasks.send_confirmation_email", email=user.email, timeout=10)
+
+            return redirect(url_for("public.index"))
+
+        except IntegrityError:
+            db.session.rollback()
+            flash("An error occurred while creating your account.", "danger")
 
     return render_template("auth/signup_form.html", form=form)
 

app/modules/auth/services.py

@@ -43,25 +43,20 @@ def create_with_profile(self, **kwargs):
             if not surname:
                 raise ValueError("Surname is required.")
 
-            # 🚨 Validación clave
             if not self.is_email_available(email):
                 raise ValueError("This email is already registered. Try logging in or using ORCID.")
 
-            user_data = {
-                "email": email,
-                "password": password,
-                "active": False,
-            }
+            # Crear usuario
+            user = User(email=email, active=True)
+            user.set_password(password)
+            self.repository.session.add(user)
+            self.repository.session.flush()  # garantiza que user.id esté disponible
 
-            profile_data = {
-                "name": name,
-                "surname": surname,
-            }
-
-            user = self.create(commit=False, **user_data)
-            profile_data["user_id"] = user.id
-            self.user_profile_repository.create(**profile_data)
+            # Crear perfil
+            profile = UserProfile(user_id=user.id, name=name, surname=surname)
+            self.repository.session.add(profile)
             self.repository.session.commit()
+
             return user
 
         except Exception as exc:

app/modules/auth/tasks.py

@@ -0,0 +1,21 @@
+import logging
+
+from app import create_app
+from app.modules.confirmemail.services import ConfirmemailService
+
+confirmemail_service = ConfirmemailService()
+
+logger = logging.getLogger(__name__)
+app = create_app()
+
+
+def send_confirmation_email(email: str):
+    """Tarea asíncrona para enviar el correo de confirmación."""
+    logger.info(f"[EMAIL] Enviando correo de confirmación a {email}")
+
+    with app.app_context():
+        try:
+            confirmemail_service.send_confirmation_email(email)
+            logger.info(f"[EMAIL] ✅ Correo de confirmación enviado a {email}")
+        except Exception as e:
+            logger.exception(f"[EMAIL] ❌ Error enviando correo a {email}: {e}")