Changeset 12816

Timestamp:

23 Mar 2015, 16:47:58 (10 years ago)

Author:

Henrik Bettermann

Message:

Ticket #11 compromise

Redirect to CustomerChangePasswordPage? if PasswordMandate? was used so that customers are reminded of changing the password. But we do not require a password change. Maybe customers feel comfortable with the generated password.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba

Files:

• browser/pages.py (modified) (1 diff)
• mandates/browser.py (modified) (2 diffs)
• mandates/tests.py (modified) (2 diffs)

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

@@ -280 +280 @@
                     #      _('Your personal data record is outdated. Please update.'),
                     #      type='warning')
-                    self.redirect(self.application_url() + rel_link)
+                    if camefrom == 'PasswordMandate':
+                        self.redirect(
+                            self.application_url() +
+                            rel_link +
+                            '/changepassword')
+                    else:
+                        self.redirect(self.application_url() + rel_link)
                     return
                 if not self.camefrom:

main/waeup.ikoba/trunk/src/waeup/ikoba/mandates/browser.py

@@ -19 +19 @@
 """
 import grok
+from urllib import urlencode
 from waeup.ikoba.browser.layout import UtilityView
 from waeup.ikoba.interfaces import ICompany
@@ -42 +43 @@
             return
         msg = mandate.execute()
+        self.mandate_name = mandate.__class__.__name__
         self.flash(msg)
         return
 
     def render(self):
-        self.redirect(self.url(self.context, 'login'))
+        args = {'camefrom': self.mandate_name}
+        self.redirect(self.url(self.context) + '/login?%s' % urlencode(args))
         return

main/waeup.ikoba/trunk/src/waeup/ikoba/mandates/tests.py

@@ -153 +153 @@
             % mandate.mandate_id)
         # Password has been set.
-        self.assertTrue('Password has been successfully set. Login with your new password.'
+        self.assertTrue(
+            'Password has been successfully set. Login with your new password.'
             in self.browser.contents)
         self.assertTrue(IUserAccount(customer).checkPassword('mypwd1'))
@@ -159 +160 @@
         self.assertEqual(len(self.app['mandates'].keys()), 0)
         # We redirect to login page not to the frontpage.
-        self.assertEqual(self.browser.url, 'http://localhost/app/login')
+        self.assertEqual(
+            self.browser.url,
+            'http://localhost/app/login?camefrom=PasswordMandate')
+        # After login we redirect to the changepassword page.
+        self.browser.getControl(name="form.login").value = customer.customer_id
+        self.browser.getControl(name="form.password").value = 'mypwd1'
+        self.browser.getControl("Login").click()
+        self.assertEqual(
+            self.browser.url,
+            'http://localhost/app/customers/%s/changepassword'
+            % customer.customer_id)