backend-events + code-cleanup (#395)

* additional server events

* sort 'recent recipes' by updated

* remove duplicate code

* fixes #396

* set color

* consolidate tag/category pages

* set colors

* list unorganized recipes

* cleanup old code

* remove flash message, switch to global snackbar

* cancel to close

* cleanup

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

mealie/routes/users/auth.py

@@ -1,4 +1,4 @@
-from fastapi import APIRouter, Depends, status
+from fastapi import APIRouter, Depends, Request, status
 from fastapi.exceptions import HTTPException
 from fastapi.security import OAuth2PasswordRequestForm
 from mealie.core import security
@@ -6,6 +6,7 @@ from mealie.core.security import authenticate_user
 from mealie.db.db_setup import generate_session
 from mealie.routes.deps import get_current_user
 from mealie.schema.user import UserInDB
+from mealie.services.events import create_user_event
 from sqlalchemy.orm.session import Session
 
 router = APIRouter(prefix="/api/auth", tags=["Authentication"])
@@ -14,6 +15,7 @@ router = APIRouter(prefix="/api/auth", tags=["Authentication"])
 @router.post("/token/long")
 @router.post("/token")
 def get_token(
+    request: Request,
     data: OAuth2PasswordRequestForm = Depends(),
     session: Session = Depends(generate_session),
 ):
@@ -23,6 +25,7 @@ def get_token(
     user = authenticate_user(session, email, password)
 
     if not user:
+        create_user_event("Failed Login", f"Username: {email}, Source IP: '{request.client.host}'")
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
             headers={"WWW-Authenticate": "Bearer"},

mealie/routes/users/crud.py

@@ -9,7 +9,7 @@ from mealie.db.database import db
 from mealie.db.db_setup import generate_session
 from mealie.routes.deps import get_current_user
 from mealie.schema.user import ChangePassword, UserBase, UserIn, UserInDB, UserOut
-from mealie.services.events import create_sign_up_event
+from mealie.services.events import create_user_event
 from sqlalchemy.orm.session import Session
 
 router = APIRouter(prefix="/api/users", tags=["Users"])
@@ -23,7 +23,7 @@ async def create_user(
 ):
 
     new_user.password = get_password_hash(new_user.password)
-    create_sign_up_event("User Created", f"Created by {current_user.full_name}", session=session)
+    create_user_event("User Created", f"Created by {current_user.full_name}", session=session)
     return db.users.create(session, new_user.dict())
 
 
@@ -150,5 +150,6 @@ async def delete_user(
     if current_user.id == id or current_user.admin:
         try:
             db.users.delete(session, id)
+            create_user_event("User Deleted", f"User ID: {id}", session=session)
         except Exception:
             raise HTTPException(status.HTTP_400_BAD_REQUEST)

mealie/routes/users/sign_up.py

@@ -7,7 +7,7 @@ from mealie.db.db_setup import generate_session
 from mealie.routes.deps import get_current_user
 from mealie.schema.sign_up import SignUpIn, SignUpOut, SignUpToken
 from mealie.schema.user import UserIn, UserInDB
-from mealie.services.events import create_sign_up_event
+from mealie.services.events import create_user_event
 from sqlalchemy.orm.session import Session
 
 router = APIRouter(prefix="/api/users/sign-ups", tags=["User Signup"])
@@ -39,7 +39,7 @@ async def create_user_sign_up_key(
         "name": key_data.name,
         "admin": key_data.admin,
     }
-    create_sign_up_event("Sign-up Token Created", f"Created by {current_user.full_name}", session=session)
+    create_user_event("Sign-up Token Created", f"Created by {current_user.full_name}", session=session)
     return db.sign_ups.create(session, sign_up)
 
 
@@ -62,7 +62,7 @@ async def create_user_with_token(
     db.users.create(session, new_user.dict())
 
     # DeleteToken
-    create_sign_up_event("Sign-up Token Used", f"New User {new_user.full_name}", session=session)
+    create_user_event("Sign-up Token Used", f"New User {new_user.full_name}", session=session)
     db.sign_ups.delete(session, token)