Changeset 7147 for main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py

Timestamp:

19 Nov 2011, 23:03:49 (13 years ago)

Author:

Henrik Bettermann

Message:

Implement PasswordValidator? global utility as suggested by Uli.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py (modified) (4 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py

@@ -34 +34 @@
 from waeup.sirp.browser.viewlets import (
     ManageActionButton, PrimaryNavTab, AddActionButton)
-from waeup.sirp.interfaces import IWAeUPObject, IUserAccount, IExtFileStore
+from waeup.sirp.interfaces import (
+    IWAeUPObject, IUserAccount, IExtFileStore, IPasswordValidator)
 from waeup.sirp.widgets.datewidget import (
     FriendlyDateWidget, FriendlyDateDisplayWidget,
@@ -53 +54 @@
 from waeup.sirp.students.utils import (
     get_payment_details, get_accommodation_details, select_bed,
-    render_pdf, validatePassword)
+    render_pdf)
 from waeup.sirp.browser.resources import toggleall
 from waeup.sirp.authentication import get_principal_role_manager
@@ -408 +409 @@
         password_ctl = form.get('control_password', None)
         if password:
-            if (password != password_ctl):
-                self.flash('Passwords do not match.')
-            else:
-                # XXX: This is too early. PW should only be saved if there
-                #      are no (other) errors left in form.
-                IUserAccount(self.context).setPassword(password)
-                write_log_message(self, 'password changed')
-
-        # The following is now done by contextual_reg_num_source validation
-        #self.reg_number = form.get('form.reg_number', None)
-        #if self.reg_number:
-        #    hitlist = search(query=self.reg_number,searchtype='reg_number', view=self)
-        #    if hitlist and hitlist[0].student_id != self.context.student_id:
-        #        self.flash('Registration number exists.')
-        #        return
-        #self.matric_number = form.get('form.matric_number', None)
-        #if self.matric_number:
-        #    hitlist = search(query=self.matric_number,
-        #        searchtype='matric_number', view=self)
-        #    if hitlist and hitlist[0].student_id != self.context.student_id:
-        #        self.flash('Matriculation number exists.')
-        #        return
-
+            validator = getUtility(IPasswordValidator)
+            errors = validator.validate_password(password, password_ctl)
+            if errors:
+                self.flash( ' '.join(errors))
+                return
+        changed_fields = self.applyData(self.context, **data)
         # Turn list of lists into single list
-        changed_fields = self.applyData(self.context, **data)
         if changed_fields:
             changed_fields = reduce(lambda x,y: x+y, changed_fields.values())
-        fields_string = ' + '.join(changed_fields)
-        self.context._p_changed = True
+        else:
+            changed_fields = []
+        if password:
+            # Now we know that the form has no errors and can set password ...
+            IUserAccount(self.context).setPassword(password)
+            changed_fields.append('password')
+        # ... and execute transition
         if form.has_key('transition') and form['transition']:
             transition_id = form['transition']
             self.wf_info.fireTransition(transition_id)
+        fields_string = ' + '.join(changed_fields)
         self.flash('Form has been saved.')
         if fields_string:
@@ -1523 +1512 @@
         password_ctl = form.get('change_password_repeat', None)
         if password:
-            if (password != password_ctl):
-                self.flash('Passwords do not match.')
+            validator = getUtility(IPasswordValidator)
+            errors = validator.validate_password(password, password_ctl)
+            if not errors:
+                IUserAccount(self.context).setPassword(password)
+                write_log_message(self, 'saved: password')
+                self.flash('Password changed.')
             else:
-                error = validatePassword(password)
-                if not error:
-                    IUserAccount(self.context).setPassword(password)
-                    write_log_message(self, 'password changed')
-                    self.flash('Password changed.')
-                else:
-                    self.flash(error)
+                self.flash( ' '.join(errors))
         return