FIX #13670 TIME 1:30 Save query string in cachedUrl for scanToMaarch

src/frontend/app/login/login.component.ts

@@ -77,7 +77,7 @@ export class LoginComponent implements OnInit {
                 this.authService.saveTokens(data.headers.get('Token'), data.headers.get('Refresh-Token'));
                 this.authService.setUser({});
                 if (this.authService.getCachedUrl()) {
-                    this.router.navigate([this.authService.getCachedUrl()]);
+                    this.router.navigateByUrl(this.authService.getCachedUrl());
                     this.authService.cleanCachedUrl();
                 } else if (!this.functionsService.empty(this.authService.getUrl(JSON.parse(atob(data.headers.get('Token').split('.')[1])).user.id))) {
                     this.router.navigate([this.authService.getUrl(JSON.parse(atob(data.headers.get('Token').split('.')[1])).user.id)]);

src/frontend/service/app.guard.ts

@@ -26,6 +26,7 @@ export class AppGuard implements CanActivate {
 
     canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<any> {
         console.log('guard : ' + route.url.join('/'));
+        console.log(state.url.replace(/^\//g, ""));
 
         this.headerService.resetSideNavSelection();
 
@@ -120,7 +121,7 @@ export class AppGuard implements CanActivate {
                             this.authService.setUrl(route.url.join('/'));
                             return tokenInfo;
                         } else {
-                            this.authService.setCachedUrl(route.url.join('/'));
+                            this.authService.setCachedUrl(state.url.replace(/^\//g, ""));
                             console.log('Aucun token trouvé ! Redirection sur login ...');
                             this.authService.logout(false);
                             return false;