mirror of
https://github.com/mealie-recipes/mealie.git
synced 2025-12-28 21:15:26 -05:00
Refactor/user database models (#775)
* fix build error * drop frontend.old * improve auto_init decorator * purge depreciated site settings * formatting * update init function * fix(backend): 🐛 Fix password reset bug Co-authored-by: Hayden <hay-kot@pm.me>
This commit is contained in:
@@ -5,7 +5,6 @@ from mealie.core.dependencies import get_current_user
|
||||
from mealie.db.database import get_database
|
||||
from mealie.db.db_setup import generate_session
|
||||
from mealie.routes.routers import AdminAPIRouter
|
||||
from mealie.schema.admin import SiteSettings
|
||||
from mealie.schema.user import GroupInDB, PrivateUser
|
||||
from mealie.utils.post_webhooks import post_webhooks
|
||||
|
||||
@@ -21,16 +20,6 @@ def get_main_settings(session: Session = Depends(generate_session)):
|
||||
return db.settings.get(1)
|
||||
|
||||
|
||||
@admin_router.put("")
|
||||
def update_settings(
|
||||
data: SiteSettings,
|
||||
session: Session = Depends(generate_session),
|
||||
):
|
||||
""" Returns Site Settings """
|
||||
db = get_database(session)
|
||||
db.settings.update(1, data.dict())
|
||||
|
||||
|
||||
@admin_router.post("/webhooks/test")
|
||||
def test_webhooks(
|
||||
current_user: PrivateUser = Depends(get_current_user),
|
||||
|
||||
@@ -24,10 +24,9 @@ async def reset_user_password(id: int, session: Session = Depends(generate_sessi
|
||||
db.users.update_password(id, new_password)
|
||||
|
||||
|
||||
@user_router.put("/{id}/password")
|
||||
@user_router.put("/{item_id}/password")
|
||||
def update_password(password_change: ChangePassword, user_service: UserService = Depends(UserService.write_existing)):
|
||||
""" Resets the User Password"""
|
||||
|
||||
return user_service.change_password(password_change)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user