Changed redis key names to something more explicit

Author: Seluj78

backend/PyMatcha/__init__.py

@@ -175,14 +175,14 @@ def jwt_user_callback(identity):
     except NotFoundError:
         # The user who the server issues the token for was deleted in the db.
         return None
-    redis.set("user:" + str(identity["id"]), datetime.datetime.utcnow().timestamp())
+    redis.set("online_user:" + str(identity["id"]), datetime.datetime.utcnow().timestamp())
     return u
 
 
 @jwt.token_in_blacklist_loader
 def check_if_token_is_revoked(decrypted_token):
     jti = decrypted_token["jti"]
-    entry = redis.get("jti:" + jti)
+    entry = redis.get("is_revoked_jti:" + jti)
     if entry is None:
         return True
     return entry == "true"

backend/PyMatcha/routes/api/auth/login.py

@@ -68,11 +68,11 @@ def auth_login():
     access_jti = get_jti(access_token)
     refresh_jti = get_jti(refresh_token)
 
-    redis.set("jti:" + access_jti, "false", ACCESS_TOKEN_EXPIRES * 1.2)
-    redis.set("jti:" + refresh_jti, "false", REFRESH_TOKEN_EXPIRES * 1.2)
+    redis.set("is_revoked_jti:" + access_jti, "false", ACCESS_TOKEN_EXPIRES * 1.2)
+    redis.set("is_revoked_jti:" + refresh_jti, "false", REFRESH_TOKEN_EXPIRES * 1.2)
 
     current_app.logger.debug("/auth/login -> Returning access token for user {}".format(username))
-    redis.set("user:" + str(u.id), datetime.datetime.utcnow().timestamp())
+    redis.set("online_user:" + str(u.id), datetime.datetime.utcnow().timestamp())
     ret = {"access_token": access_token, "refresh_token": refresh_token, "is_profile_completed": u.is_profile_completed}
     return SuccessOutput("return", ret)
 
@@ -83,21 +83,21 @@ def refresh():
     current_user = get_jwt_identity()
     access_token = create_access_token(identity=current_user)
     access_jti = get_jti(encoded_token=access_token)
-    redis.set("jti:" + access_jti, "false", ACCESS_TOKEN_EXPIRES * 1.2)
+    redis.set("is_revoked_jti:" + access_jti, "false", ACCESS_TOKEN_EXPIRES * 1.2)
     return SuccessOutput("access_token", access_token)
 
 
 @auth_login_bp.route("/auth/access_revoke", methods=["DELETE"])
 @jwt_required
 def logout():
     jti = get_raw_jwt()["jti"]
-    redis.set("jti:" + jti, "true", ACCESS_TOKEN_EXPIRES * 1.2)
+    redis.set("is_revoked_jti:" + jti, "true", ACCESS_TOKEN_EXPIRES * 1.2)
     return Success("Access token revoked")
 
 
 @auth_login_bp.route("/auth/refresh_revoke", methods=["DELETE"])
 @jwt_refresh_token_required
 def logout2():
     jti = get_raw_jwt()["jti"]
-    redis.set("jti:" + jti, "true", REFRESH_TOKEN_EXPIRES * 1.2)
+    redis.set("is_revoked_jti:" + jti, "true", REFRESH_TOKEN_EXPIRES * 1.2)
     return Success("Refresh token revoked")

backend/PyMatcha/routes/api/user.py

@@ -59,7 +59,7 @@ def get_all_online_users():
     user_id = None  # noqa
     date_lastseen = None  # noqa
     online_user_list = []
-    for key in redis.scan_iter("user:*"):
+    for key in redis.scan_iter("online_user:*"):
         user_id = str(key).split(":")[1]
         date_lastseen = float(redis.get(key))
         online_user_list.append({"id": user_id, "date_lastseen": date_lastseen})

backend/PyMatcha/utils/tasks.py

@@ -53,7 +53,7 @@ def update_offline_users():
     online_count = 0
     offline_count = 0
     # For all user keys
-    for key in redis.scan_iter("user:*"):
+    for key in redis.scan_iter("online_user:*"):
         # Get the user id
         user_id = str(key).split(":")[1]
         date_lastseen = float(redis.get(key))
@@ -155,4 +155,5 @@ def update_user_recommendations():
             f"user_recommendations:{str(user_to_update.id)}",
             json.dumps(user_to_update_recommendations_sorted, default=default_date_converter),
         )
+        redis.expire(f"user_recommendations:{str(user_to_update.id)}", 3600)
     return f"Successfully updated recommendations for {count} users."