Merge branch 'feat/login_with_username' of https://github.com/Natural…

…Solutions/GeoNature-citizen into NaturalSolutions-feat/login_with_username
PnX-SI · Sep 3, 2021 · c3847f8 · c3847f8
2 parents 7a9b51f + 6a1614c
commit c3847f8
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 19 deletions.
diff --git a/backend/gncitizen/core/users/routes.py b/backend/gncitizen/core/users/routes.py
@@ -8,7 +8,7 @@
     get_jwt_identity,
     jwt_required,
 )
-from sqlalchemy import func
+from sqlalchemy import func, or_
 from sqlalchemy.exc import IntegrityError
 from gncitizen.utils.mail_check import confirm_user_email, confirm_token
 from gncitizen.utils.errors import GeonatureApiError
@@ -123,9 +123,7 @@ def registration():
             ):
                 return (
                     {
-                        "message": """Un email correspondant est déjà enregistré.""".format(
-                            newuser.email
-                        )
+                        "message": "Un email correspondant est déjà enregistré."
                     },
                     400,
                 )
@@ -199,10 +197,12 @@ def login():
         email = request_datas["email"]
         password = request_datas["password"]
         try:
-            current_user = UserModel.query.filter_by(email=email).one()
+            current_user = UserModel.query.filter(
+                or_(UserModel.email == email, UserModel.username == email)
+            ).one()
         except Exception:
             return (
-                {"message": """L'email "{}" n'est pas enregistré.""".format(email)},
+                {"message": """L'email ou le pseudo "{}" n'est pas enregistré.""".format(email)},
                 400,
             )
         if not current_user.active:
@@ -306,7 +306,6 @@ def get_allusers():
       200:
         description: list all users
     """
-    # allusers = UserModel.return_all()
     allusers = UserModel.return_all()
     return allusers, 200
 
@@ -458,7 +457,6 @@ def delete_user():
 def reset_user_password():
     request_datas = dict(request.get_json())
     email = request_datas["email"]
-    # username = request_datas["username"]
 
     try:
         user = UserModel.query.filter_by(email=email).one()
@@ -534,7 +532,7 @@ def reset_user_password():
 def confirm_email(token):
     try:
         email = confirm_token(token)
-    except:
+    except Exception:
         return (
             {"message": "The confirmation link is invalid or has expired."},
             404,

diff --git a/frontend/src/app/auth/login/login.component.html b/frontend/src/app/auth/login/login.component.html
@@ -72,7 +72,7 @@ <h4 class="modal-title" i18n="login@@login">Se connecter</h4>
         (ngSubmit)="loginForm.form.valid && onLogin()"
     >
         <div class="form-group">
-            <label for="email" i18n="email input label@@emailInputLabel">Email</label>
+            <label for="email" i18n="email or username@@emailOrUsernameInputLabel">Email ou pseudo</label>
             <div class="input-group">
                 <div class="input-group-prepend">
                     <span
@@ -87,7 +87,7 @@ <h4 class="modal-title" i18n="login@@login">Se connecter</h4>
                     type="email"
                     class="form-control rounded-0"
                     id="email"
-                    placeholder="Entrez votre adresse mail"
+                    placeholder="Entrez votre adresse mail ou pseudo"
                     aria-label="Email"
                     aria-describedby="emailInput"
                     i18n-placeholder="emailInput@@emailInput"

diff --git a/frontend/src/i18n/messages.en.xlf b/frontend/src/i18n/messages.en.xlf
@@ -466,8 +466,8 @@
         </context-group>
         <note priority="1" from="description">Recover account</note>
       </trans-unit>
-      <trans-unit id="emailInputLabel" datatype="html">
-        <source>Email</source><target state="new">Email</target>
+      <trans-unit id="emailOrUsernameInputLabel" datatype="html">
+        <source>Email ou pseudo</source><target state="new">Email or username</target>
         <context-group purpose="location">
           <context context-type="sourcefile">app/auth/login/login.component.html</context>
           <context context-type="linenumber">76</context>
@@ -879,7 +879,7 @@
         </context-group>
         <note priority="1" from="description">Carousel previous</note>
       </trans-unit>
-      
+
       <trans-unit id="ngbCarouselNext" datatype="html">
         <source>Prochain</source><target state="new">Next</target>
         <context-group purpose="location">

diff --git a/frontend/src/i18n/messages.fr.xlf b/frontend/src/i18n/messages.fr.xlf
@@ -466,8 +466,8 @@
         </context-group>
         <note priority="1" from="description">Recover account</note>
       </trans-unit>
-      <trans-unit id="emailInputLabel" datatype="html">
-        <source>Email</source><target state="final">Email</target>
+      <trans-unit id="emailOrUsernameInputLabel" datatype="html">
+        <source>Email ou pseudo</source><target state="final">Email ou pseudo</target>
         <context-group purpose="location">
           <context context-type="sourcefile">app/auth/login/login.component.html</context>
           <context context-type="linenumber">76</context>
@@ -879,7 +879,7 @@
         </context-group>
         <note priority="1" from="description">Carousel previous</note>
       </trans-unit>
-      
+
       <trans-unit id="ngbCarouselNext" datatype="html">
         <source>Prochain</source><target state="final">Prochain</target>
         <context-group purpose="location">

diff --git a/frontend/src/i18n/messages.xlf b/frontend/src/i18n/messages.xlf
@@ -454,8 +454,8 @@
         </context-group>
         <note priority="1" from="description">Recover account</note>
       </trans-unit>
-      <trans-unit id="emailInputLabel" datatype="html">
-        <source>Email</source>
+      <trans-unit id="emailOrUsernameInputLabel" datatype="html">
+        <source>Email ou pseudo</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/auth/login/login.component.html</context>
           <context context-type="linenumber">76</context>