feat(frontend): ✨ Fix scheduler, forgot password flow, and minor bug fixes (#725)

* feat(frontend): 💄 add recipe title

* fix(frontend): 🐛 fixes #722 side-bar issue

* feat(frontend): ✨ Add page titles to all pages

* minor cleanup

* refactor(backend): ♻️ rewrite scheduler to be more modulare and work

* feat(frontend): ✨ start password reset functionality

* refactor(backend): ♻️ refactor application settings to facilitate dependency injection

* refactor(backend): 🔥 remove RECIPE_SETTINGS env variables in favor of group settings

* formatting

* refactor(backend): ♻️ align naming convention

* feat(backend): ✨ password reset

* test(backend): ✅ password reset

* feat(frontend): ✨ self-service password reset

* purge password schedule

* update user creation for tests

Co-authored-by: Hayden <hay-kot@pm.me>

tests/conftest.py

@@ -1,4 +1,4 @@
-from tests.pre_test import DB_URL, settings  # isort:skip
+from tests.pre_test import settings  # isort:skip
 
 import json
 
@@ -33,7 +33,10 @@ def api_client():
 
     yield TestClient(app)
 
-    DB_URL.unlink(missing_ok=True)
+    try:
+        settings.DB_PROVIDER.db_path.unlink()  # Handle SQLite Provider
+    except Exception:
+        pass
 
 
 @fixture(scope="session")
@@ -94,7 +97,7 @@ def g2_user(admin_token, api_client: requests, api_routes: AppRoutes):
     user_id = json.loads(self_response.text).get("id")
     group_id = json.loads(self_response.text).get("groupId")
 
-    return TestUser(user_id=user_id, group_id=group_id, token=token)
+    return TestUser(user_id=user_id, group_id=group_id, token=token, email=create_data["email"])
 
 
 @fixture(scope="session")
@@ -149,7 +152,9 @@ def unique_user(api_client: TestClient, api_routes: AppRoutes):
     assert token is not None
 
     try:
-        yield TestUser(group_id=user_data.get("groupId"), user_id=user_data.get("id"), token=token)
+        yield TestUser(
+            group_id=user_data.get("groupId"), user_id=user_data.get("id"), email=user_data.get("email"), token=token
+        )
     finally:
         # TODO: Delete User after test
         pass
@@ -170,7 +175,9 @@ def admin_user(api_client: TestClient, api_routes: AppRoutes):
     assert user_data.get("id") is not None
 
     try:
-        yield TestUser(group_id=user_data.get("groupId"), user_id=user_data.get("id"), token=token)
+        yield TestUser(
+            group_id=user_data.get("groupId"), user_id=user_data.get("id"), email=user_data.get("email"), token=token
+        )
     finally:
         # TODO: Delete User after test
         pass

tests/integration_tests/test_migration_routes.py

@@ -5,7 +5,9 @@ from pathlib import Path
 import pytest
 from fastapi.testclient import TestClient
 
-from mealie.core.config import app_dirs
+from mealie.core.config import get_app_dirs
+
+app_dirs = get_app_dirs()
 from tests.app_routes import AppRoutes
 from tests.test_config import TEST_CHOWDOWN_DIR, TEST_NEXTCLOUD_DIR
 

tests/integration_tests/user_tests/test_user_images.py

@@ -2,7 +2,9 @@ from pathlib import Path
 
 from fastapi.testclient import TestClient
 
-from mealie.core.config import app_dirs
+from mealie.core.config import get_app_dirs
+
+app_dirs = get_app_dirs()
 from tests.app_routes import AppRoutes
 
 

tests/integration_tests/user_tests/test_user_password_reset_service.py

@@ -0,0 +1,52 @@
+import json
+
+from fastapi.testclient import TestClient
+
+from mealie.db.db_setup import create_session
+from mealie.services.user_services.password_reset_service import PasswordResetService
+from tests.utils.factories import random_string
+from tests.utils.fixture_schemas import TestUser
+
+
+class Routes:
+    base = "/api/users/reset-password"
+
+    login = "/api/auth/token"
+    self = "/api/users/self"
+
+
+def test_password_reset(api_client: TestClient, unique_user: TestUser):
+    session = create_session()
+
+    service = PasswordResetService(session)
+    token = service.generate_reset_token(unique_user.email)
+
+    new_password = random_string(15)
+
+    payload = {
+        "token": token.token,
+        "email": unique_user.email,
+        "password": new_password,
+        "passwordConfirm": new_password,
+    }
+
+    # Test successful password reset
+    response = api_client.post(Routes.base, json=payload)
+    assert response.status_code == 200
+
+    # Test Login
+    form_data = {"username": unique_user.email, "password": new_password}
+    response = api_client.post(Routes.login, form_data)
+    assert response.status_code == 200
+
+    # Test Token
+    new_token = json.loads(response.text).get("access_token")
+    token = {"Authorization": f"Bearer {new_token}"}
+    response = api_client.get(Routes.self, headers=token)
+    assert response.status_code == 200
+
+    session.close()
+
+    # Test successful password reset
+    response = api_client.post(Routes.base, json=payload)
+    assert response.status_code == 400

tests/pre_test.py

@@ -1,8 +1,10 @@
-from mealie.core.config import determine_sqlite_path, settings
+from mealie.core.config import get_app_dirs, get_app_settings
+from mealie.core.settings.db_providers import SQLiteProvider
 
-DB_URL = determine_sqlite_path(path=True, suffix="test")
-DB_URL.unlink(missing_ok=True)
+settings = get_app_settings()
+app_dirs = get_app_dirs()
+settings.DB_PROVIDER = SQLiteProvider(data_dir=app_dirs.DATA_DIR, prefix="test_")
 
 if settings.DB_ENGINE != "postgres":
     # Monkeypatch Database Testing
-    settings.DB_URL = determine_sqlite_path(path=False, suffix="test")
+    settings.DB_PROVIDER = SQLiteProvider(data_dir=app_dirs.DATA_DIR, prefix="test_")

tests/unit_tests/services/test_email_service.py

@@ -1,6 +1,6 @@
 import pytest
 
-from mealie.core.config import AppSettings
+from mealie.core.config import get_app_settings
 from mealie.services.email import EmailService
 from mealie.services.email.email_senders import ABCEmailSender
 
@@ -27,8 +27,8 @@ class TestEmailSender(ABCEmailSender):
 
 def patch_env(monkeypatch):
     monkeypatch.setenv("SMTP_HOST", "email.mealie.io")
-    monkeypatch.setenv("SMTP_PORT", 587)
-    monkeypatch.setenv("SMTP_TLS", True)
+    monkeypatch.setenv("SMTP_PORT", "587")
+    monkeypatch.setenv("SMTP_TLS", "True")
     monkeypatch.setenv("SMTP_FROM_NAME", "Mealie")
     monkeypatch.setenv("SMTP_FROM_EMAIL", "mealie@mealie.io")
     monkeypatch.setenv("SMTP_USER", "mealie@mealie.io")
@@ -39,13 +39,15 @@ def patch_env(monkeypatch):
 def email_service(monkeypatch) -> EmailService:
     patch_env(monkeypatch)
     email_service = EmailService(TestEmailSender())
-    email_service.settings = AppSettings()
+    get_app_settings.cache_clear()
+    email_service.settings = get_app_settings()
     return email_service
 
 
 def test_email_disabled():
     email_service = EmailService(TestEmailSender())
-    email_service.settings = AppSettings()
+    get_app_settings.cache_clear()
+    email_service.settings = get_app_settings()
     success = email_service.send_test_email(FAKE_ADDRESS)
     assert not success
 

tests/unit_tests/test_config.py

@@ -1,7 +1,6 @@
 import re
-from pathlib import Path
 
-from mealie.core.config import CWD, DATA_DIR, AppDirectories, AppSettings, determine_data_dir, determine_secrets
+from mealie.core.config import get_app_settings
 
 
 def test_default_settings(monkeypatch):
@@ -14,12 +13,11 @@ def test_default_settings(monkeypatch):
     monkeypatch.delenv("API_DOCS", raising=False)
     monkeypatch.delenv("IS_DEMO", raising=False)
 
-    app_settings = AppSettings()
+    get_app_settings.cache_clear()
+    app_settings = get_app_settings()
 
     assert app_settings.DEFAULT_GROUP == "Home"
     assert app_settings.DEFAULT_PASSWORD == "MyPassword"
-    assert app_settings.POSTGRES_USER == "mealie"
-    assert app_settings.POSTGRES_PASSWORD == "mealie"
     assert app_settings.API_PORT == 9000
     assert app_settings.API_DOCS is True
     assert app_settings.IS_DEMO is False
@@ -31,17 +29,14 @@ def test_default_settings(monkeypatch):
 def test_non_default_settings(monkeypatch):
     monkeypatch.setenv("DEFAULT_GROUP", "Test Group")
     monkeypatch.setenv("DEFAULT_PASSWORD", "Test Password")
-    monkeypatch.setenv("POSTGRES_USER", "mealie-test")
-    monkeypatch.setenv("POSTGRES_PASSWORD", "mealie-test")
     monkeypatch.setenv("API_PORT", "8000")
     monkeypatch.setenv("API_DOCS", "False")
 
-    app_settings = AppSettings()
+    get_app_settings.cache_clear()
+    app_settings = get_app_settings()
 
     assert app_settings.DEFAULT_GROUP == "Test Group"
     assert app_settings.DEFAULT_PASSWORD == "Test Password"
-    assert app_settings.POSTGRES_USER == "mealie-test"
-    assert app_settings.POSTGRES_PASSWORD == "mealie-test"
     assert app_settings.API_PORT == 8000
     assert app_settings.API_DOCS is False
 
@@ -51,36 +46,22 @@ def test_non_default_settings(monkeypatch):
 
 def test_default_connection_args(monkeypatch):
     monkeypatch.setenv("DB_ENGINE", "sqlite")
-    app_settings = AppSettings()
-    assert re.match(r"sqlite:////.*mealie/dev/data/mealie_v1.0.0b.db", app_settings.DB_URL)
+    get_app_settings.cache_clear()
+    app_settings = get_app_settings()
+    assert re.match(r"sqlite:////.*mealie/dev/data/*mealie*.db", app_settings.DB_URL)
 
 
 def test_pg_connection_args(monkeypatch):
     monkeypatch.setenv("DB_ENGINE", "postgres")
     monkeypatch.setenv("POSTGRES_SERVER", "postgres")
-    app_settings = AppSettings()
+    get_app_settings.cache_clear()
+    app_settings = get_app_settings()
     assert app_settings.DB_URL == "postgresql://mealie:mealie@postgres:5432/mealie"
 
 
-def test_secret_generation(tmp_path):
-    app_dirs = AppDirectories(CWD, DATA_DIR)
-    assert determine_secrets(app_dirs.DATA_DIR, False) == "shh-secret-test-key"
-    assert determine_secrets(app_dirs.DATA_DIR, True) != "shh-secret-test-key"
-
-    assert determine_secrets(tmp_path, True) != "shh-secret-test-key"
-
-
-def test_set_data_dir():
-    global CWD
-    PROD_DIR = Path("/app/data")
-    DEV_DIR = CWD.parent.parent.joinpath("dev", "data")
-
-    assert determine_data_dir(True) == PROD_DIR
-    assert determine_data_dir(False) == DEV_DIR
-
-
 def test_smtp_enable(monkeypatch):
-    app_settings = AppSettings()
+    get_app_settings.cache_clear()
+    app_settings = get_app_settings()
     assert app_settings.SMTP_ENABLE is False
 
     monkeypatch.setenv("SMTP_HOST", "email.mealie.io")
@@ -91,5 +72,7 @@ def test_smtp_enable(monkeypatch):
     monkeypatch.setenv("SMTP_USER", "mealie@mealie.io")
     monkeypatch.setenv("SMTP_PASSWORD", "mealie-password")
 
-    app_settings = AppSettings()
+    get_app_settings.cache_clear()
+    app_settings = get_app_settings()
+
     assert app_settings.SMTP_ENABLE is True

tests/utils/fixture_schemas.py

@@ -4,6 +4,7 @@ from typing import Any
 
 @dataclass
 class TestUser:
+    email: str
     user_id: int
     group_id: int
     token: Any