Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2026-02-14 20:03:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

add soft fail user dependency (#479)

Browse Source 
* add soft fail user dependency

* filter private recipes on get_recipe_summary

* code clean-up

* restrict single recipe

* cleanup dependencies

* add auto_error oauth2 scheme

* update make file

* update make file

* fix early return

* bump python deps

* restrict category/tags

* format deps

Co-authored-by: hay-kot <hay-kot@pm.me>
This commit is contained in:
Hayden
2021-06-10 18:31:14 -08:00
committed by GitHub
parent c2ed4a39ac
commit c175c8e9a0
12 changed files with 477 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mealie/routes/recipe/recipe_crud_routes.py
View File

@@ -6,7 +6,7 @@ from mealie.core.config import settings
from mealie.core.root_logger import get_logger
from mealie.db.database import db
from mealie.db.db_setup import generate_session
from mealie.routes.deps import get_current_user
from mealie.routes.deps import get_current_user, is_logged_in
from mealie.schema.recipe import Recipe, RecipeAsset, RecipeURLIn
from mealie.schema.user import UserInDB
from mealie.services.events import create_recipe_event
@@ -71,18 +71,24 @@ def parse_recipe_url(
@router.get("/{recipe_slug}", response_model=Recipe)
def get_recipe(recipe_slug: str, session: Session = Depends(generate_session)):
def get_recipe(recipe_slug: str, session: Session = Depends(generate_session), is_user: bool = Depends(is_logged_in)):
""" Takes in a recipe slug, returns all data for a recipe """
return db.recipes.get(session, recipe_slug)
recipe: Recipe = db.recipes.get(session, recipe_slug)
if recipe.settings.public or is_user:
return recipe
else:
raise HTTPException(status.HTTP_401_UNAUTHORIZED, {"details": "unauthorized"})
@router.put("/{recipe_slug}")
@router.put("/{recipe_slug}", dependencies=[Depends(get_current_user)])
def update_recipe(
recipe_slug: str,
data: Recipe,
session: Session = Depends(generate_session),
current_user=Depends(get_current_user),
):
""" Updates a recipe by existing slug and data. """
@@ -93,12 +99,11 @@ def update_recipe(
return recipe
@router.patch("/{recipe_slug}")
@router.patch("/{recipe_slug}", dependencies=[Depends(get_current_user)])
def patch_recipe(
recipe_slug: str,
data: Recipe,
session: Session = Depends(generate_session),
current_user=Depends(get_current_user),
):
""" Updates a recipe by existing slug and data. """
@@ -148,18 +153,17 @@ def update_recipe_image(
return {"image": new_version}
@router.post("/{recipe_slug}/image")
@router.post("/{recipe_slug}/image", dependencies=[Depends(get_current_user)])
def scrape_image_url(
recipe_slug: str,
url: RecipeURLIn,
current_user=Depends(get_current_user),
):
""" Removes an existing image and replaces it with the incoming file. """
scrape_image(url.url, recipe_slug)
@router.post("/{recipe_slug}/assets", response_model=RecipeAsset)
@router.post("/{recipe_slug}/assets", response_model=RecipeAsset, dependencies=[Depends(get_current_user)])
def upload_recipe_asset(
recipe_slug: str,
name: str = Form(...),
@@ -167,7 +171,6 @@ def upload_recipe_asset(
extension: str = Form(...),
file: UploadFile = File(...),
session: Session = Depends(generate_session),
current_user=Depends(get_current_user),
):
""" Upload a file to store as a recipe asset """
file_name = slugify(name) + "." + extension