Fix auth flow

.env.example

@@ -28,8 +28,6 @@ JWT_ISSUER=xxx
 # time in minutes
 OTP_LIFETIME=10
 
-GATEWAY_PUBLIC_KEY='XXXXXXXXXXXXXXXXXXX'
-GATEWAY_KEY_TTL=2
 
 GATEWAY_PUBLIC_KEY='XXXXXXXXXXXXXXXXXXX'
 GATEWAY_KEY_TTL=2

src/api/middlewares/GateWayMiddleware.py

@@ -46,7 +46,7 @@ def authenticate(self, request: HttpRequest, key: str | None) -> str | None:
             "signature": api_signature,
             "timestamp": api_timestamp,
             "key": valid_api_key,
-            "ttl": 5,
+            "ttl": api_gateway["ttl"],
             "title": SIGNATURE_SOURCES["gateway"],
         }
 

src/api/routes/__init__.py

@@ -61,5 +61,5 @@ async def home(request: HttpRequest) -> dict:
 
 api.add_router("/auth", "src.api.routes.Auth.router", tags=["Auth"])
 api.add_router(
-    "/password/reset", "src.api.routes.PasswordReset.router", tags=["Password"]
+    "/auth/password/reset", "src.api.routes.PasswordReset.router", tags=["Password"]
 )

src/api/services/UtilityService.py

@@ -2,7 +2,7 @@
 import hashlib
 from uuid import uuid4
 from typing import TypedDict
-from datetime import datetime, timedelta
+from datetime import UTC, datetime, timedelta
 
 import jwt
 import bcrypt
@@ -138,9 +138,9 @@ def verify_signature(signature_data: SignatureData, logger: Logger) -> bool:
             )
             raise AuthenticationError(message=message)
 
-        initial_time = datetime.fromtimestamp(float(timestamp) / 1000)
+        initial_time = datetime.fromtimestamp(float(timestamp), UTC)
         valid_window = initial_time + timedelta(minutes=ttl)
-        if valid_window < datetime.now():
+        if valid_window < datetime.now(UTC):
             message = "Signature expired!"
             logger.error(
                 {
@@ -155,5 +155,5 @@ def verify_signature(signature_data: SignatureData, logger: Logger) -> bool:
 
     @staticmethod
     def get_timestamp() -> str:
-        current_time = datetime.now().timestamp() * 1000
+        current_time = datetime.now(UTC).timestamp()
         return str(current_time)

src/env.py

@@ -118,8 +118,8 @@ class Queue(TypedDict):
 }
 
 queue: Queue = {
-    "key": get_env_str("QUEUE_SECRECT_KEY"),
-    "ttl": get_env_float("QUEUE_SECRECT_KEY_TTL"),
+    "key": get_env_str("QUEUE_SECRET_KEY"),
+    "ttl": get_env_float("QUEUE_SECRET_KEY_TTL"),
 }
 
 otp: OTP = {"lifetime": get_env_int("OTP_LIFETIME")}