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>

mealie/routes/admin/admin_about.py

@@ -1,7 +1,8 @@
 from fastapi import APIRouter, Depends
 from sqlalchemy.orm.session import Session
 
-from mealie.core.config import APP_VERSION, get_settings
+from mealie.core.config import get_app_settings
+from mealie.core.settings.static import APP_VERSION
 from mealie.db.database import get_database
 from mealie.db.db_setup import generate_session
 from mealie.schema.admin.about import AdminAboutInfo, AppStatistics, CheckAppConfig
@@ -12,7 +13,7 @@ router = APIRouter(prefix="/about")
 @router.get("", response_model=AdminAboutInfo)
 async def get_app_info():
     """ Get general application information """
-    settings = get_settings()
+    settings = get_app_settings()
 
     return AdminAboutInfo(
         production=settings.PRODUCTION,
@@ -40,7 +41,7 @@ async def get_app_statistics(session: Session = Depends(generate_session)):
 
 @router.get("/check", response_model=CheckAppConfig)
 async def check_app_config():
-    settings = get_settings()
+    settings = get_app_settings()
 
     url_set = settings.BASE_URL != "http://localhost:8080"
 

mealie/routes/admin/admin_email.py

@@ -1,7 +1,7 @@
 from fastapi import APIRouter
 from fastapi_camelcase import CamelModel
 
-from mealie.core.config import get_settings
+from mealie.core.config import get_app_settings
 from mealie.core.root_logger import get_logger
 from mealie.services.email import EmailService
 
@@ -26,7 +26,7 @@ class EmailTest(CamelModel):
 @router.get("", response_model=EmailReady)
 async def check_email_config():
     """ Get general application information """
-    settings = get_settings()
+    settings = get_app_settings()
 
     return EmailReady(ready=settings.SMTP_ENABLE)
 

mealie/routes/app/app_about.py

@@ -1,6 +1,6 @@
 from fastapi import APIRouter
 
-from mealie.core.config import APP_VERSION, get_settings
+from mealie.core.config import APP_VERSION, get_app_settings
 from mealie.schema.admin.about import AppInfo
 
 router = APIRouter(prefix="/about")
@@ -9,7 +9,7 @@ router = APIRouter(prefix="/about")
 @router.get("", response_model=AppInfo)
 async def get_app_info():
     """ Get general application information """
-    settings = get_settings()
+    settings = get_app_settings()
 
     return AppInfo(
         version=APP_VERSION,

mealie/routes/backup_routes.py

@@ -5,7 +5,9 @@ from pathlib import Path
 from fastapi import BackgroundTasks, Depends, File, HTTPException, UploadFile, status
 from sqlalchemy.orm.session import Session
 
-from mealie.core.config import app_dirs
+from mealie.core.config import get_app_dirs
+
+app_dirs = get_app_dirs()
 from mealie.core.dependencies import get_current_user
 from mealie.core.root_logger import get_logger
 from mealie.core.security import create_file_token

mealie/routes/migration_routes.py

@@ -5,7 +5,9 @@ from typing import List
 from fastapi import Depends, File, HTTPException, UploadFile, status
 from sqlalchemy.orm.session import Session
 
-from mealie.core.config import app_dirs
+from mealie.core.config import get_app_dirs
+
+app_dirs = get_app_dirs()
 from mealie.db.db_setup import generate_session
 from mealie.routes.routers import AdminAPIRouter
 from mealie.routes.users.crud import get_logged_in_user

mealie/routes/users/__init__.py

@@ -13,6 +13,7 @@ router.include_router(crud.user_router, prefix=user_prefix, tags=["Users: CRUD"]
 router.include_router(crud.admin_router, prefix=user_prefix, tags=["Users: CRUD"])
 
 router.include_router(passwords.user_router, prefix=user_prefix, tags=["Users: Passwords"])
+router.include_router(passwords.public_router, prefix=user_prefix, tags=["Users: Passwords"])
 
 router.include_router(images.public_router, prefix=user_prefix, tags=["Users: Images"])
 router.include_router(images.user_router, prefix=user_prefix, tags=["Users: Images"])

mealie/routes/users/images.py

@@ -4,7 +4,9 @@ from fastapi import Depends, File, HTTPException, UploadFile, status
 from fastapi.responses import FileResponse
 from fastapi.routing import APIRouter
 
-from mealie.core.config import app_dirs
+from mealie.core.config import get_app_dirs
+
+app_dirs = get_app_dirs()
 from mealie.core.dependencies import get_current_user
 from mealie.routes.routers import UserAPIRouter
 from mealie.routes.users._helpers import assert_user_change_allowed

mealie/routes/users/passwords.py

@@ -1,15 +1,19 @@
-from fastapi import Depends
+from fastapi import APIRouter, Depends
 from sqlalchemy.orm.session import Session
 
-from mealie.core.config import settings
+from mealie.core.config import get_app_settings
 from mealie.core.security import hash_password
 from mealie.db.database import get_database
 from mealie.db.db_setup import generate_session
 from mealie.routes.routers import UserAPIRouter
 from mealie.schema.user import ChangePassword
+from mealie.schema.user.user_passwords import ForgotPassword, ResetPassword
 from mealie.services.user_services import UserService
+from mealie.services.user_services.password_reset_service import PasswordResetService
 
 user_router = UserAPIRouter(prefix="")
+public_router = APIRouter(prefix="")
+settings = get_app_settings()
 
 
 @user_router.put("/{id}/reset-password")
@@ -25,3 +29,17 @@ def update_password(password_change: ChangePassword, user_service: UserService =
     """ Resets the User Password"""
 
     return user_service.change_password(password_change)
+
+
+@public_router.post("/forgot-password")
+def forgot_password(email: ForgotPassword, session: Session = Depends(generate_session)):
+    """ Sends an email with a reset link to the user"""
+    f_service = PasswordResetService(session)
+    return f_service.send_reset_email(email.email)
+
+
+@public_router.post("/reset-password")
+def reset_password(reset_password: ResetPassword, session: Session = Depends(generate_session)):
+    """ Resets the user password"""
+    f_service = PasswordResetService(session)
+    return f_service.reset_password(reset_password.token, reset_password.password)