Changeset 7144 for main/waeup.sirp/trunk/src

Timestamp:

19 Nov 2011, 17:26:18 (13 years ago)

Author:

Henrik Bettermann

Message:

Simplify change password algorithm. No interface IStudentPasswordSetting needed, no adapter StudentPasswordSetting? needed.

I have to think about using a global utility instead of the validatePassword function in utils.py. Therefore validatePassword is not yet used by the PasswordChangeCredentialsPlugin?.

Location:

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

Files:

• authentication.py (modified) (1 diff)
• browser.py (modified) (4 diffs)
• browser_templates/baseeditpage.pt (deleted)
• browser_templates/change_password.pt (added)
• interfaces.py (modified) (1 diff)
• tests/test_browser.py (modified) (1 diff)
• utils.py (modified) (1 diff)

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

@@ -215 +215 @@
     loginpagename = 'login'
     loginfield = 'student_id'
-    passwordfield = 'form.password'
-    repeatfield = 'form.password_repeat'
+    passwordfield = 'change_password'
+    repeatfield = 'change_password_repeat'
 
     def extractCredentials(self, request):

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

@@ -40 +40 @@
 from waeup.sirp.university.vocabularies import study_modes
 from waeup.sirp.students.interfaces import (
-    IStudentsContainer, IStudent, IStudentClearance, IStudentPasswordSetting,
+    IStudentsContainer, IStudent, IStudentClearance,
     IStudentPersonal, IStudentBase, IStudentStudyCourse,
     IStudentAccommodation, IStudentClearanceEdit, IStudentStudyLevel,
@@ -52 +52 @@
 from waeup.sirp.students.vocabularies import StudyLevelSource
 from waeup.sirp.students.utils import (
-    getPaymentDetails, getAccommodationDetails, selectBed, renderPDF)
+    getPaymentDetails, getAccommodationDetails, selectBed,
+    renderPDF, validatePassword)
 from waeup.sirp.browser.resources import toggleall
 from waeup.sirp.authentication import get_principal_role_manager
@@ -1496 +1497 @@
     form_fields = grok.AutoFields(IStudentBase).select(
         'email', 'phone')
-    #grok.template('basemanagepage')
     label = 'Edit base data'
     title = 'Base Data'
@@ -1506 +1506 @@
         return
 
-class StudentPasswordSetting(grok.Adapter):
-    """Adapt IStudent to data needed for password settings.
-
-    We provide password getters/setters for the attached context (an
-    IStudent object) that cooperate seamless with the usual
-    formlib/form techniques.
-    """
-    grok.context(IStudent)
-    grok.provides(IStudentPasswordSetting)
-
-    def __init__(self, context):
-        self.name = context.fullname
-        self.password_repeat = context.password
-        self.context = context
-        return
-
-    def getPassword(self):
-        return self.context.password
-
-    def setPassword(self, password):
-        IUserAccount(self.context).setPassword(password)
-        return
-
-    password = property(getPassword, setPassword)
-
-class StudentPasswordFormPage(WAeUPEditFormPage):
-    """ View to edit the password by student
+class StudentChangePasswordPage(WAeUPEditFormPage):
+    """ View to manage student base data
     """
     grok.context(IStudent)
     grok.name('change_password')
     grok.require('waeup.handleStudent')
-    form_fields = grok.AutoFields(IStudentPasswordSetting)
-    grok.template('baseeditpage')
+    grok.template('change_password')
     label = 'Change password'
     title = 'Base Data'
     pnav = 4
 
-    def update(self):
-        super(StudentPasswordFormPage, self).update()
-        return
-
-    def onFailure(self, action, data, errors):
-        new_status = []
-        other_errors = False
-        for error in errors:
-            msg = getattr(error, 'message', '')
-            if isinstance(msg, basestring) and msg != '':
-                # invariant error
-                new_status.append(msg)
+    @grok.action('Save')
+    def save(self, **data):
+        form = self.request.form
+        password = form.get('change_password', None)
+        password_ctl = form.get('change_password_repeat', None)
+        if password:
+            if (password != password_ctl):
+                self.flash('Passwords do not match.')
             else:
-                # field error
-                new_status.append('see below for details')
-                continue
-        self.status = u'Error: %s' % ', '.join(new_status)
-        return
-
-    @grok.action('Save', failure=onFailure)
-    def save(self, **data):
-        if not isinstance(data.get('password', None), basestring):
-            self.flash('Password unchanged.')
-            return
-        self.applyData(self.context, **data)
-        self.flash('Password has been set.')
+                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)
         return
 

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

@@ -74 +74 @@
         """
 
-class IStudentPasswordSetting(IWAeUPObject):
-    """Data needed for password setting.
-    """
-
-    password = schema.Password(
-        title = u'New password',
-        description = u'min. length: 3',
-        min_length = 3,
-        required = False,
-        )
-
-    password_repeat = schema.Password(
-        title = u'Retype new password',
-        required = False,
-        )
-
-    @invariant
-    def passwords_match(obj):
-        if obj.password == obj.password_repeat:
-            return
-        raise Invalid('passwords do not match')
-
 class IStudentBase(IWAeUPObject):
     """Representation of student base data.

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py

@@ -653 +653 @@
         # Change password
         self.browser.getLink("Change password").click()
-        self.browser.getControl(name="form.password").value = 'pw'
-        self.browser.getControl(
-            name="form.password_repeat").value = 'pw'
+        self.browser.getControl(name="change_password").value = 'pw'
+        self.browser.getControl(
+            name="change_password_repeat").value = 'pw'
         self.browser.getControl("Save").click()
         self.assertTrue('Value is too short' in self.browser.contents)
-        self.browser.getControl(name="form.password").value = 'new_password'
-        self.browser.getControl(
-            name="form.password_repeat").value = 'new_passssword'
-        self.browser.getControl("Save").click()
-        self.assertTrue('passwords do not match' in self.browser.contents)
-        self.browser.getControl(name="form.password").value = 'new_password'
-        self.browser.getControl(
-            name="form.password_repeat").value = 'new_password'
-        self.browser.getControl("Save").click()
-        self.assertTrue('Password has been set' in self.browser.contents)
+        self.browser.getControl(name="change_password").value = 'new_password'
+        self.browser.getControl(
+            name="change_password_repeat").value = 'new_passssword'
+        self.browser.getControl("Save").click()
+        self.assertTrue('Passwords do not match' in self.browser.contents)
+        self.browser.getControl(name="change_password").value = 'new_password'
+        self.browser.getControl(
+            name="change_password_repeat").value = 'new_password'
+        self.browser.getControl("Save").click()
+        self.assertTrue('Password changed' in self.browser.contents)
         # We are still logged in. Changing the password hasn't thrown us out.
         self.browser.getLink("My Data").click()

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

@@ -33 +33 @@
     student['studycourse'].previous_verdict = verdict
     return
+
+def validatePassword(password):
+    if len(password) < 4:
+        return u'Value is too short.'
+    return None
 
 # To be specified in customization packages, see also the view which