Merge branch 'new_signup' of gitlab.viarezo.fr:salazard/oser-frontend into new_signup

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

@@ -18,9 +18,10 @@ class StoredToken extends SimpleStoredItem { key = 'oser-cs-user-token'; }
 })
 export class AuthService {
 
-  private loginUrl = environment.apiUrl + 'auth/get-token/';
+  private loginUrl = environment. + 'auth/get-token/';
   private resetUrl = environment.apiUrl + 'rest-auth/password/reset/';
   private resetConfirmUrl = environment.apiUrl + 'rest-auth/password/reset/confirm/';
+  private mandatorySignatureUrl = environment.apiUrl + ''; 
 
   fromGuard: boolean;
   redirectUrl: string;
@@ -82,6 +83,12 @@ export class AuthService {
     return new HttpHeaders({ Authorization: 'Token ' + this.getToken() });
   }
 
+  checkSignatureCharter(email: string) : Observable<boolean> {
+    return this.http.post<any>(this.mandatorySignatureUrl, {email : email}).pipe(
+      map(() => true),
+    );
+  }
+
   get isLoggedIn(): boolean {
     if (this.user.get()) {
       return true;

src/app/login/login.component.ts

@@ -15,6 +15,7 @@ export class LoginComponent implements OnInit {
 
   loading: boolean = false;
   defaultRedirectUrl: string = '/membres';
+  charterUrl : string = 'inscription/student-charter';
   formGroup: FormGroup;
 
   constructor(
@@ -55,9 +56,15 @@ export class LoginComponent implements OnInit {
       // Only continue if no error
       filter(Boolean),
       // Get redirect URL from the auth service, provided by the auth guard. 
-      map(() =>this.auth.redirectUrl ? this.auth.redirectUrl : this.defaultRedirectUrl),
+      map(() => {
+        if (this.auth.checkSignatureCharter) {
+          this.auth.redirectUrl ? this.auth.redirectUrl : this.defaultRedirectUrl
+        }
+        else {
+          this.auth.redirectUrl ? this.auth.redirectUrl : this.charterUrl
+        }
+      }),
       tap(() => this.snackBar.open('Connexion réussie !', 'OK', { duration: 2000 })),
-      tap((redirectUrl: string) => this.router.navigate([redirectUrl])),
     ).subscribe();
     }
 

src/app/signup/valid-email/valid-email.component.html

@@ -7,10 +7,8 @@
   </p>
 
   <div class="text-center">
-    <button mat-raised-button color="primary"  >
-      <a routerLink='/inscription/student-charter'>
+    <button mat-raised-button color="primary" routerLink='/inscription/student-charter' >
       Suivant
-    </a>
     </button>
   </div>
 </app-form-page>