fix: skip lifetime resolution when exp is already provided

Author: sricharan-varanasi

src/apps/authentication/services/security.py

@@ -50,13 +50,13 @@ def token_expiration_minutes(
     @staticmethod
     def create_access_token(data: dict) -> str:
         to_encode = data.copy()
-        minutes = AuthenticationService.token_expiration_minutes(
-            to_encode.get(JWTClaim.client),
-            settings.authentication.access_token.expiration,
-            settings.authentication.access_token.web_admin_expiration,
-        )
-        expire = datetime.now(timezone.utc) + timedelta(minutes=minutes)
-        to_encode.setdefault(JWTClaim.exp, expire)
+        if JWTClaim.exp not in to_encode:
+            minutes = AuthenticationService.token_expiration_minutes(
+                to_encode.get(JWTClaim.client),
+                settings.authentication.access_token.expiration,
+                settings.authentication.access_token.web_admin_expiration,
+            )
+            to_encode[JWTClaim.exp] = datetime.now(timezone.utc) + timedelta(minutes=minutes)
         to_encode.setdefault(JWTClaim.jti, str(uuid.uuid4()))
         encoded_jwt = jwt.encode(
             to_encode,
@@ -134,13 +134,13 @@ def decode_mfa_token(token: str) -> str:
     @staticmethod
     def create_refresh_token(data: dict) -> str:
         to_encode = data.copy()
-        minutes = AuthenticationService.token_expiration_minutes(
-            to_encode.get(JWTClaim.client),
-            settings.authentication.refresh_token.expiration,
-            settings.authentication.refresh_token.web_admin_expiration,
-        )
-        expire = datetime.now(timezone.utc) + timedelta(minutes=minutes)
-        to_encode.setdefault(JWTClaim.exp, expire)
+        if JWTClaim.exp not in to_encode:
+            minutes = AuthenticationService.token_expiration_minutes(
+                to_encode.get(JWTClaim.client),
+                settings.authentication.refresh_token.expiration,
+                settings.authentication.refresh_token.web_admin_expiration,
+            )
+            to_encode[JWTClaim.exp] = datetime.now(timezone.utc) + timedelta(minutes=minutes)
         to_encode.setdefault(JWTClaim.jti, str(uuid.uuid4()))
         encoded_jwt = jwt.encode(
             to_encode,