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

更新单点登录的逻辑

Browse Source
This commit is contained in:
virusdefender
2016-02-18 08:56:50 +08:00
parent 1f7f61616c
commit 09ccaf5290
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
account/serializers.py
View File

@@ -65,6 +65,7 @@ class ResetPasswordSerializer(serializers.Serializer):
class SSOSerializer(serializers.Serializer): class SSOSerializer(serializers.Serializer):
appkey = serializers.CharField(max_length=35)
token = serializers.CharField(max_length=40) token = serializers.CharField(max_length=40)

12
account/views.py
View File

@@ -327,8 +327,9 @@ class ApplyResetPasswordAPIView(APIView):
email_template = email_template.replace("{{ username }}", user.username). \ email_template = email_template.replace("{{ username }}", user.username). \
replace("{{ website_name }}", settings.WEBSITE_INFO["website_name"]). \ replace("{{ website_name }}", settings.WEBSITE_INFO["website_name"]). \
replace("{{ link }}", request.scheme + "://" + request.META[ replace("{{ link }}", request.scheme + "://"
'HTTP_HOST'] + "/reset_password/t/" + user.reset_password_token) + request.META['HTTP_HOST'] + "/reset_password/t/" +
user.reset_password_token)
_send_email.delay(settings.WEBSITE_INFO["website_name"], _send_email.delay(settings.WEBSITE_INFO["website_name"],
user.email, user.email,
@@ -380,11 +381,16 @@ class SSOAPIView(APIView):
def post(self, request): def post(self, request):
serializer = SSOSerializer(data=request.data) serializer = SSOSerializer(data=request.data)
if serializer.is_valid(): if serializer.is_valid():
try:
User.objects.get(openapi_appkey=serializer.data["appkey"])
except User.DoesNotExist:
return error_response(u"appkey无效")
try: try:
user = User.objects.get(auth_token=serializer.data["token"]) user = User.objects.get(auth_token=serializer.data["token"])
user.auth_token = None user.auth_token = None
user.save() user.save()
return success_response({"username": user.username, return success_response({"username": user.username,
"id": user.id,
"admin_type": user.admin_type, "admin_type": user.admin_type,
"avatar": user.userprofile.avatar}) "avatar": user.userprofile.avatar})
except User.DoesNotExist: except User.DoesNotExist:
@@ -395,7 +401,7 @@ class SSOAPIView(APIView):
@login_required @login_required
def get(self, request): def get(self, request):
callback = request.GET.get("callback", None) callback = request.GET.get("callback", None)
if not callback or callback != settings.SSO["callback"]: if not callback:
return error_page(request, u"参数错误") return error_page(request, u"参数错误")
token = rand_str() token = rand_str()
request.user.auth_token = token request.user.auth_token = token

10
oj/custom_settings.example.py
View File

@@ -5,12 +5,10 @@ import os
SECRET_KEY = None SECRET_KEY = None
SSO = {"callback": "https://xxxxxxxxx/login"} WEBSITE_INFO = {"website_name": u"example大学 OnlineJudge",
"website_name_shortcut": u"example oj",
WEBSITE_INFO = {"website_name": u"xx大学 OnlineJudge", "website_footer": u"example大学信息学院<a href=\"http://www.miibeian.gov.cn/\">京ICP备xxxxx号-1</a>",
"website_name_shortcut": u"qduoj", "url": u"https://your-domain-or-ip.com"}
"website_footer": u"xx大学xx学院<a href=\"http://www.miibeian.gov.cn/\">京ICP备xxxxx号-1</a>",
"url": u"https://your-domain.com"}
SMTP_CONFIG = {"smtp_server": "smtp.xxx.com", SMTP_CONFIG = {"smtp_server": "smtp.xxx.com",