Changeset 7365 for main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py

Timestamp:

17 Dec 2011, 18:47:57 (13 years ago)

Author:

Henrik Bettermann

Message:

Send email with credentials (including random password) after successful registration instead of redirecting to to a success page. Tests will follow.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py (modified) (3 diffs)

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

@@ -51 +51 @@
 from waeup.sirp.interfaces import (
     ISIRPObject, ILocalRolesAssignable, IExtFileStore,
-    IFileStoreNameChooser, IPasswordValidator, IUserAccount)
+    IFileStoreNameChooser, IPasswordValidator, IUserAccount, ISIRPUtils)
 from waeup.sirp.permissions import get_users_with_local_roles
 from waeup.sirp.students.viewlets import PrimaryStudentNavTab
@@ -1089 +1089 @@
         return image
 
-class ApplicantRegistrationSuccessful(SIRPPage):
-    """Info page when applicant registration was successful.
-    """
-    grok.context(IApplicantsContainer)
-    grok.name('register_success')
-    grok.require('waeup.Public')
-    grok.template('applicantregister_succ')
-    label = 'Applicant Registration Successful'
-    title = label
-
-    def update(self, app_id=None):
-        if app_id is None:
-            self.redirect(self.url(self.context, 'register'))
-        self.app_id = app_id
-        self.login_url = self.url(grok.getSite(), 'login')
-
 class ApplicantRegistrationPage(SIRPAddFormPage):
     """Captcha'd registration page for applicants.
@@ -1131 +1115 @@
             # No need to flash something.
             return
-
-        # handle password field manually
-        form = self.request.form
-        password = form.get('password', None)
-        password_ctl = form.get('control_password', None)
-        if password:
-            validator = getUtility(IPasswordValidator)
-            errors = validator.validate_password(password, password_ctl)
-            if errors:
-                self.flash( ' '.join(errors))
-                return
-
-        # add applicant and redirect to success page
+        sirp_utils = getUtility(ISIRPUtils)
+        # Add applicant and create password
         applicant = createObject('waeup.Applicant')
         self.applyData(applicant, **data)
         self.context.addApplicant(applicant)
-        IUserAccount(applicant).setPassword(password)
-        app_id = applicant.applicant_id
-        self.redirect(self.url(self.context, 'register_success',
-                               data=dict(app_id=app_id)))
-        return
+        pwd = sirp_utils.genPassword()
+        IUserAccount(applicant).setPassword(pwd)
+        # Send email with credentials
+        username = applicant.applicant_id
+        fullname = applicant.display_fullname
+        subject = 'Your SIRP credentials'
+        msg = 'You have successfully registered for the'
+        email_to = applicant.email
+        login_url = self.url(grok.getSite(), 'login')
+        success = sirp_utils.sendPassword(fullname,msg,username,
+            pwd,login_url,email_to,subject)
+        if success:
+            self.flash('An email with your user name and password' +
+                'has been sent to %s.' % email_to)
+        else:
+            self.flash('An smtp server error occurred.')
+        return