Compare commits

..

5 Commits

Author SHA1 Message Date
e07a74384f fix skip 2025-03-14 23:05:55 +01:00
32b6fdacb6 Merge pull request 'fix form' (#59) from feature/persist-token into master
Reviewed-on: #59
2025-03-06 22:32:19 +00:00
2baaf3c126 fix form 2025-03-06 23:31:37 +01:00
86a3d05f7e Merge pull request 'fix form remember_me' (#58) from feature/persist-token into master
Reviewed-on: #58
2025-03-06 22:23:42 +00:00
9fac430654 fix form remember_me 2025-03-06 23:22:38 +01:00
2 changed files with 6 additions and 6 deletions

View File

@@ -84,8 +84,7 @@ async def read_events(
status_code=status.HTTP_400_BAD_REQUEST, status_code=status.HTTP_400_BAD_REQUEST,
detail="`skip` should be >= 0 and `limit` should be > 0 and greater than `skip`.", detail="`skip` should be >= 0 and `limit` should be > 0 and greater than `skip`.",
) )
limit = limit + skip skip = limit * skip
# Initialize filters # Initialize filters
filters = [] filters = []
@@ -166,7 +165,7 @@ async def search_events(
status_code=status.HTTP_400_BAD_REQUEST, status_code=status.HTTP_400_BAD_REQUEST,
detail="`skip` should be >= 0 and `limit` should be > 0 and greater than `skip`.", detail="`skip` should be >= 0 and `limit` should be > 0 and greater than `skip`.",
) )
limit = limit + skip skip = limit * skip
# Initialize filters # Initialize filters
filters = [{"status": {"$eq": status}}] filters = [{"status": {"$eq": status}}]

View File

@@ -1,7 +1,7 @@
from datetime import datetime, timedelta from datetime import datetime, timedelta
from typing import Annotated from typing import Annotated
from fastapi import Depends, FastAPI, HTTPException, status, APIRouter from fastapi import Depends, FastAPI, HTTPException, status, APIRouter, Form
from fastapi.responses import JSONResponse from fastapi.responses import JSONResponse
from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
from ..dependencies import users_token, permissions_checker from ..dependencies import users_token, permissions_checker
@@ -13,10 +13,11 @@ ACCESS_TOKEN_EXPIRE_MINUTES = 30
@router.post("/token", tags=["token"]) @router.post("/token", tags=["token"])
async def login_for_access_token( async def login_for_access_token(
form_data: Annotated[OAuth2PasswordRequestForm, Depends()]): form_data: Annotated[OAuth2PasswordRequestForm, Depends()],
remember_me: bool = Form(False)):
user = users_token.authenticate_user(form_data.username, form_data.password) user = users_token.authenticate_user(form_data.username, form_data.password)
expires_access_token_time = ACCESS_TOKEN_EXPIRE_MINUTES expires_access_token_time = ACCESS_TOKEN_EXPIRE_MINUTES
if form_data.remember_me.lower() in ["true", "1", "yes"]: if remember_me:
expires_access_token_time=120 expires_access_token_time=120
if not user: if not user:
raise HTTPException( raise HTTPException(