feat(admin): remove step-up window sign-in page

* removed sign-in page when step-up window is opened

Author: mattjoke

apps/admin-gui/src/app/app.component.html

@@ -3,7 +3,7 @@
   {{ warningMessage }}
 </div>
 <perun-web-apps-notificator [displayWarning]="displayWarning"></perun-web-apps-notificator>
-<ng-template [ngIf]="!isLoginScreenShow && !isServiceAccess && isLoggedIn()">
+<ng-template [ngIf]="!isLoginScreenShow && !isServiceAccess && isLoggedIn() && !isMfaWindowOpen">
   <perun-web-apps-header
     (sidenavToggle)="sidenav.toggle()"
     [ngStyle]="{'top': getNavMenuTop(), 'background': navBackgroundColor}"
@@ -39,6 +39,12 @@
   </mat-sidenav-container>
 </ng-template>
 
-<ng-template [ngIf]="isLoginScreenShow || isServiceAccess || !isLoggedIn()">
+<ng-template [ngIf]="isMfaWindowOpen">
+  <div class="loader-wrapper">
+    <div id="loader"></div>
+  </div>
+</ng-template>
+
+<ng-template [ngIf]="(isLoginScreenShow || isServiceAccess || !isLoggedIn()) && !isMfaWindowOpen">
   <perun-web-apps-login-screen-base [application]="'admin-gui'"></perun-web-apps-login-screen-base>
 </ng-template>

apps/admin-gui/src/app/app.component.scss

@@ -27,3 +27,8 @@ ng-scrollbar {
   --scrollbar-thumb: (106, 106, 106, 0.5);
   --scrollbar-thumb-hover-color: lightgrey;
 }
+
+.loader-wrapper {
+  display: block;
+  height: 100vh;
+}

apps/admin-gui/src/app/app.component.ts

@@ -56,6 +56,8 @@ export class AppComponent implements OnInit, AfterViewInit {
     ? 'calc(100vh - 112px)'
     : 'calc(100vh - 64px)';
 
+  isMfaWindowOpen = false;
+
   constructor(
     private cache: CacheHelperService,
     private store: StoreService,
@@ -86,6 +88,10 @@ export class AppComponent implements OnInit, AfterViewInit {
   }
 
   ngOnInit(): void {
+    if (localStorage.getItem('mfaWindow')) {
+      this.isMfaWindowOpen = true;
+      return;
+    }
     this.isLoginScreenShow = this.initAuth.isLoginScreenShown();
     this.isServiceAccess = this.initAuth.isServiceAccessLoginScreenShown();
     sessionStorage.removeItem('baLogout');

libs/perun/services/src/lib/mfa-handler.service.ts

@@ -65,6 +65,8 @@ export class MfaHandlerService {
         sessionStorage.setItem('oldAccessToken', this.oauthService.getAccessToken());
         sessionStorage.setItem('oldRefreshToken', this.oauthService.getRefreshToken());
 
+        // set 'mfaWindow' property to session
+        localStorage.setItem('mfaWindow', 'true');
         newWindow = this.setupMfaWindow();
 
         if (newWindow) {
@@ -103,6 +105,8 @@ export class MfaHandlerService {
             localStorage.setItem('access_token', sessionStorage.getItem('oldAccessToken'));
             localStorage.setItem('refresh_token', sessionStorage.getItem('oldRefreshToken'));
           }
+          // remove 'mfaWindow' property
+          localStorage.removeItem('mfaWindow');
           return observer.next(true);
         }
         if (verificationSkipped) {