From: Adam Dullage Date: Wed, 26 Jul 2023 11:24:53 +0000 (+0100) Subject: Remove async from path functions X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=b5e4371ee70c345e27dd1bf7dc0aae4174175e53;p=flatnotes.git Remove async from path functions --- diff --git a/flatnotes/auth.py b/flatnotes/auth.py index ff426fc..952a898 100644 --- a/flatnotes/auth.py +++ b/flatnotes/auth.py @@ -23,7 +23,7 @@ def create_access_token(data: dict): return encoded_jwt -async def validate_token(token: str = Depends(oauth2_scheme)): +def validate_token(token: str = Depends(oauth2_scheme)): if config.auth_type == AuthType.NONE: return try: diff --git a/flatnotes/main.py b/flatnotes/main.py index d4a5966..c9bdc2b 100644 --- a/flatnotes/main.py +++ b/flatnotes/main.py @@ -45,7 +45,7 @@ if config.auth_type == AuthType.TOTP: @app.post("/api/token") -async def token(data: LoginModel): +def token(data: LoginModel): global last_used_totp username_correct = secrets.compare_digest( @@ -81,14 +81,14 @@ async def token(data: LoginModel): @app.get("/search") @app.get("/new") @app.get("/note/{title}") -async def root(title: str = ""): +def root(title: str = ""): with open("flatnotes/dist/index.html", "r", encoding="utf-8") as f: html = f.read() return HTMLResponse(content=html) @app.post("/api/notes", response_model=NoteModel) -async def post_note(data: NoteModel, _: str = Depends(validate_token)): +def post_note(data: NoteModel, _: str = Depends(validate_token)): """Create a new note.""" try: note = Note(flatnotes, data.title, new=True) @@ -101,7 +101,7 @@ async def post_note(data: NoteModel, _: str = Depends(validate_token)): @app.get("/api/notes/{title}", response_model=NoteModel) -async def get_note( +def get_note( title: str, include_content: bool = True, _: str = Depends(validate_token), @@ -117,7 +117,7 @@ async def get_note( @app.patch("/api/notes/{title}", response_model=NoteModel) -async def patch_note( +def patch_note( title: str, new_data: NotePatchModel, _: str = Depends(validate_token) ): try: @@ -136,7 +136,7 @@ async def patch_note( @app.delete("/api/notes/{title}") -async def delete_note(title: str, _: str = Depends(validate_token)): +def delete_note(title: str, _: str = Depends(validate_token)): try: note = Note(flatnotes, title) note.delete() @@ -147,13 +147,13 @@ async def delete_note(title: str, _: str = Depends(validate_token)): @app.get("/api/tags") -async def get_tags(_: str = Depends(validate_token)): +def get_tags(_: str = Depends(validate_token)): """Get a list of all indexed tags.""" return flatnotes.get_tags() @app.get("/api/search", response_model=List[SearchResultModel]) -async def search( +def search( term: str, sort: Literal["score", "title", "lastModified"] = "score", order: Literal["asc", "desc"] = "desc", @@ -172,7 +172,7 @@ async def search( @app.get("/api/config", response_model=ConfigModel) -async def get_config(): +def get_config(): """Retrieve server-side config required for the UI.""" return ConfigModel.dump(config)