app/dependencies/users_token.py

@@ -12,20 +12,11 @@ from ..dependencies import database, cookie
 
 SECRET_KEY = "09d25e094faa6ca2556c818166b7a9563b93f7099f6f0f4caa6cf63b88e8d3e7"
 ALGORITHM = "HS256"
-ACCESS_TOKEN_EXPIRE_MINUTES = 30
 
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
 
 oauth2_scheme = cookie.OAuth2PasswordBearerWithCookie(tokenUrl="token")
 
-def create_access_token(data: dict, expires_delta: timedelta | None = None):
-    to_encode = data.copy()
-    expire = datetime.utcnow() + (expires_delta or timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES))
-    to_encode.update({"exp": expire})
-    encoded_jwt = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
-    return encoded_jwt
-
-
 def verify_password(plain_password, hashed_password):
     return pwd_context.verify(plain_password, hashed_password)
 

app/routers/events.py

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

app/routers/token.py

@@ -1,7 +1,7 @@
 from datetime import datetime, timedelta
 
 from typing import Annotated
-from fastapi import Depends, FastAPI, HTTPException, status, APIRouter, Form
+from fastapi import Depends, FastAPI, HTTPException, status, APIRouter
 from fastapi.responses import JSONResponse
 from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
 from ..dependencies import users_token, permissions_checker
@@ -13,19 +13,15 @@ ACCESS_TOKEN_EXPIRE_MINUTES = 30
 
 @router.post("/token", tags=["token"])
 async def login_for_access_token(
-    form_data: Annotated[OAuth2PasswordRequestForm, Depends()],
-    remember_me: bool = Form(False)):
+    form_data: Annotated[OAuth2PasswordRequestForm, Depends()]):
     user = users_token.authenticate_user(form_data.username, form_data.password)
-    expires_access_token_time = ACCESS_TOKEN_EXPIRE_MINUTES
-    if remember_me:
-        expires_access_token_time=120
     if not user:
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
             detail="Incorrect username or password",
             headers={"WWW-Authenticate": "Bearer"},
         )
-    access_token_expires = timedelta(minutes=expires_access_token_time)
+    access_token_expires = timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
     access_token = users_token.create_access_token(
         data={"sub": user.username}, expires_delta=access_token_expires
     )