Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions core/api/auth/auth_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def verify_token(token):
# logger.error(e)
# return None
try:
payload = auth.verify_id_token(token)
payload = auth.verify_id_token(token, check_revoked=True)
except ValueError as err:
raise Exception(
"Unable to verify token"
Expand All @@ -151,7 +151,7 @@ def verify_token(token):
times = times.strip().split("<")
time_ = int(times[1].split('.')[0].strip()) - int(times[0].strip())
time.sleep(time_)
return auth.verify_id_token(token)['user_id']
return auth.verify_id_token(token, check_revoked=True)['user_id']
raise Exception(
err.default_message
) from err
Expand Down Expand Up @@ -244,3 +244,20 @@ def wrapped(*args, **kwargs):
else:
disconnect()
return wrapped


def invalidate_user_tokens(user_id):
try:
auth.revoke_refresh_tokens(user_id)

logger.info(
f"Refresh tokens revoked for user: {user_id}"
)

return True

except Exception as err:
logger.error(
f"Failed to revoke tokens for user {user_id}: {err}"
)
return False
14 changes: 14 additions & 0 deletions core/api/user/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import sys

from . import user
from core.api.auth.auth_helper import invalidate_user_tokens
from core import db
from utils import decode_id
from models.user_models import (
Expand Down Expand Up @@ -172,6 +173,7 @@ def add_app_token(current_user):
def fetch_user(current_user):
""" checks if uid exists """
with db.session() as sess:

schema = UserSchema(session=sess)
return gen_response(
200,
Expand Down Expand Up @@ -358,3 +360,15 @@ def fetch_reviews(current_user):
current_user, sess, per_page=per_page
)
return gen_response(200, reviews)


@user.post('/logout')
@login_required
def logout(current_user):

invalidate_user_tokens(current_user.user_id)

return {
'status': 'success',
'msg': 'User logged out'
}, 200
Loading