kallithea Changeset - b24e015a4174

Changeset - b24e015a4174

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Andrew Shadura - 10 years ago 2016-01-30 16:37:43
andrew@shadura.me

auth: allow web login with email addresses

Let users log in using their email addresses instead of their user names.
This only applies to the web login, not git+http or hg+http protocols.

3 files changed with 13 insertions and 2 deletions:

kallithea/controllers/login.py

kallithea/model/validators.py

kallithea/tests/functional/test_login.py

0 comments (0 inline, 0 general)

kallithea/controllers/login.py

➞

Show inline comments

@@ @@ -91,7 +91,7 @@ class LoginController(BaseController): @@
                 c.form_result = login_form.to_python(dict(request.POST))
                 # form checks for username/password, now we're authenticated
                 username = c.form_result['username']
-                user = User.get_by_username(username, case_insensitive=True)
+                user = User.get_by_username_or_email(username, case_insensitive=True)
             except formencode.Invalid as errors:
                 defaults = errors.value
                 # remove password from filling in form again

kallithea/model/validators.py

➞

Show inline comments

@@ @@ -313,7 +313,7 @@ def ValidAuth(): @@
             # authenticate returns unused dict but has called
             # plugin._authenticate which has create_or_update'ed the username user in db
             if auth_modules.authenticate(username, password) is None:
-                user = User.get_by_username(username)
+                user = User.get_by_username_or_email(username)
                 if user and not user.active:
                     log.warning('user %s is disabled', username)
                     msg = M(self, 'invalid_auth', state)

kallithea/tests/functional/test_login.py

➞

Show inline comments

@@ @@ -50,6 +50,17 @@ class TestLoginController(TestController @@
         response = response.follow()
         response.mustcontain('/%s' % HG_REPO)
     def test_login_regular_email_ok(self):
         response = self.app.post(url(controller='login', action='index'),
                                  {'username': TEST_USER_REGULAR_EMAIL,
                                   'password': TEST_USER_REGULAR_PASS})
         self.assertEqual(response.status, '302 Found')
         self.assert_authenticated_user(response, TEST_USER_REGULAR_LOGIN)
         response = response.follow()
         response.mustcontain('/%s' % HG_REPO)
     def test_login_ok_came_from(self):
         test_came_from = '/_admin/users'
         response = self.app.post(url(controller='login', action='index',

0 comments (0 inline, 0 general)