Merge branch 'master' into SKIL-518

BackEndFlask/controller/security/CustomDecorators.py

@@ -55,7 +55,7 @@ def verify_token(refresh: bool):
     if not id: raise InvalidQueryParamError("Missing user_id")
     token = request.headers.get('Authorization').split()[1]
     try:
-        decoded_id = decode_token(token)['sub'] if refresh else decode_token(token)['sub'][0]
+        decoded_id = int(decode_token(token)['sub'])
     except:
         raise NoAuthorizationError("No Authorization")
     id = to_int(id, "user_id")

BackEndFlask/controller/security/utility.py

@@ -1,3 +1,4 @@
+import traceback
 from flask import request
 from core  import app
 from jwt   import ExpiredSignatureError
@@ -18,10 +19,10 @@
 # jwt expires in 15mins; refresh token expires in 30days
 def create_tokens(user_i_d: any) -> 'tuple[str, str]':
     with app.app_context():
-        jwt = create_access_token([user_i_d])
+        jwt = create_access_token(str(user_i_d))
         refresh = request.args.get('refresh_token')
         if not refresh:
-            refresh = create_refresh_token(user_i_d)
+            refresh = create_refresh_token(str(user_i_d))
     return jwt, refresh
 
 # Takes away jwt and refresh tokens from response
@@ -52,8 +53,7 @@ def token_expired(thing: str) -> bool:
 # Function returns the user_id from the sub of the jwt
 def token_user_id(thing: str, refresh: bool = False) -> int:
     with app.app_context():
-        if refresh: return decode_token(thing)['sub']
-        return decode_token(thing)['sub'][0]
+        return int(decode_token(thing)['sub'])
 
 # Handles conversion issues and warns front end of problems
 def to_int(thing: str , subject: str) -> int: