register enhancement

PnX-SI · May 31, 2023 · e199647 · e199647
1 parent 863ecb7
commit e199647
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 13 deletions.
diff --git a/backend/geonature/core/users/register_post_actions.py b/backend/geonature/core/users/register_post_actions.py
@@ -47,14 +47,15 @@ def validate_temp_user(data):
         recipients = [current_app.config["ACCOUNT_MANAGEMENT"]["VALIDATOR_EMAIL"]]
     url_validation = url_for("users.confirmation", token=user.token_role, _external=True)
 
+    additional_fields = [
+        {"key": key, "value": value} for key, value in (user_dict.get("champs_addi") or {}).items()
+    ]
+
     msg_html = render_template(
         template,
         url_validation=url_validation,
         user=user_dict,
-        additional_fields=[
-            {"key": key, "value": value}
-            for key, value in (user_dict.get("champs_addi") or {}).items()
-        ],
+        additional_fields=additional_fields,
     )
 
     send_mail(recipients, subject, msg_html)

diff --git a/backend/geonature/core/users/routes.py b/backend/geonature/core/users/routes.py
@@ -300,7 +300,28 @@ def confirmation():
     if r.status_code != 200:
         return Response(r), r.status_code
 
-    return redirect(config["URL_APPLICATION"], code=302)
+    new_user = r.json()
+
+    txt_champs_addi = ""
+    for key in new_user["champs_addi"]:
+        txt_champs_addi += (
+            f"&nbsp;&nbsp;&nbsp;&nbsp;- <b>{key}</b>: {new_user['champs_addi'][key]}<br>"
+        )
+
+    return (
+        f"""Le compte suivant à bien été ajouté à l'application GeoNature<br>
+    <br>
+    - <b>Nom</b>: {new_user['nom_role']}<br>
+    - <b>Prénom</b>: {new_user['prenom_role']}<br>
+    - <b>Identifiant</b>: {new_user['identifiant']}<br>
+    - <b>Email</b>: {new_user['email']}<br>
+    - <b>Champs additionnels</b>:<br>
+    {txt_champs_addi}
+    <br>
+    <a href="{config["URL_APPLICATION"]}">Retour à l'application GeoNature</a>
+        """,
+        200,
+    )
 
 
 @routes.route("/after_confirmation", methods=["POST"])

diff --git a/backend/geonature/core/users/templates/email_admin_validate_account.html b/backend/geonature/core/users/templates/email_admin_validate_account.html
@@ -10,6 +10,10 @@
   <li><b>Prénom :</b> {{user.prenom_role}}</li>
   <li><b>Identifiant :</b> {{user.identifiant}}</li>
   <li><b>Email :</b> {{user.email}}</li>
+{% if  user.remarques %}
+  <li><b>Remarques :</b> {{user.remarques}}</li>
+{% endif%}
+
 </ul>
 
 {% if additional_fields | length > 0 %}

diff --git a/frontend/src/app/modules/login/sign-up/sign-up.component.html b/frontend/src/app/modules/login/sign-up/sign-up.component.html
@@ -214,6 +214,9 @@ <h5>Informations complémentaires</h5>
                 </button>
               </div>
             </form>
+            <ngb-alert type="danger" *ngIf="errorMsg">
+              {{errorMsg}}
+            </ngb-alert>
           </div>
         </div>
       </div>

diff --git a/frontend/src/app/modules/login/sign-up/sign-up.component.ts b/frontend/src/app/modules/login/sign-up/sign-up.component.ts
@@ -7,7 +7,6 @@ import { CommonService } from '@geonature_common/service/common.service';
 
 import { AuthService } from '../../../components/auth/auth.service';
 import { ConfigService } from '@geonature/services/config.service';
-
 @Component({
   selector: 'pnx-signup',
   templateUrl: './sign-up.component.html',
@@ -19,6 +18,7 @@ export class SignUpComponent implements OnInit {
   public disableSubmit = false;
   public formControlBuilded = false;
   public FORM_CONFIG = null;
+  public errorMsg = '';
 
   constructor(
     private fb: UntypedFormBuilder,
@@ -57,21 +57,33 @@ export class SignUpComponent implements OnInit {
 
   save() {
     if (this.form.valid) {
+      this.errorMsg = ''; // raz de l'erreur
       this.disableSubmit = true;
       const finalForm = Object.assign({}, this.form.value);
       // concatenate two forms
+      finalForm['champs_addi'] = {};
       if (this.config.ACCOUNT_MANAGEMENT.ACCOUNT_FORM.length > 0) {
         finalForm['champs_addi'] = this.dynamicFormGroup.value;
       }
+      // ajout de organisme aux champs addi
+      finalForm['champs_addi']['organisme'] = this.form.value['organisme'];
       this._authService
         .signupUser(finalForm)
-        .subscribe(() => {
-          const callbackMessage = this.config.ACCOUNT_MANAGEMENT.AUTO_ACCOUNT_CREATION
-            ? 'AutoAccountEmailConfirmation'
-            : 'AdminAccountEmailConfirmation';
-          this._commonService.translateToaster('info', callbackMessage);
-          this._router.navigate(['/login']);
-        })
+        .subscribe(
+          () => {
+            const callbackMessage = this.config.ACCOUNT_MANAGEMENT.AUTO_ACCOUNT_CREATION
+              ? 'AutoAccountEmailConfirmation'
+              : 'AdminAccountEmailConfirmation';
+            this._commonService.translateToaster('info', callbackMessage);
+            this._router.navigate(['/login']);
+          },
+          (error) => {
+            // affichage de l'erreur renvoyé par l'api
+            if (error.error.msg) {
+              this.errorMsg = error.error.msg;
+            }
+          }
+        )
         .add(() => {
           this.disableSubmit = false;
         });