From de5d360c1c011bc608bab58835f9c0efdb742ff0 Mon Sep 17 00:00:00 2001 From: Jaya Surya Date: Sun, 9 Jul 2023 23:11:14 +0530 Subject: [PATCH] temp --- CDC_Backend/APIs/studentViews.py | 5 +++-- CDC_Backend/APIs/utils.py | 17 ++++++++++++++--- CDC_Backend/CDC_Backend/settings.py | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/CDC_Backend/APIs/studentViews.py b/CDC_Backend/APIs/studentViews.py index b595dd8..b07c3ee 100644 --- a/CDC_Backend/APIs/studentViews.py +++ b/CDC_Backend/APIs/studentViews.py @@ -10,14 +10,16 @@ logger = logging.getLogger('db') @precheck(required_data=[AUTH_CODE]) @get_token() @isAuthorized(allowed_users='*') -def login(request, id, email, user_type, token, refresh_token): +def login(request, email, user_type, token, refresh_token): try: return Response({'action': "Login", 'message': "Verified", "user_type": user_type, "id_token": token, "refresh_token": refresh_token}, status=status.HTTP_200_OK) except: + logger.error("Login Failed") return Response({'action': "Login", 'message': "Something Went Wrong"}, status=status.HTTP_400_BAD_REQUEST) + @api_view(['POST']) @precheck(required_data=[REFRESH_TOKEN]) def refresh(request): @@ -43,7 +45,6 @@ def refresh(request): status=status.HTTP_400_BAD_REQUEST) - @api_view(['GET']) @isAuthorized(allowed_users=[STUDENT]) def studentProfile(request, id, email, user_type): diff --git a/CDC_Backend/APIs/utils.py b/CDC_Backend/APIs/utils.py index 63f2729..edde075 100644 --- a/CDC_Backend/APIs/utils.py +++ b/CDC_Backend/APIs/utils.py @@ -32,11 +32,12 @@ from .models import User, PrePlacementOffer, PlacementApplication, Placement, St logger = logging.getLogger('db') - +import requests def get_token(): def decorator(view_func): def wrapper_func(request, *args, **kwargs): try: + print("one") authcode = request.data[AUTH_CODE] data = { 'code': authcode, @@ -45,23 +46,32 @@ def get_token(): 'redirect_uri': REDIRECT_URI, 'grant_type': 'authorization_code' } - r = rq.post(OAUTH2_API_ENDPOINT, data=data) + print("two") + r = requests.post(OAUTH2_API_ENDPOINT, data=data) + + print(r) if r.status_code == 200: + print("four") response = r.json() token = response[ID_TOKEN] refresh_token = response[REFRESH_TOKEN] request.META["HTTP_AUTHORIZATION"] = "Bearer " + token request.META["MODIFIED"] = "True" kwargs['refresh_token'] = refresh_token + print("five") return view_func(request, *args, **kwargs) else: + print("six") return Response({'action': "Get Token", 'message': "Invalid Auth Code"}, status=status.HTTP_400_BAD_REQUEST) except Exception as e: + print("seven") logger.warning("Get Token: " + str(sys.exc_info())) return Response({'action': "Get Token", 'message': str(e)}, status=status.HTTP_400_BAD_REQUEST) + return wrapper_func + return decorator @@ -117,7 +127,8 @@ def isAuthorized(allowed_users=None): user.save() if len(set(user.user_type).intersection(set(allowed_users))) or allowed_users == '*': if "MODIFIED" in headers: - return view_func(request, user.id, user.email, user.user_type, token_id, *args, **kwargs) + return view_func(request, user.id, user.email, user.user_type, token_id, *args, + **kwargs) else: return view_func(request, user.id, user.email, user.user_type, *args, **kwargs) else: diff --git a/CDC_Backend/CDC_Backend/settings.py b/CDC_Backend/CDC_Backend/settings.py index 7df7fc3..8bbed9f 100644 --- a/CDC_Backend/CDC_Backend/settings.py +++ b/CDC_Backend/CDC_Backend/settings.py @@ -30,7 +30,7 @@ DEBUG = os.environ.get('DEBUG') == "True" ALLOWED_HOSTS = ['cdc.iitdh.ac.in', 'localhost'] -ADMINS = [ ('Karthik Mv', '200010030@iitdh.ac.in')] +ADMINS = [('Karthik Mv', '200010030@iitdh.ac.in')] # Application definition INSTALLED_APPS = [