From f8677f4966e6f7d5b2c61d487bda1b6c335f58a8 Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Thu, 27 Aug 2015 22:26:00 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=90=8E=E7=AB=AF-=E5=89=8D=E5=8F=B0]?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E6=B3=A8=E9=94=80=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD,=E8=BF=99=E4=B8=AA=E5=B9=B6=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=81=9A=E6=88=90api,=E6=84=9F=E8=A7=89=E8=BF=99=E4=B8=AA?=
 =?UTF-8?q?=E5=81=9A=E6=88=90api=E5=8F=AF=E8=83=BD=E6=B2=A1=E4=BB=80?=
 =?UTF-8?q?=E4=B9=88=E5=BF=85=E8=A6=81...=E6=89=80=E4=BB=A5=E5=B9=B2?=
 =?UTF-8?q?=E8=84=86=E5=86=99=E4=BA=86=E5=9C=B0=E5=9D=80=E9=87=8D=E5=AE=9A?=
 =?UTF-8?q?=E5=90=91=E5=88=B0=E9=A6=96=E9=A1=B5=E4=BA=86,=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E9=80=9A=E8=BF=87account.tests.py?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 account/tests.py | 15 +++++++++++++++
 account/views.py |  5 +++++
 oj/urls.py       |  3 ++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/account/tests.py b/account/tests.py
index a75d2c5..f8cc9d0 100644
--- a/account/tests.py
+++ b/account/tests.py
@@ -369,3 +369,18 @@ class AdminRequiredDecoratorTest(TestCase):
         self.client.login(username="test", password="test")
         response = self.client.get("/admin_required_test/cbv/1024/")
         self.assertEqual(response.content, "1024")
+
+
+class UserLogoutTest(TestCase):
+    def setUp(self):
+        self.client = Client()
+        user = User.objects.create(username="test")
+        user.admin_type = 1
+        user.set_password("1")
+        user.save()
+
+    def logout_success(self):
+        self.client = Client()
+        self.client.login(username="test", password="1")
+        response = self.client.get("/logout/")
+        self.assertEqual(response.status_code, 302)
diff --git a/account/views.py b/account/views.py
index f2c6ca3..c1f0cb9 100644
--- a/account/views.py
+++ b/account/views.py
@@ -1,4 +1,5 @@
 # coding=utf-8
+from django import http
 from django.contrib import auth
 from django.shortcuts import render
 from django.db.models import Q
@@ -35,6 +36,10 @@ class UserLoginAPIView(APIView):
             return serializer_invalid_response(serializer)
 
 
+def Logout(request):
+    auth.logout(request)
+    return http.HttpResponseRedirect("/")
+
 class UserRegisterAPIView(APIView):
     def post(self, request):
         """
diff --git a/oj/urls.py b/oj/urls.py
index 74a44c2..aeab5b2 100644
--- a/oj/urls.py
+++ b/oj/urls.py
@@ -5,7 +5,7 @@ from django.views.generic import TemplateView
 
 from account.views import (UserLoginAPIView, UsernameCheckAPIView, UserRegisterAPIView,
                            UserChangePasswordAPIView, EmailCheckAPIView,
-                           UserAdminAPIView, UserInfoAPIView)
+                           UserAdminAPIView, UserInfoAPIView, Logout)
 from announcement.views import AnnouncementAdminAPIView
 
 from contest.views import ContestAdminAPIView, ContestProblemAdminAPIView, ContestPasswordVerifyAPIView
@@ -34,6 +34,7 @@ urlpatterns = [
         name="admin_template"),
 
     url(r'^login/$', TemplateView.as_view(template_name="oj/account/login.html"), name="user_login_page"),
+    url(r'^logout/$', Logout, name="user_logout_api"),
     url(r'^register/$', TemplateView.as_view(template_name="oj/account/register.html"),
         name="user_register_page"),
     url(r'^change_password/$', TemplateView.as_view(template_name="oj/account/change_password.html"),