Changeset 13987

Timestamp:

24 Jun 2016, 06:48:18 (8 years ago)

Author:

Henrik Bettermann

Message:

Do not set password if mandate has expired.

Location:

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

Files:

• mandate.py (modified) (1 diff)
• tests.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/mandates/mandate.py

@@ -70 +70 @@
         if self.expires < datetime.utcnow():
             msg = _('Mandate expired.')
-        if self._setPassword():
+        elif self._setPassword():
             msg = _('Password has been successfully set. '
                     'Login with your new password.')

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

@@ -89 +89 @@
         # Add and execute a mandate with missing parameters.
         mandate = PasswordMandate()
+        IUserAccount(student).setPassword('old_pw')
         self.app['mandates'].addMandate(mandate)
         (msg, redirect_path) = mandate.execute()
@@ -95 +96 @@
         # Add and execute an expired mandate.
         mandate = PasswordMandate(days=0)
+        mandate.params['user'] = student
+        mandate.params['password'] = 'mypwd1'
         self.app['mandates'].addMandate(mandate)
         (msg, redirect_path) = mandate.execute()
         self.assertEqual(msg, u'Mandate expired.')
         self.assertEqual(redirect_path, '')
+        # Password has not been set
+        self.assertTrue(IUserAccount(student).checkPassword('old_pw'))
         # Add and execute a perfect mandate
         mandate = PasswordMandate()