Skip to content

Commit

Permalink
Fix registration (3) (#77)
Browse files Browse the repository at this point in the history
What changes:
-) Add is_verified_user to login, register, and verify email response
  • Loading branch information
JohannesSetiawan authored May 28, 2024
1 parent 4144166 commit 7532c5a
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions authentication/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ def post(self, request):
user = authenticate(request, username=new_user.username,password=password)
refresh = RefreshToken.for_user(user)
return Response({'refresh': str(refresh),
'access': str(refresh.access_token)})
'access': str(refresh.access_token),
'is_verified_user': new_user.is_verified_user})


class LoginView(APIView):
Expand All @@ -82,14 +83,17 @@ def post(self, request):
username = request.data.get('username')
password = request.data.get('password')
user = authenticate(request, username=username,password=password)
if user is not None and AppUser.objects.get(id=user.pk).is_verified_user:
refresh = RefreshToken.for_user(user)
return Response({'refresh': str(refresh),
'access': str(refresh.access_token)})
elif user is None:
return Response({'msg': 'Wrong username/password!'}, status=400)
if user is not None:
is_verified = AppUser.objects.get(id=user.pk).is_verified_user
if is_verified:
refresh = RefreshToken.for_user(user)
return Response({'refresh': str(refresh),
'access': str(refresh.access_token),
'is_verified_user': AppUser.objects.get(id=user.pk).is_verified_user})
else:
return Response({'msg': 'You have not verified yet. Please register again and verify your account!'}, status=400)
else:
return Response({'msg': 'You have not verified yet. Please register again and verify your account!'}, status=400)
return Response({'msg': 'Wrong username/password!'}, status=400)

class SendVerificationEmailView(APIView):

Expand Down Expand Up @@ -121,7 +125,7 @@ def post(self, request):
user.save()
UserToken.objects.filter(user=user).delete()
Subscription.objects.create(user=user, plan=Package.objects.get(id=1), start_date=timezone.now(), end_date=timezone.make_aware(datetime(year=9999, month=12, day=31)))
return Response({'message': 'Email verified successfully!'}, status=200)
return Response({'message': 'Email verified successfully!', 'is_verified_user': True}, status=200)
else:
return Response({'msg': 'Expired token!'}, status=400)
except ObjectDoesNotExist:
Expand Down

0 comments on commit 7532c5a

Please sign in to comment.