fix(backend): fix user creation

Author: pYassine

packages/frontend/src/app/modules/manage-users/components/register-user-admin/register-user-admin.component.ts

@@ -80,6 +80,7 @@ export class RegisterUserAdminComponent implements OnInit, OnDestroy {
         this.user.prenom,
         [Validators.required, Validators.minLength(2), NoWhiteSpaceValidator],
       ],
+      structureId: [this.user.structureId, []],
     });
   }
 

packages/frontend/src/app/modules/users/services/users.service.ts

@@ -2,7 +2,7 @@ import { HttpClient } from "@angular/common/http";
 import { Injectable } from "@angular/core";
 import { Observable } from "rxjs";
 import { environment } from "src/environments/environment";
-import { ApiMessage } from "@domifa/common";
+import { ApiMessage, UserStructure } from "@domifa/common";
 
 @Injectable({
   providedIn: "root",
@@ -43,7 +43,12 @@ export class UsersService {
     return this.http.post(`${this.endPoint}/reset-password`, data);
   }
 
-  public registerUser(data: string): Observable<ApiMessage> {
+  public registerUser(
+    data: Pick<
+      UserStructure,
+      "email" | "nom" | "role" | "prenom" | "structureId"
+    >
+  ): Observable<ApiMessage> {
     return this.http.post<ApiMessage>(`${this.endPoint}/register`, data);
   }
 }

packages/portail-admins/src/app/guards/auth-guard.spec.ts

@@ -16,6 +16,7 @@ describe("AuthGuard", () => {
 
   let authService: AdminAuthService;
   let router: Router;
+  let routerService: RouterStateSnapshot;
   let toastService: CustomToastService;
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -43,14 +44,15 @@ describe("AuthGuard", () => {
     router = TestBed.inject(Router);
     toastService = TestBed.inject(CustomToastService);
     authGuard = TestBed.inject(AuthGuard);
+    routerService = TestBed.inject(RouterStateSnapshot);
   });
 
   it("should be created", inject([AuthGuard], (service: AuthGuard) => {
     expect(service).toBeTruthy();
   }));
 
   it("CanActivate", () => {
-    authGuard = new AuthGuard(authService, router, toastService);
+    authGuard = new AuthGuard(authService, router, toastService, routerService);
     expect(authGuard).toBeTruthy();
   });
 });

packages/portail-admins/src/app/guards/auth-guard.ts

@@ -2,15 +2,20 @@ import { Injectable } from "@angular/core";
 import { Observable, of } from "rxjs";
 import { catchError, map } from "rxjs/operators";
 import { AdminAuthService } from "../modules/admin-auth/services/admin-auth.service";
-import { Router, ActivatedRouteSnapshot } from "@angular/router";
+import {
+  Router,
+  ActivatedRouteSnapshot,
+  RouterStateSnapshot,
+} from "@angular/router";
 import { UserSupervisorRole } from "@domifa/common";
 import { CustomToastService } from "../modules/shared/services";
 @Injectable({ providedIn: "root" })
 export class AuthGuard {
   constructor(
     private readonly authService: AdminAuthService,
     private readonly router: Router,
-    private readonly toastService: CustomToastService
+    private readonly toastService: CustomToastService,
+    private readonly state: RouterStateSnapshot
   ) {}
 
   public canActivate(route: ActivatedRouteSnapshot): Observable<boolean> {
@@ -19,7 +24,7 @@ export class AuthGuard {
     return this.authService.isAuth().pipe(
       map((isAuth: boolean) => {
         if (!isAuth) {
-          this.authService.logoutAndRedirect();
+          this.authService.logoutAndRedirect(this.state);
           return false;
         }
 
@@ -43,7 +48,7 @@ export class AuthGuard {
         return false;
       }),
       catchError(() => {
-        this.authService.logoutAndRedirect();
+        this.authService.logoutAndRedirect(this.state);
         return of(false);
       })
     );

packages/portail-admins/src/app/interceptors/server-error.interceptor.ts

@@ -13,6 +13,7 @@ import { catchError, retry } from "rxjs/operators";
 import { getCurrentScope } from "@sentry/angular";
 import { CustomToastService } from "../modules/shared/services";
 import { AdminAuthService } from "../modules/admin-auth/services/admin-auth.service";
+import { RouterStateSnapshot } from "@angular/router";
 
 const MAX_RETRIES = 2;
 const RETRY_DELAY = 1000;
@@ -30,6 +31,7 @@ export class ServerErrorInterceptor implements HttpInterceptor {
   ): Observable<HttpEvent<any>> {
     const authService = this.injector.get(AdminAuthService);
     const toastr = this.injector.get(CustomToastService);
+    const state = this.injector.get(RouterStateSnapshot);
 
     if (authService?.currentUserValue) {
       const user = authService.currentUserValue;
@@ -68,7 +70,7 @@ export class ServerErrorInterceptor implements HttpInterceptor {
             );
           }
           if (error.status === 401) {
-            authService.logoutAndRedirect();
+            authService.logoutAndRedirect(state);
             toastr.error(
               "Votre session a expiré, merci de vous connecter à nouveau"
             );

packages/portail-admins/src/app/modules/admin-auth/admin-login/admin-login.component.ts

@@ -6,7 +6,7 @@ import {
   Validators,
 } from "@angular/forms";
 import { Title } from "@angular/platform-browser";
-import { Router } from "@angular/router";
+import { ActivatedRoute, Router } from "@angular/router";
 import { regexp } from "../../../shared/utils/validators";
 import { CustomToastService } from "../../shared/services/custom-toast.service";
 import { PortailAdminAuthLoginForm } from "../types";
@@ -24,20 +24,23 @@ export class AdminLoginComponent implements OnInit {
 
   public hidePassword: boolean;
   public loading: boolean;
-
+  public returnUrl: string;
   constructor(
     private readonly formBuilder: UntypedFormBuilder,
     private readonly router: Router,
+    private readonly route: ActivatedRoute,
     private readonly titleService: Title,
     private readonly authService: AdminAuthService,
     private readonly toastr: CustomToastService
   ) {
     this.hidePassword = true;
     this.loading = false;
+    this.returnUrl = "/";
   }
 
   public ngOnInit(): void {
-    this.titleService.setTitle("Connexion à DomiFa");
+    this.titleService.setTitle("Connexion à l'administration de DomiFa");
+    this.returnUrl = this.route.snapshot.queryParams.returnUrl || "/";
     this.initForm();
   }
 

packages/portail-admins/src/app/modules/admin-auth/services/admin-auth.service.ts

@@ -1,6 +1,6 @@
 import { HttpClient } from "@angular/common/http";
 import { Injectable } from "@angular/core";
-import { Router } from "@angular/router";
+import { Router, RouterStateSnapshot } from "@angular/router";
 
 import { BehaviorSubject, catchError, map, Observable, of } from "rxjs";
 import { environment } from "../../../../environments/environment";
@@ -75,9 +75,22 @@ export class AdminAuthService {
     getCurrentScope().setUser({});
   }
 
-  public logoutAndRedirect(): void {
+  public logoutAndRedirect(
+    state?: RouterStateSnapshot,
+    sessionExpired?: true
+  ): void {
     this.logout();
-    this.router.navigate(["/auth/login"]);
+    if (sessionExpired) {
+      this.toastr.warning("Votre session a expiré, merci de vous reconnecter");
+    }
+    this.logout();
+    if (state) {
+      this.router.navigate(["/auth/login"], {
+        queryParams: { returnUrl: state.url },
+      });
+    } else {
+      this.router.navigate(["/auth/login"]);
+    }
   }
 
   public notAuthorized(): void {