update to django 2.0

account/decorators.py

@@ -31,19 +31,19 @@ class BasePermissionDecorator(object):
 
 class login_required(BasePermissionDecorator):
     def check_permission(self):
-        return self.request.user.is_authenticated()
+        return self.request.user.is_authenticated
 
 
 class super_admin_required(BasePermissionDecorator):
     def check_permission(self):
         user = self.request.user
-        return user.is_authenticated() and user.is_super_admin()
+        return user.is_authenticated and user.is_super_admin()
 
 
 class admin_role_required(BasePermissionDecorator):
     def check_permission(self):
         user = self.request.user
-        return user.is_authenticated() and user.is_admin_role()
+        return user.is_authenticated and user.is_admin_role()
 
 
 class problem_permission_required(admin_role_required):
@@ -80,7 +80,7 @@ def check_contest_permission(check_type="details"):
                 return self.error("Contest %s doesn't exist" % contest_id)
 
             # Anonymous
-            if not user.is_authenticated():
+            if not user.is_authenticated:
                 return self.error("Please login first.")
 
             # creator or owner

account/middleware.py

@@ -22,7 +22,7 @@ class APITokenAuthMiddleware(MiddlewareMixin):
 class SessionRecordMiddleware(MiddlewareMixin):
     def process_request(self, request):
         request.ip = request.META.get(settings.IP_HEADER, request.META.get("REMOTE_ADDR"))
-        if request.user.is_authenticated():
+        if request.user.is_authenticated:
             session = request.session
             session["user_agent"] = request.META.get("HTTP_USER_AGENT", "")
             session["ip"] = request.ip
@@ -37,7 +37,7 @@ class AdminRoleRequiredMiddleware(MiddlewareMixin):
     def process_request(self, request):
         path = request.path_info
         if path.startswith("/admin/") or path.startswith("/api/admin/"):
-            if not (request.user.is_authenticated() and request.user.is_admin_role()):
+            if not (request.user.is_authenticated and request.user.is_admin_role()):
                 return JSONResponse.response({"error": "login-required", "data": "Please login in first"})
 
 

account/models.py

@@ -60,7 +60,7 @@ class User(AbstractBaseUser):
         return self.problem_permission == ProblemPermission.ALL
 
     def is_contest_admin(self, contest):
-        return self.is_authenticated() and (contest.created_by == self or self.admin_type == AdminType.SUPER_ADMIN)
+        return self.is_authenticated and (contest.created_by == self or self.admin_type == AdminType.SUPER_ADMIN)
 
     class Meta:
         db_table = "user"

account/tests.py

@@ -101,13 +101,13 @@ class UserLoginAPITest(APITestCase):
         self.assertDictEqual(response.data, {"error": None, "data": "Succeeded"})
 
         user = auth.get_user(self.client)
-        self.assertTrue(user.is_authenticated())
+        self.assertTrue(user.is_authenticated)
 
     def test_login_with_correct_info_upper_username(self):
         resp = self.client.post(self.login_url, data={"username": self.username.upper(), "password": self.password})
         self.assertDictEqual(resp.data, {"error": None, "data": "Succeeded"})
         user = auth.get_user(self.client)
-        self.assertTrue(user.is_authenticated())
+        self.assertTrue(user.is_authenticated)
 
     def test_login_with_wrong_info(self):
         response = self.client.post(self.login_url,
@@ -115,7 +115,7 @@ class UserLoginAPITest(APITestCase):
         self.assertDictEqual(response.data, {"error": "error", "data": "Invalid username or password"})
 
         user = auth.get_user(self.client)
-        self.assertFalse(user.is_authenticated())
+        self.assertFalse(user.is_authenticated)
 
     def test_tfa_login(self):
         token = self._set_tfa()
@@ -129,7 +129,7 @@ class UserLoginAPITest(APITestCase):
         self.assertDictEqual(response.data, {"error": None, "data": "Succeeded"})
 
         user = auth.get_user(self.client)
-        self.assertTrue(user.is_authenticated())
+        self.assertTrue(user.is_authenticated)
 
     def test_tfa_login_wrong_code(self):
         self._set_tfa()
@@ -140,7 +140,7 @@ class UserLoginAPITest(APITestCase):
         self.assertDictEqual(response.data, {"error": "error", "data": "Invalid two factor verification code"})
 
         user = auth.get_user(self.client)
-        self.assertFalse(user.is_authenticated())
+        self.assertFalse(user.is_authenticated)
 
     def test_tfa_login_without_code(self):
         self._set_tfa()
@@ -150,7 +150,7 @@ class UserLoginAPITest(APITestCase):
         self.assertDictEqual(response.data, {"error": "error", "data": "tfa_required"})
 
         user = auth.get_user(self.client)
-        self.assertFalse(user.is_authenticated())
+        self.assertFalse(user.is_authenticated)
 
     def test_user_disabled(self):
         self.user.is_disabled = True

account/views/oj.py

@@ -35,7 +35,7 @@ class UserProfileAPI(APIView):
         判断是否登录， 若登录返回用户信息
         """
         user = request.user
-        if not user.is_authenticated():
+        if not user.is_authenticated:
             return self.success()
         show_real_name = False
         username = request.GET.get("username")
@@ -280,7 +280,7 @@ class UserChangePasswordAPI(APIView):
 class ApplyResetPasswordAPI(APIView):
     @validate_serializer(ApplyResetPasswordSerializer)
     def post(self, request):
-        if request.user.is_authenticated():
+        if request.user.is_authenticated:
             return self.error("You have already logged in, are you kidding me? ")
         data = request.data
         captcha = Captcha(request)