Merge pull request #229 from KiwiTechLLC/sprint5

login issue
This commit is contained in:
Ankitajain-kiwi
2023-08-20 14:14:45 +05:30
committed by GitHub

View File

@ -310,8 +310,9 @@ class UserLogin(viewsets.ViewSet):
if user is not None: if user is not None:
login(request, user) login(request, user)
if str(user_type) == USER_TYPE_FLAG["TWO"]: if str(user_type) == USER_TYPE_FLAG["TWO"]:
guardian_data = Guardian.objects.filter(user__username=username, is_verified=True).last() guardian_data = Guardian.objects.filter(user__username=username).last()
if guardian_data: if guardian_data:
if guardian_data.is_verified:
serializer = GuardianSerializer( serializer = GuardianSerializer(
guardian_data, context={'user_type': user_type} guardian_data, context={'user_type': user_type}
).data ).data
@ -321,8 +322,9 @@ class UserLogin(viewsets.ViewSet):
response_status=status.HTTP_401_UNAUTHORIZED response_status=status.HTTP_401_UNAUTHORIZED
) )
elif str(user_type) == USER_TYPE_FLAG["FIRST"]: elif str(user_type) == USER_TYPE_FLAG["FIRST"]:
junior_data = Junior.objects.filter(auth__username=username, is_verified=True).last() junior_data = Junior.objects.filter(auth__username=username).last()
if junior_data: if junior_data:
if junior_data.is_verified:
serializer = JuniorSerializer( serializer = JuniorSerializer(
junior_data, context={'user_type': user_type} junior_data, context={'user_type': user_type}
).data ).data