Skip to content

Commit 4e649ca

Browse files
committed
Rewrote the logout function
1 parent 2f8ff74 commit 4e649ca

File tree

1 file changed

+11
-15
lines changed
  • backend/PyMatcha/routes/api/auth

1 file changed

+11
-15
lines changed

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

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@
2525
from flask_jwt_extended import create_refresh_token
2626
from flask_jwt_extended import get_jti
2727
from flask_jwt_extended import get_jwt_identity
28-
from flask_jwt_extended import get_raw_jwt
2928
from flask_jwt_extended import jwt_refresh_token_required
30-
from flask_jwt_extended import jwt_required
3129
from PyMatcha import ACCESS_TOKEN_EXPIRES
3230
from PyMatcha import redis
3331
from PyMatcha import REFRESH_TOKEN_EXPIRES
@@ -89,17 +87,15 @@ def refresh():
8987
return SuccessOutput("access_token", access_token)
9088

9189

92-
@auth_login_bp.route("/auth/access_revoke", methods=["DELETE"])
93-
@jwt_required
90+
@auth_login_bp.route("/auth/logout", methods=["POST"])
91+
@validate_params({"access_token": str, "refresh_token": str})
9492
def logout():
95-
jti = get_raw_jwt()["jti"]
96-
redis.set("is_revoked_jti:" + jti, "true", ACCESS_TOKEN_EXPIRES * 1.2)
97-
return Success("Access token revoked")
98-
99-
100-
@auth_login_bp.route("/auth/refresh_revoke", methods=["DELETE"])
101-
@jwt_refresh_token_required
102-
def logout2():
103-
jti = get_raw_jwt()["jti"]
104-
redis.set("is_revoked_jti:" + jti, "true", REFRESH_TOKEN_EXPIRES * 1.2)
105-
return Success("Refresh token revoked")
93+
data = request.get_json()
94+
access_token = data["access_token"]
95+
refresh_token = data["refresh_token"]
96+
print(access_token, refresh_token)
97+
access_jti = get_jti(access_token)
98+
refresh_jti = get_jti(refresh_token)
99+
redis.set("is_revoked_jti:" + access_jti, "true", ACCESS_TOKEN_EXPIRES * 1.2)
100+
redis.set("is_revoked_jti:" + refresh_jti, "true", REFRESH_TOKEN_EXPIRES * 1.2)
101+
return Success("Logout successful.")

0 commit comments

Comments
 (0)