Changeset 12523 for main/waeup.ikoba/trunk/src/waeup

Timestamp:

30 Jan 2015, 11:09:08 (10 years ago)

Author:

Henrik Bettermann

Message:

Customers can use their email address for authentication.

Location:

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

Files:

• browser/templates/loginpage.pt (modified) (2 diffs)
• customers/authentication.py (modified) (3 diffs)
• customers/interfaces.py (modified) (1 diff)
• customers/tests/test_browser.py (modified) (1 diff)

main/waeup.ikoba/trunk/src/waeup/ikoba/browser/templates/loginpage.pt

@@ -2 +2 @@
   <br />
   <div class="form-group">
-    <label i18n:translate="" class="col-sm-2 control-label">User Name or Id</label>
+    <label i18n:translate="" class="col-sm-2 control-label">Identifier</label>
     <div class="col-sm-10">
       <input name="form.login" type="text" class="form-control" id="login">
+      <div class="hint" i18n:translate="identifier_hint">Customers can enter
+      either their customer id, registration number or email address. 
+      Officers must enter their user name.</div>
     </div>
   </div>
@@ -11 +14 @@
     <div class="col-sm-10">
       <input name="form.password" type="password" class="form-control" id="password">
-      <font  i18n:translate="" color="red"> Notice: User names, ids and passwords are case sensitive.</font>
     </div>
   </div>
+  <br />
   <input type="hidden" name="camefrom"   tal:attributes="value view/camefrom" />
   <input class="btn btn-primary" type="submit" name="SUBMIT"
     tal:attributes="value view/login_button" />
   <br /><br /><br />
+  <p>
+  All identifiers and passwords are case sensitive.
+  </p>
   <p  i18n:translate="login_trouble1">Don't forget to logout or exit your browser when you're done.
     If you are having trouble logging in, make sure to enable  cookies in your web browser.

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/authentication.py

@@ -1 @@
-## $Id: authentication.py 10055 2013-04-04 15:12:43Z uli $
+## $Id$
 ##
 ## Copyright (C) 2014 Uli Fouquet & Henrik Bettermann
@@ -22 +22 @@
 import time
 from zope.component import getUtility
+from zope.catalog.interfaces import ICatalog
 from zope.password.interfaces import IPasswordManager
 from zope.pluggableauth.interfaces import (
@@ -187 +188 @@
         customer = customerscontainer.get(login, None)
         if customer is None:
-            return None
+            cat = getUtility(ICatalog, name='customers_catalog')
+            results = list(
+                cat.searchResults(email=(login, login)))
+            if len(results) != 1:
+                return None
+            customer = results[0]
         return IUserAccount(customer)
 

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/interfaces.py

@@ -227 +227 @@
     email = TextLineChoice(
         title = _(u'Email'),
-        required = False,
+        required = True,
         constraint=validate_email,
         source = contextual_email_source,

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_browser.py

@@ -550 +550 @@
     # Tests for Customer class views and pages
 
+    def test_customer_login_with_email(self):
+        self.assertEqual(self.customer.state, 'created')
+        self.browser.open(self.login_path)
+        self.browser.getControl(name="form.login").value = self.customer.email
+        self.browser.getControl(name="form.password").value = 'cpwd'
+        self.browser.getControl("Login").click()
+        self.assertEqual(self.browser.url, self.customer_path)
+        self.assertTrue('You logged in' in self.browser.contents)
+        # Status has changed
+        self.assertEqual(self.customer.state, 'started')
+        return
+
     def test_customer_change_password(self):
         # Customers can change the password