Changeset 8346

Timestamp:

4 May 2012, 20:44:48 (13 years ago)

Author:

Henrik Bettermann

Message:

Implement a ChangePasswordRequestPage? for all portal users (more tests will follow).

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• applicants/tests/test_browser.py (modified) (2 diffs)
• browser/pages.py (modified) (3 diffs)
• browser/templates/sendpassword.pt (added)
• interfaces.py (modified) (1 diff)
• students/browser.py (modified) (3 diffs)
• students/browser_templates/sendpassword.pt (deleted)
• students/interfaces.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py

@@ -869 +869 @@
     def test_change_password_request(self):
         self.browser.open('http://localhost/app/sendpw')
-        self.browser.getControl(name="form.reg_number").value = '1234'
+        self.browser.getControl(name="form.identifier").value = '1234'
         self.browser.getControl(name="form.email").value = 'aa@aa.ng'
-        self.browser.getControl("Get new login credentials").click()
+        self.browser.getControl("Get login credentials").click()
         self.assertTrue('No record found' in self.browser.contents)
         self.applicant.email = 'aa@aa.ng'
@@ -877 +877 @@
         notify(grok.ObjectModifiedEvent(self.applicant))
         self.browser.open('http://localhost/app/sendpw')
-        self.browser.getControl(name="form.reg_number").value = '1234'
+        self.browser.getControl(name="form.identifier").value = '1234'
         self.browser.getControl(name="form.email").value = 'aa@aa.ng'
-        self.browser.getControl("Get new login credentials").click()
+        self.browser.getControl("Get login credentials").click()
         self.assertTrue(
             'An email with your user name and password has been sent'

main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py

@@ -45 +45 @@
     IUniversity, IFacultiesContainer, IFaculty, IFacultyAdd,
     IDepartment, IDepartmentAdd, ICourse, ICourseAdd, ICertificate,
-    ICertificateAdd, ICertificateCourse, ICertificateCourseAdd)
+    ICertificateAdd, ICertificateCourse, ICertificateCourseAdd,
+    ICaptchaManager)
 from waeup.kofa.browser.layout import jsaction, action, UtilityView
 from waeup.kofa.browser.resources import warning, datepicker, tabs, datatable
@@ -54 +55 @@
     ILocalRolesAssignable, DuplicationError, IConfigurationContainer,
     ISessionConfiguration, ISessionConfigurationAdd,
-    IPasswordValidator, IContactForm, IKofaUtils, ICSVExporter)
+    IPasswordValidator, IContactForm, IKofaUtils, ICSVExporter,
+    IChangePassword)
 from waeup.kofa.permissions import get_users_with_local_roles, get_all_roles
 from waeup.kofa.students.catalog import search as searchstudents
@@ -1957 +1959 @@
         return
 
+class ChangePasswordRequestPage(KofaForm):
+    """Captcha'd page for all kind of users to request a password change.
+    """
+    grok.context(IUniversity)
+    grok.name('sendpw')
+    grok.require('waeup.Anonymous')
+    grok.template('sendpassword')
+    label = _('Send me a new password')
+    form_fields = grok.AutoFields(IChangePassword)
+
+    def update(self):
+        # Handle captcha
+        self.captcha = getUtility(ICaptchaManager).getCaptcha()
+        self.captcha_result = self.captcha.verify(self.request)
+        self.captcha_code = self.captcha.display(self.captcha_result.error_code)
+        return
+
+    def _searchUser(self, identifier, email):
+        # Search student
+        cat = queryUtility(ICatalog, name='students_catalog')
+        results = cat.searchResults(
+            #reg_number=(identifier, identifier),
+            email=(email,email))
+        for result in results:
+            if result.student_id == identifier or \
+                result.reg_number == identifier or \
+                result.matric_number == identifier:
+                return result
+        # Search applicant
+        cat = queryUtility(ICatalog, name='applicants_catalog')
+        if cat is not None:
+            results = cat.searchResults(
+                #reg_number=(identifier, identifier),
+                email=(email,email))
+            for result in results:
+                if result.applicant_id == identifier or \
+                    result.reg_number == identifier:
+                    return result
+        # Search portal user
+        user = grok.getSite()['users'].get(identifier, None)
+        if user is not None and user.email == email:
+            return user
+        return None
+
+    @action(_('Get login credentials'), style='primary')
+    def request(self, **data):
+        if not self.captcha_result.is_valid:
+            # Captcha will display error messages automatically.
+            # No need to flash something.
+            return
+        # Search student or applicant
+        identifier = data['identifier']
+        email = data['email']
+        user = self._searchUser(identifier, email)
+        if user is None:
+            self.flash(_('No record found.'))
+            return
+        # Change password
+        kofa_utils = getUtility(IKofaUtils)
+        pwd = kofa_utils.genPassword()
+        IUserAccount(user).setPassword(pwd)
+        # Send email with new redentials
+        msg = _('You have successfully changed your password for the')
+        login_url = self.url(grok.getSite(), 'login')
+        success = kofa_utils.sendCredentials(
+            IUserAccount(user),pwd,login_url,msg)
+        if success:
+            self.flash(_('An email with your user name and password ' +
+                'has been sent to ${a}.', mapping = {'a':email}))
+        else:
+            self.flash(_('An smtp server error occurred.'))
+        return

