post

src/app/core/auth/auth.service.ts

@@ -22,7 +22,7 @@ export class AuthService {
   private loginUrl = environment.apiUrl  + 'auth/get-token/';
   private resetUrl = environment.apiUrl + 'rest-auth/password/reset/';
   private resetConfirmUrl = environment.apiUrl + 'rest-auth/password/reset/confirm/';
-  private mandatorySignatureUrl = environment.apiUrl + 'charter'; 
+  private mandatorySignatureUrl = environment.apiUrl + 'charter/'; 
   //add the corresponding path in backend interface 
 
 
@@ -100,6 +100,13 @@ export class AuthService {
     return false;
   }
 
+  sendSignatureCharter(email: any) : Observable<Boolean> {
+    return this.http.post<Boolean>( this.mandatorySignatureUrl+'?email=' +email,{}).pipe(
+      map((data: any) => {
+        return data}),
+    );
+  }
+  
   logout() {
     this.user.destroy();
     this.token.destroy();

src/app/login/login.component.ts

@@ -4,7 +4,7 @@ import { FormGroup, FormBuilder } from '@angular/forms';
 import { MatSnackBar } from '@angular/material';
 import { AuthService, MessageService } from 'app/core';
 import { of } from 'rxjs';
-import { filter, map, tap, catchError } from 'rxjs/operators';
+import { filter, map, tap, catchError, subscribeOn } from 'rxjs/operators';
 
 @Component({
   selector: 'app-login',
@@ -18,6 +18,7 @@ export class LoginComponent implements OnInit {
   defaultRedirectUrl: string = '/membres';
   charterUrl: string = 'inscription/student-charter';
   formGroup: FormGroup;
+  loginSuccess: boolean = false;
 
   constructor(
     private router: Router,
@@ -44,21 +45,34 @@ export class LoginComponent implements OnInit {
     });
   }
 
-  login() {
+  async login() {
+    var toto = false;
     this.loading = true;
     const { email, password } = this.formGroup.value;
     this.messageService.clear();
-    this.auth.login(email, password).pipe(
+    await this.auth.login(email, password).pipe(
+
+      map(() => this.loginSuccess = true),
       catchError(() => {
         this.messageService.error("L'identifiant ou le mot de passe est incorrect.");
+        this.loginSuccess = false;
         return of(false);
       }),
       tap(() => this.loading = false),
+
+   
       // Only continue if no error
       filter(Boolean),
       // Get redirect URL from the auth service, provided by the auth guard.
 
-    ).subscribe();
+    ).subscribe({
+      complete() {
+        console.log("login unsuccess");
+      },
+    });
+
+
+      if(this.loginSuccess == true){
        
           this.auth.checkSignatureCharter(email).pipe(
             catchError(() => {
@@ -82,6 +96,7 @@ export class LoginComponent implements OnInit {
             this.router.navigate([this.defaultRedirectUrl]);
           }
           });
+}
     
 }
 }
\ No newline at end of file

src/app/signup/parents-charter/parents-charter.component.html

@@ -85,7 +85,7 @@
   </p>
 
   <div class="text-center">
-    <button mat-raised-button color="primary"  [disabled]="!toggleSuivant()" routerLink='/membres/compte/modifier_donnees'>
+    <button mat-raised-button color="primary"  (click)="signChart()" [disabled]="!toggleSuivant()" routerLink='/membres/compte/modifier_donnees'>
       Terminer l'inscription
   </button>
   </div>

src/app/signup/parents-charter/parents-charter.component.ts

 import { Component, OnInit } from '@angular/core';
+import { AuthService } from 'app/core';
 
 import { Registration, RegistrationService, PasswordErrorStateMatcher,PersonnalData,PersonnalDataService } from '../core';
 import { StudentSignupComponent } from '../student-signup/student-signup.component';
@@ -16,7 +17,9 @@ export class ParentsCharterComponent implements OnInit {
   state_button:boolean;
   
 
-  constructor() { }
+  constructor(    
+    private auth: AuthService,
+    ) { }
 
   ngOnInit() {
    
@@ -42,5 +45,10 @@ export class ParentsCharterComponent implements OnInit {
     
 
   }
-
+  // send post to url
+  signChart()
+  {
+    console.log("signChart");
+    this.auth.sendSignatureCharter(this.auth.getUserSnapshot().email).subscribe();
+  }
 }

src/environments/environment.local.ts

 // For use when you have a local backend server running
 export const environment = {
   production: false,
-  showcaseApiUrl: 'https://oser-site-vitrine.herokuapp.com/api/',
+  showcaseApiUrl: 'https://oser-cs.fr/api/',
   apiUrl: 'http://localhost:8000/api/',
   numArticles: 3,
   donateUrl: "https://www.donnerenligne.fr/ouverture-sociale-pour-l-egalite-et-la-reussite/faire-un-don",

src/environments/environment.ts

@@ -2,7 +2,7 @@
 export const environment = {
   production: false,
   showcaseApiUrl: 'https://oser-site-vitrine.herokuapp.com/api/',
-  apiUrl: 'https://oser-backend-dev.herokuapp.com/api/',
+  apiUrl: 'http://localhost:8000/api/',
   numArticles: 3,
   donateUrl: "https://www.donnerenligne.fr/ouverture-sociale-pour-l-egalite-et-la-reussite/faire-un-don",
   currentCampaignUrl: "",

src/environments/tes-environment.ts

+// Development environment (the default)
+export const environment = {
+  production: false,
+  showcaseApiUrl: 'https://oser-site-vitrine.herokuapp.com/api/',
+  apiUrl: 'http://oser-backend:8000/api/',
+  numArticles: 3,
+  donateUrl: "https://www.donnerenligne.fr/ouverture-sociale-pour-l-egalite-et-la-reussite/faire-un-don",
+  currentCampaignUrl: "",
+};