mirror of
https://gitlab.com/MoonTestUse1/AdministrationItDepartmens.git
synced 2025-08-14 00:25:46 +02:00
Fix database
This commit is contained in:
@@ -5,22 +5,28 @@ from sqlalchemy.orm import Session
|
||||
from typing import Optional
|
||||
|
||||
from ..core.config import settings
|
||||
from ..core.test_config import test_settings
|
||||
from ..models.token import Token
|
||||
from ..schemas.auth import TokenData
|
||||
|
||||
def get_settings():
|
||||
"""Get settings based on environment"""
|
||||
return test_settings if test_settings.TESTING else settings
|
||||
|
||||
def create_access_token(data: dict) -> str:
|
||||
"""Create access token"""
|
||||
to_encode = data.copy()
|
||||
expire = datetime.utcnow() + timedelta(minutes=settings.ACCESS_TOKEN_EXPIRE_MINUTES)
|
||||
config = get_settings()
|
||||
expire = datetime.utcnow() + timedelta(minutes=config.ACCESS_TOKEN_EXPIRE_MINUTES)
|
||||
to_encode.update({"exp": expire})
|
||||
encoded_jwt = jwt.encode(to_encode, settings.SECRET_KEY, algorithm=settings.ALGORITHM)
|
||||
encoded_jwt = jwt.encode(to_encode, config.SECRET_KEY, algorithm=config.ALGORITHM)
|
||||
return encoded_jwt
|
||||
|
||||
def verify_token(token: str) -> Optional[int]:
|
||||
"""Verify token and return employee_id"""
|
||||
try:
|
||||
# Проверяем, что токен действителен
|
||||
payload = jwt.decode(token, settings.SECRET_KEY, algorithms=[settings.ALGORITHM])
|
||||
config = get_settings()
|
||||
payload = jwt.decode(token, config.SECRET_KEY, algorithms=[config.ALGORITHM])
|
||||
employee_id = int(payload.get("sub"))
|
||||
if employee_id is None:
|
||||
return None
|
||||
@@ -46,7 +52,10 @@ def create_and_save_token(employee_id: int, db: Session) -> str:
|
||||
# Создаем токен
|
||||
access_token = create_access_token({"sub": str(employee_id)})
|
||||
|
||||
# Сохраняем токен в базу
|
||||
# Удаляем старые токены пользователя
|
||||
db.query(Token).filter(Token.employee_id == employee_id).delete()
|
||||
|
||||
# Сохраняем новый токен в базу
|
||||
db_token = Token(
|
||||
token=access_token,
|
||||
employee_id=employee_id
|
||||
|
Reference in New Issue
Block a user