Minor fixes and refactoring

Luan
1 parent 53de9493
Showing 2 changed files with 2 additions and 9 deletions Show diff stats
src/accounts/models.py
src/accounts/views.py
@@ -23,20 +23,14 @@ class User(AbstractUser):
     modified = models.DateTimeField(auto_now=True)
  
     def check_password(self, raw_password):
-        """
-        Returns a boolean of whether the raw_password was correct. Handles
-        hashing formats behind the scenes.
-        """
-        def setter(raw_password):
-            self.set_password(raw_password)
-            self.save(update_fields=["password"])
+        is_correct_ = super(User, self).check_password(raw_password)
  
         if self.xmpp.exists():
             is_correct = raw_password == self.xmpp.all()[0].password
             if is_correct:
                 return is_correct
  
-        return check_password(raw_password, self.password, setter)
+        return is_correct_
  
     def get_absolute_url(self):
         return reverse('user_profile', kwargs={'username': self.username})
@@ -212,7 +212,6 @@ class ChangeXMPPPasswordView(UpdateView):
             return response
         else:
             self.request.user.set_password(form.cleaned_data['password1'])
-            self.request.user.save()
             transaction.commit()
  
         messages.success(
...	...	@@ -23,20 +23,14 @@ class User(AbstractUser):
23	23	modified = models.DateTimeField(auto_now=True)
24	24
25	25	def check_password(self, raw_password):
26		- """
27		- Returns a boolean of whether the raw_password was correct. Handles
28		- hashing formats behind the scenes.
29		- """
30		- def setter(raw_password):
31		- self.set_password(raw_password)
32		- self.save(update_fields=["password"])
	26	+ is_correct_ = super(User, self).check_password(raw_password)
33	27
34	28	if self.xmpp.exists():
35	29	is_correct = raw_password == self.xmpp.all()[0].password
36	30	if is_correct:
37	31	return is_correct
38	32
39		- return check_password(raw_password, self.password, setter)
	33	+ return is_correct_
40	34
41	35	def get_absolute_url(self):
42	36	return reverse('user_profile', kwargs={'username': self.username})
...	...
...	...	@@ -212,7 +212,6 @@ class ChangeXMPPPasswordView(UpdateView):
212	212	return response
213	213	else:
214	214	self.request.user.set_password(form.cleaned_data['password1'])
215		- self.request.user.save()
216	215	transaction.commit()
217	216
218	217	messages.success(
...	...