main/waeup.kofa/trunk/src/waeup/kofa/interfaces.py

@@ -1043 +1043 @@
         required = True,
         )
+
+class IChangePassword(IKofaObject):
+    """Interface needed for change pasword page.
+
+    """
+    identifier = schema.TextLine(
+        title = _(u'Unique Identifier'),
+        description = _(u'User Name, Student or Applicant Id, Matriculation or Registration Number'),
+        required = True,
+        readonly = False,
+        )
+
+    email = schema.ASCIILine(
+        title = _(u'Email Address'),
+        required = True,
+        constraint=validate_email,
+        )

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

@@ -37 +37 @@
     KofaPage, KofaEditFormPage, KofaAddFormPage, KofaDisplayFormPage,
     ContactAdminForm, KofaForm, NullValidator)
-from waeup.kofa.browser.interfaces import ICaptchaManager
 from waeup.kofa.browser.breadcrumbs import Breadcrumb
 from waeup.kofa.browser.resources import datepicker, datatable, tabs, warning
@@ -55 +54 @@
     IStudentAccommodation, IStudentStudyLevel,
     ICourseTicket, ICourseTicketAdd, IStudentPaymentsContainer,
-    IStudentOnlinePayment, IBedTicket, IStudentsUtils, IStudentChangePassword
+    IStudentOnlinePayment, IBedTicket, IStudentsUtils
     )
 from waeup.kofa.students.catalog import search
@@ -1907 +1906 @@
         return
 
-class ChangePasswordRequestPage(KofaForm):
-    """Captcha'd page for students to request a password change.
-    """
-    grok.context(IUniversity)
-    grok.name('sendpw')
-    grok.require('waeup.Anonymous')
-    grok.template('sendpassword')
-    label = _('Send me a new password')
-    form_fields = grok.AutoFields(IStudentChangePassword)
-
-    def update(self):
-        # Handle captcha
-        self.captcha = getUtility(ICaptchaManager).getCaptcha()
-        self.captcha_result = self.captcha.verify(self.request)
-        self.captcha_code = self.captcha.display(self.captcha_result.error_code)
-        return
-
-    @action(_('Get new login credentials'), style='primary')
-    def request(self, **data):
-        if not self.captcha_result.is_valid:
-            # Captcha will display error messages automatically.
-            # No need to flash something.
-            return
-        # Search student or applicant
-        reg_number = data['reg_number']
-        email = data['email']
-        cat = queryUtility(ICatalog, name='students_catalog')
-        results = cat.searchResults(
-            reg_number=(reg_number, reg_number),
-            email=(email,email))
-        if len(results) == 0:
-            # Try also the applicants_catalog if no student record was found.
-            cat = queryUtility(ICatalog, name='applicants_catalog')
-            if cat is None:
-                self.flash(_('Application package not installed.'))
-                return
-            results = cat.searchResults(
-                reg_number=(reg_number, reg_number),
-                email=(email,email))
-        if len(results) == 0:
-            self.flash(_('No record found.'))
-            return
-        student = list(results)[0]
-        # Change password
-        kofa_utils = getUtility(IKofaUtils)
-        pwd = kofa_utils.genPassword()
-        IUserAccount(student).setPassword(pwd)
-        # Send email with new redentials
-        msg = _('You have successfully changed your password for the')
-        login_url = self.url(grok.getSite(), 'login')
-        success = kofa_utils.sendCredentials(
-            IUserAccount(student),pwd,login_url,msg)
-        if success:
-            self.flash(_('An email with your user name and password ' +
-                'has been sent to ${a}.', mapping = {'a':email}))
-        else:
-            self.flash(_('An smtp server error occurred.'))
-        return
 
 class SetPasswordPage(KofaPage):

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

@@ -510 +510 @@
 IStudentOnlinePayment['p_level'].order = IStudentOnlinePayment[
     'p_session'].order
-
-
-class IStudentChangePassword(IKofaObject):
-    """Interface needed for change pasword page.
-
-    """
-    reg_number = schema.TextLine(
-        title = _(u'Registration Number'),
-        required = True,
-        readonly = False,
-        )
-
-    email = schema.ASCIILine(
-        title = _(u'Email Address'),
-        required = True,
-        constraint=validate_email,
-        )

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

@@ -1695 +1695 @@
     def test_change_password_request(self):
         self.browser.open('http://localhost/app/sendpw')
-        self.browser.getControl(name="form.reg_number").value = '123'
+        self.browser.getControl(name="form.identifier").value = '123'
         self.browser.getControl(name="form.email").value = 'aa@aa.ng'
-        self.browser.getControl("Get new login credentials").click()
+        self.browser.getControl("Get login credentials").click()
         self.assertTrue('An email with' in self.browser.contents)