xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add some tests

Browse Source
This commit is contained in:
virusdefender
2016-10-30 02:17:35 +08:00
parent 078de956e5
commit 39857d1b56
118 changed files with 326 additions and 19131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
account/views/admin.py
View File

@@ -4,10 +4,8 @@ from __future__ import unicode_literals
from django.core.exceptions import MultipleObjectsReturned
from django.db.models import Q
from django.utils.translation import ugettext as _
from rest_framework.views import APIView
from utils.shortcuts import (serializer_invalid_response, error_response,
success_response, paginate, rand_str)
from utils.shortcuts import (APIView, paginate_data, rand_str)
from ..decorators import super_admin_required
from ..models import User, AdminType
from ..serializers import (UserSerializer, EditUserSerializer)
@@ -25,21 +23,21 @@ class UserAdminAPIView(APIView):
try:
user = User.objects.get(id=data["id"])
except User.DoesNotExist:
return error_response(_("User does not exist"))
return self.error(_("User does not exist"))
try:
user = User.objects.get(username=data["username"])
if user.id != data["id"]:
return error_response(_("Username already exists"))
return self.error(_("Username already exists"))
except User.DoesNotExist:
pass
try:
user = User.objects.get(email=data["email"])
if user.id != data["id"]:
return error_response(_("Email already exists"))
return self.error(_("Email already exists"))
# Some old data has duplicate email
except MultipleObjectsReturned:
return error_response(_("Email already exists"))
return self.error(_("Email already exists"))
except User.DoesNotExist:
pass
@@ -68,15 +66,10 @@ class UserAdminAPIView(APIView):
user.tfa_token = None
user.two_factor_auth = data["two_factor_auth"]
if data["admin_type"] == AdminType.ADMIN:
user.admin_extra_permission = list(set(data["admin_extra_permission"]))
else:
user.admin_extra_permission = []
user.save()
return success_response(UserSerializer(user).data)
return self.success(UserSerializer(user).data)
else:
return serializer_invalid_response(serializer)
return self.invalid_serializer(serializer)
@super_admin_required
def get(self, request):
@@ -88,8 +81,8 @@ class UserAdminAPIView(APIView):
try:
user = User.objects.get(id=user_id)
except User.DoesNotExist:
return error_response(_("User does not exist"))
return success_response(UserSerializer(user).data)
return self.error(_("User does not exist"))
return self.success(UserSerializer(user).data)
user = User.objects.all().order_by("-create_time")
@@ -98,10 +91,10 @@ class UserAdminAPIView(APIView):
try:
user = user.filter(admin_type__gte=int(admin_type))
except ValueError:
return error_response(_("Invalid parameter"))
return self.error(_("Invalid parameter"))
keyword = request.GET.get("keyword", None)
if keyword:
user = user.filter(Q(username__contains=keyword) |
Q(real_name__contains=keyword) |
Q(email__contains=keyword))
return paginate(request, user, UserSerializer)
return self.success(paginate_data(request, user, UserSerializer))

38
account/views/oj.py
View File

@@ -4,12 +4,10 @@ from __future__ import unicode_literals
from django.contrib import auth
from django.core.exceptions import MultipleObjectsReturned
from django.utils.translation import ugettext as _
from rest_framework.views import APIView
from utils.captcha import Captcha
from utils.otp_auth import OtpAuth
from utils.shortcuts import (serializer_invalid_response, error_response,
success_response)
from utils.shortcuts import (APIView, )
from ..decorators import login_required
from ..models import User, UserProfile
from ..serializers import (UserLoginSerializer, UserRegisterSerializer,
@@ -29,26 +27,26 @@ class UserLoginAPIView(APIView):
if user:
if not user.two_factor_auth:
auth.login(request, user)
return success_response(_("Succeeded"))
return self.success(_("Succeeded"))
# `tfa_code` not in post data
if user.two_factor_auth and "tfa_code" not in data:
return success_response("tfa_required")
return self.success("tfa_required")
if OtpAuth(user.tfa_token).valid_totp(data["tfa_code"]):
auth.login(request, user)
return success_response(_("Succeeded"))
return self.success(_("Succeeded"))
else:
return error_response(_("Invalid two factor verification code"))
return self.error(_("Invalid two factor verification code"))
else:
return error_response(_("Invalid username or password"))
return self.error(_("Invalid username or password"))
else:
return serializer_invalid_response(serializer)
return self.invalid_serializer(serializer)
# todo remove this, only for debug use
def get(self, request):
auth.login(request, auth.authenticate(username=request.GET["username"], password=request.GET["password"]))
return success_response({})
return self.success({})
class UserRegisterAPIView(APIView):
@@ -61,26 +59,26 @@ class UserRegisterAPIView(APIView):
data = serializer.data
captcha = Captcha(request)
if not captcha.check(data["captcha"]):
return error_response(_("Invalid captcha"))
return self.error(_("Invalid captcha"))
try:
User.objects.get(username=data["username"])
return error_response(_("Username already exists"))
return self.error(_("Username already exists"))
except User.DoesNotExist:
pass
try:
User.objects.get(email=data["email"])
return error_response(_("Email already exists"))
return self.error(_("Email already exists"))
# Some old data has duplicate email
except MultipleObjectsReturned:
return error_response(_("Email already exists"))
return self.error(_("Email already exists"))
except User.DoesNotExist:
user = User.objects.create(username=data["username"], email=data["email"])
user.set_password(data["password"])
user.save()
UserProfile.objects.create(user=user)
return success_response(_("Succeeded"))
return self.success(_("Succeeded"))
else:
return serializer_invalid_response(serializer)
return self.invalid_serializer(serializer)
class UserChangePasswordAPIView(APIView):
@@ -94,14 +92,14 @@ class UserChangePasswordAPIView(APIView):
data = serializer.data
captcha = Captcha(request)
if not captcha.check(data["captcha"]):
return error_response(_("Invalid captcha"))
return self.error(_("Invalid captcha"))
username = request.user.username
user = auth.authenticate(username=username, password=data["old_password"])
if user:
user.set_password(data["new_password"])
user.save()
return success_response(_("Succeeded"))
return self.success(_("Succeeded"))
else:
return error_response(_("Invalid old password"))
return self.error(_("Invalid old password"))
else:
return serializer_invalid_response(serializer)
return self.invalid_serializer(serializer)