fix(ui): redirect mfa on project pages (#6235)

Author: richardlt

ui/src/app/service/authentication/error.interceptor.ts

@@ -1,6 +1,6 @@
 import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { NavigationError, Router } from '@angular/router';
+import { NavigationStart, Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { Store } from '@ngxs/store';
 import { ToastService } from 'app/shared/toast/ToastService';
@@ -10,13 +10,18 @@ import { catchError, filter, first } from 'rxjs/operators';
 
 @Injectable()
 export class ErrorInterceptor implements HttpInterceptor {
+    lastNavigatedURL: string = '';
 
     constructor(
         private _toast: ToastService,
         private _translate: TranslateService,
         private _store: Store,
         private _router: Router
-    ) { }
+    ) {
+        this._router.events
+            .pipe(filter((e): e is NavigationStart => e instanceof NavigationStart))
+            .subscribe(e => this.lastNavigatedURL = e.url);
+    }
 
     intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
         return next.handle(req).pipe(
@@ -40,25 +45,18 @@ export class ErrorInterceptor implements HttpInterceptor {
                     if (e.error.message) {
                         // 194 is the error for "MFA required. See https://github.com/ovh/cds/blob/master/sdk/error.go#L205"
                         if (e.error.id === 194 && confirm(`${e.error.message}.\nDo you want to login using MFA ?`)) {
-                            this._router.events
-                                .pipe(
-                                    filter((e): e is NavigationError => e instanceof NavigationError),
-                                    first()
-                                )
-                                .subscribe(e => {
-                                    this._store.dispatch(new SignoutCurrentUser()).subscribe(() => {
-                                        this._router.navigate(['/auth/ask-signin/corporate-sso'], {
-                                            queryParams: {
-                                                redirect_uri: e.url,
-                                                require_mfa: true
-                                            }
-                                        });
-                                    });
+                            this._store.dispatch(new SignoutCurrentUser()).subscribe(() => {
+                                this._router.navigate(['/auth/ask-signin/corporate-sso'], {
+                                    queryParams: {
+                                        redirect_uri: this.lastNavigatedURL,
+                                        require_mfa: true
+                                    }
                                 });
-
+                            });
                             return observableThrowError(e);
                         }
                         this._toast.errorHTTP(e.status, e.error.message, e.error.from, e.error.request_id);
+                        this._router.navigate(['/home']);
                         return observableThrowError(e);
                     }
 

ui/src/app/views/project/show/project.component.ts

@@ -197,8 +197,7 @@ export class ProjectShowComponent implements OnInit, OnDestroy, AfterViewInit {
 
     refreshDatas(key: string): void {
         let opts = [new LoadOpts('withLabels', 'labels')];
-        this._store.dispatch(new FetchProject({ projectKey: key, opts }))
-            .subscribe(null, () => this._router.navigate(['/home']));
+        this._store.dispatch(new FetchProject({ projectKey: key, opts }));
     }
 
     updateFav() {