diff --git a/src/main.py b/src/main.py index 651f210..ba73a4e 100644 --- a/src/main.py +++ b/src/main.py @@ -1,5 +1,5 @@ from celery.result import AsyncResult -from fastapi import Body, FastAPI, Depends, Request, HTTPException +from fastapi import FastAPI, Depends, Request, HTTPException from fastapi.encoders import jsonable_encoder from fastapi.responses import JSONResponse, FileResponse from fastapi.staticfiles import StaticFiles @@ -25,7 +25,7 @@ load_dotenv() # Configuration ALLOWED_ORIGINS = os.environ.get("ALLOWED_ORIGINS", "chrome-extension://ondkcheoicfckabcnkdgbepofpjmjcmb,chrome-extension://ojcimmjndnlmmlgnjaeojoebaceokpdp").split(",") -VERSION = "0.5.6" +VERSION = "0.5.7" # min-version refers to the version of auto-archiver-extension on the webstore BREAKING_CHANGES = {"minVersion": "0.3.1", "message": "The latest update has breaking changes, please update the extension to the most recent version."} @@ -90,7 +90,7 @@ def search(skip: int = 0, limit: int = 100, db: Session = Depends(get_db), email return crud.search_tasks_by_email(db, email, skip=skip, limit=limit) @app.post("/tasks", status_code=201) -def archive_tasks(archive:schemas.ArchiveCreate, email = Depends(get_bearer_auth)): +def archive_tasks(archive:schemas.ArchiveCreate, email = Depends(get_bearer_auth_token_or_jwt)): archive.author_id = email url = archive.url logger.info(f"new {archive.public=} task for {email=} and {archive.group_id=}: {url}") diff --git a/src/worker.py b/src/worker.py index 457bc9c..8f010a2 100644 --- a/src/worker.py +++ b/src/worker.py @@ -41,7 +41,7 @@ def create_archive_task(self, archive_json: str): if not archive.rearchive: with get_db() as session: - archives = crud.search_tasks_by_url(session, url, ALLOW_ANY_EMAIL, absolute_search=True) + archives = crud.search_tasks_by_url(session, url, archive.author_id, absolute_search=True) if len(archives): logger.info(f"Skipping {url=} as it was already archived") # TODO: can we achieve something better than the last result?