fix: fixed indentation exception in core-api

ful1e5 · Nov 21, 2023 · fb67632 · fb67632
1 parent 1025a84
commit fb67632
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 19 deletions.
diff --git a/core/utils/token.py b/core/utils/token.py
@@ -46,6 +46,9 @@ def as_token(data) -> Union[None, AuthToken]:
 
 
 def decode_token(token: str, logger: Union[Logger, None] = None):
+    def log_error(e):
+        logger.error(e) if logger else None
+
     try:
         payload = jwt.decode(token, SECRET, algorithms=["HS256"], leeway=10)
         auth = as_token(payload)
@@ -54,26 +57,20 @@ def decode_token(token: str, logger: Union[Logger, None] = None):
         else:
             return "invalid"
     except jwt.ExpiredSignatureError as e:
-        if logger:
-            logger.error(
-                f"Expired Token: {e}\n token:{token}",
-            )
+        log_error(e)
         return "expired"
     except jwt.InvalidTokenError as e:
-        if logger:
-            logger.error(
-                f"Inavlid Token: {e}\n token:{token}",
-            )
+        log_error(e)
         return "invalid"
     except Exception as e:
-        if logger:
-            logger.error(
-                f"Exception on decode: {e}\n token:{token}",
-            )
+        log_error(e)
         return "invalid"
 
 
 def decode_auth_header(logger: Union[Logger, None] = None):
+    def log_error(e):
+        logger.error(e) if logger else None
+
     unauth = jsonify({"status": 401, "error": ["Unauthorized"]})
     invalid = jsonify({"status": 401, "error": ["Invalid Token"]})
     expired = jsonify({"status": 401, "error": ["Expired Token"]})
@@ -91,10 +88,7 @@ def decode_auth_header(logger: Union[Logger, None] = None):
             else:
                 return auth
         except Exception as e:
-            if logger:
-                logger.error(
-                    f"Exception on parsing: {e}\n token:{token}",
-                )
+            log_error(f"Exception on parsing: {e}\n token:{token}")
             return internal_error, 500
 
     else:

diff --git a/src/utils/auth/token.ts b/src/utils/auth/token.ts
@@ -8,9 +8,9 @@ import { JWTToken } from 'bibata/misc';
 const SECRET_KEY = process.env.NEXT_PUBLIC_JWT_SECRET;
 export const genAccessToken = (user?: User) => {
   const token_id = v4();
-
-  let payload = { token_id, role: 'ANONYMOUS' };
-  if (user) payload = { token_id, ...user };
+  const iat = Math.floor(Date.now() / 1000);
+  let payload = { iat, token_id, role: 'ANONYMOUS' };
+  if (user) payload = { iat, token_id, ...user };
 
   const token = jwt.sign(payload, process.env.NEXT_PUBLIC_JWT_SECRET, {
     algorithm: 'HS256'