This commit is contained in:
Chiaki
2017-05-01 16:06:45 +08:00
parent d11f8f9bff
commit ce5c153662
2 changed files with 6 additions and 7 deletions

View File

@@ -66,8 +66,8 @@ class UserRegisterAPI(APIView):
""" """
data = request.data data = request.data
captcha = Captcha(request) captcha = Captcha(request)
# if not captcha.check(data["captcha"]): if not captcha.check(data["captcha"]):
# return self.error("Invalid captcha") return self.error("Invalid captcha")
try: try:
User.objects.get(username=data["username"]) User.objects.get(username=data["username"])
return self.error("Username already exists") return self.error("Username already exists")

View File

@@ -14,9 +14,8 @@ from utils.shortcuts import rand_str
from ..decorators import login_required from ..decorators import login_required
from ..models import User, UserProfile from ..models import User, UserProfile
from ..serializers import (EditUserSerializer, SSOSerializer, from ..serializers import (SSOSerializer, TwoFactorAuthCodeSerializer,
TwoFactorAuthCodeSerializer, UserSerializer, UserSerializer, UserProfileSerializer,
UserProfileSerializer, UserInfoSerializer,
EditUserProfileSerializer, AvatarUploadForm) EditUserProfileSerializer, AvatarUploadForm)
@@ -33,7 +32,7 @@ class UserInfoAPI(APIView):
return self.error("User does not exist") return self.error("User does not exist")
profile = UserProfile.objects.get(user=user) profile = UserProfile.objects.get(user=user)
dit = UserProfileSerializer(profile).data dit = UserProfileSerializer(profile).data
dit['user'] = UserSerializer(user).data dit["user"] = UserSerializer(user).data
return self.success(dit) return self.success(dit)
@@ -49,7 +48,7 @@ class UserProfileAPI(APIView):
return self.error("User does not exist") return self.error("User does not exist")
profile = UserProfile.objects.get(user=user) profile = UserProfile.objects.get(user=user)
dit = UserProfileSerializer(profile).data dit = UserProfileSerializer(profile).data
dit['user'] = UserSerializer(user).data dit["user"] = UserSerializer(user).data
return self.success(dit) return self.success(dit)
@validate_serializer(EditUserProfileSerializer) @validate_serializer(EditUserProfileSerializer)