changes
This commit is contained in:
16
app/views.py
16
app/views.py
@@ -586,10 +586,10 @@ def login(request):
|
||||
need_serializer = False
|
||||
|
||||
if values == None:
|
||||
user = User.objects.filter(username=filter['username']).first()
|
||||
user = User.objects.filter(email=filter['email']).first()
|
||||
need_serializer = True
|
||||
else:
|
||||
user = User.objects.filter(username=filter['username']).values(*values).first()
|
||||
user = User.objects.filter(email=filter['email']).values(*values).first()
|
||||
|
||||
if user == None:
|
||||
return Response(None)
|
||||
@@ -608,15 +608,15 @@ def login(request):
|
||||
#=============================================================================
|
||||
@api_view(['POST'])
|
||||
def signin(request):
|
||||
username = request.data['username']
|
||||
email = request.data['email']
|
||||
password = request.data['password']
|
||||
user = User.objects.filter(username=username).first()
|
||||
user = User.objects.filter(email=email).first()
|
||||
if user:
|
||||
result = check_password(password, user.password)
|
||||
if result == False:
|
||||
return Response("invalid")
|
||||
else:
|
||||
info = User.objects.filter(pk=user.id).values('id','username','avatar','fullname','auth_status','auth_status__code','auth_status__name').first()
|
||||
info = User.objects.filter(pk=user.id).values('id','email','username','avatar','fullname','auth_status','auth_status__code','auth_status__name').first()
|
||||
return Response(info)
|
||||
# invalid
|
||||
return Response(status = status.HTTP_400_BAD_REQUEST)
|
||||
@@ -624,15 +624,15 @@ def signin(request):
|
||||
#=============================================================================
|
||||
@api_view(['POST'])
|
||||
def check_pin(request):
|
||||
username = request.data['username']
|
||||
email = request.data['email']
|
||||
pin = request.data['pin']
|
||||
user = User.objects.filter(username=username).first()
|
||||
user = User.objects.filter(email=email).first()
|
||||
if user:
|
||||
result = check_password(pin, user.pin)
|
||||
if result == False:
|
||||
return Response("invalid")
|
||||
else:
|
||||
info = User.objects.filter(pk=user.id).values('id','username','avatar','fullname','auth_status','auth_status__code','auth_status__name').first()
|
||||
info = User.objects.filter(pk=user.id).values('id','email','username','avatar','fullname','auth_status','auth_status__code','auth_status__name').first()
|
||||
return Response(info)
|
||||
# invalid
|
||||
return Response(status = status.HTTP_400_BAD_REQUEST)
|
||||
|
||||
Reference in New Issue
Block a user