|
1 | 1 | from typing import Union, Literal, Dict, Any
|
2 |
| -from datetime import datetime, timedelta, timezone |
| 2 | +from datetime import datetime, timedelta, UTC |
3 | 3 |
|
4 | 4 | import bcrypt
|
5 | 5 | from sqlalchemy.ext.asyncio import AsyncSession
|
@@ -41,19 +41,19 @@ async def authenticate_user(username_or_email: str, password: str, db: AsyncSess
|
41 | 41 | async def create_access_token(data: dict[str, Any], expires_delta: timedelta | None = None) -> str:
|
42 | 42 | to_encode = data.copy()
|
43 | 43 | if expires_delta:
|
44 |
| - expire = datetime.now(timezone.utc) + expires_delta |
| 44 | + expire = datetime.now(UTC).replace(tzinfo=None) + expires_delta |
45 | 45 | else:
|
46 |
| - expire = datetime.now(timezone.utc) + timedelta(minutes=15) |
| 46 | + expire = datetime.now(UTC).replace(tzinfo=None) + timedelta(minutes=15) |
47 | 47 | to_encode.update({"exp": expire})
|
48 | 48 | encoded_jwt: str = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
|
49 | 49 | return encoded_jwt
|
50 | 50 |
|
51 | 51 | async def create_refresh_token(data: dict[str, Any], expires_delta: timedelta | None = None) -> str:
|
52 | 52 | to_encode = data.copy()
|
53 | 53 | if expires_delta:
|
54 |
| - expire = datetime.now(timezone.utc) + expires_delta |
| 54 | + expire = datetime.now(UTC).replace(tzinfo=None) + expires_delta |
55 | 55 | else:
|
56 |
| - expire = datetime.now(timezone.utc) + timedelta(days=REFRESH_TOKEN_EXPIRE_DAYS) |
| 56 | + expire = datetime.now(UTC).replace(tzinfo=None) + timedelta(days=REFRESH_TOKEN_EXPIRE_DAYS) |
57 | 57 | to_encode.update({"exp": expire})
|
58 | 58 | encoded_jwt: str = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
|
59 | 59 | return encoded_jwt
|
|
0 commit comments