From 0ed3f68305da35d54a4dbf929b87bc5b8436a4c0 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sat, 24 Feb 2018 14:27:50 +0100
Subject: [PATCH] Allow login with email or username
---
api/config/settings/common.py | 2 +-
front/src/components/auth/Login.vue | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/api/config/settings/common.py b/api/config/settings/common.py
index 927e754d0..491babdd1 100644
--- a/api/config/settings/common.py
+++ b/api/config/settings/common.py
@@ -264,7 +264,7 @@ AUTHENTICATION_BACKENDS = (
)
# Some really nice defaults
-ACCOUNT_AUTHENTICATION_METHOD = 'username'
+ACCOUNT_AUTHENTICATION_METHOD = 'username_email'
ACCOUNT_EMAIL_REQUIRED = True
ACCOUNT_EMAIL_VERIFICATION = 'mandatory'
diff --git a/front/src/components/auth/Login.vue b/front/src/components/auth/Login.vue
index 99b439af8..b02a3ed07 100644
--- a/front/src/components/auth/Login.vue
+++ b/front/src/components/auth/Login.vue
@@ -12,13 +12,13 @@
</ul>
</div>
<div class="field">
- <label>Username</label>
+ <label>Username or email</label>
<input
ref="username"
required
type="text"
autofocus
- placeholder="Enter your username"
+ placeholder="Enter your username or email"
v-model="credentials.username"
>
</div>
--
GitLab