fix(admin): fix login screen service access component

* service-access login component no longer shows sidebar and header after logout
* added logout notification so it is consistent with regular login

Author: mattjoke

libs/perun/login/src/lib/login-screen-service-access/login-screen-service-access.component.html

@@ -5,6 +5,9 @@ <h2>{{'SHARED_LIB.PERUN.LOGIN_SERVICE_ACCESS.LABEL' | translate}}</h2>
       <perun-web-apps-alert *ngIf="wrongUsernameOrPassword" alert_type="error">
         {{'SHARED_LIB.PERUN.LOGIN_SERVICE_ACCESS.WRONG_LOGIN_OR_PASSWORD' | translate}}
       </perun-web-apps-alert>
+      <perun-web-apps-alert *ngIf="afterLogout" class="mb-2" alert_type="success">
+        {{'SHARED_LIB.PERUN.LOGIN.LOGOUT_INFO' | translate}}
+      </perun-web-apps-alert>
       <mat-form-field appearance="outline" subscriptSizing="dynamic">
         <mat-label>{{'SHARED_LIB.PERUN.LOGIN_SERVICE_ACCESS.USERNAME' | translate}}</mat-label>
         <input matInput required (keyup.enter)="startAuth()" [formControl]="usernameCtrl" />

libs/perun/login/src/lib/login-screen-service-access/login-screen-service-access.component.ts

@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { AuthzResolverService } from '@perun-web-apps/perun/openapi';
 import { FormControl, Validators } from '@angular/forms';
 import { Router } from '@angular/router';
-import { AuthService } from '@perun-web-apps/perun/services';
+import { AuthService, InitAuthService } from '@perun-web-apps/perun/services';
 
 @Component({
   selector: 'perun-web-apps-login-screen-service-access',
@@ -13,16 +13,18 @@ export class LoginScreenServiceAccessComponent implements OnInit {
   usernameCtrl = new FormControl<string>(null, [Validators.required]);
   passwordCtrl = new FormControl<string>(null, [Validators.required]);
   wrongUsernameOrPassword = false;
+  afterLogout: boolean;
 
   constructor(
     private authzService: AuthzResolverService,
     private auth: AuthService,
+    private initAuth: InitAuthService,
     private router: Router
   ) {}
 
   startAuth(): void {
     if (this.usernameCtrl.invalid || this.passwordCtrl.invalid) return;
-
+    sessionStorage.removeItem('baAfterLogout');
     sessionStorage.setItem('basicUsername', this.usernameCtrl.value);
     sessionStorage.setItem('basicPassword', this.passwordCtrl.value);
     this.authzService.getPerunPrincipal().subscribe({
@@ -38,7 +40,18 @@ export class LoginScreenServiceAccessComponent implements OnInit {
 
   ngOnInit(): void {
     if (this.auth.isLoggedIn() || sessionStorage.getItem('baPrincipal')) {
+      sessionStorage.removeItem('baAfterLogout');
       void this.router.navigate([''], { queryParamsHandling: 'merge' });
     }
+
+    if (sessionStorage.getItem('baLogout')) {
+      this.initAuth.invalidateServiceAccess();
+      location.reload();
+    }
+
+    if (sessionStorage.getItem('baAfterLogout')) {
+      this.afterLogout = true;
+      sessionStorage.setItem('baAfterLogout', 'false');
+    }
   }
 }

libs/perun/services/src/lib/auth.service.ts

@@ -45,6 +45,7 @@ export class AuthService {
       sessionStorage.removeItem('basicUsername');
       sessionStorage.removeItem('basicPassword');
       sessionStorage.setItem('baLogout', 'true');
+      sessionStorage.setItem('baAfterLogout', 'true');
       void this.router.navigate(['/service-access'], { queryParamsHandling: 'preserve' });
     } else {
       this.logoutProcess = true;

libs/perun/services/src/lib/init-auth.service.ts

@@ -10,7 +10,7 @@ import { getDefaultDialogConfig } from '@perun-web-apps/perun/utils';
 import { Params, Router } from '@angular/router';
 import { OAuthInfoEvent, OAuthService } from 'angular-oauth2-oidc';
 import { filter } from 'rxjs/operators';
-import { firstValueFrom } from 'rxjs';
+import { firstValueFrom, timer } from 'rxjs';
 import { MfaHandlerService } from './mfa-handler.service';
 
 @Injectable({
@@ -190,6 +190,14 @@ export class InitAuthService {
     }
   }
 
+  invalidateServiceAccess(): void {
+    // Has to be promise, bc. of ExpressionChangedAfterItHasBeenCheckedError
+    timer(0).subscribe(() => {
+      this.serviceAccess = false;
+      this.setLoginScreen(true);
+    });
+  }
+
   private setLoginScreen(shown: boolean): void {
     this.loginScreenShown = shown;
   }