a

Controller/UserController.py

@@ -1309,15 +1309,16 @@ class v3LoginView(TemplateView):
                     password = password[3:-3]
         except Exception as e:
             return response.json(111)
-        data_valid = DataValid()
-        if data_valid.email_validate(username):
-            return self.do_email_login(username, password, response)
-        elif data_valid.mobile_validate(username):
-            return self.do_phone_login(username, password, response)
-        elif data_valid.name_validate(username):
-            return self.do_name_login(username, password, response)
         else:
-            return response.json(107)
+            data_valid = DataValid()
+            if data_valid.email_validate(username):
+                return self.do_email_login(username, password, response)
+            elif data_valid.mobile_validate(username):
+                return self.do_phone_login(username, password, response)
+            elif data_valid.name_validate(username):
+                return self.do_name_login(username, password, response)
+            else:
+                return response.json(107)
 
     def do_email_login(self, email, password, response):
         user_qs = Device_User.objects.filter(Q(username=email) | Q(userEmail=email))