Pfda

src/app/core/app.component.html

@@ -1 +1,2 @@
+<app-main-notification></app-main-notification>
 <router-outlet></router-outlet>

src/app/core/auth/auth.service.ts

@@ -1,8 +1,8 @@
 import { Injectable, PLATFORM_ID, Inject } from '@angular/core';
 import { ConfigService } from '../config/config.service';
 import { Auth, Role, UserGroup } from './auth.model';
-import { Observable, Subject, of } from 'rxjs';
-import { map, take, catchError } from 'rxjs/operators';
+import { interval, Observable, Subject, of } from 'rxjs';
+import { catchError, concatMap, filter, map, take, takeWhile } from 'rxjs/operators';
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { isPlatformBrowser } from '@angular/common';
 import { UserDownload, AllUserDownloads } from '@gsrs-core/auth/user-downloads/download.model';
@@ -96,6 +96,36 @@ export class AuthService {
     );
   }
 
+  // Helper function to create an Observable that emits when the popup login window closes
+  private waitForPopupToClose(popupWindow: Window): Observable<number> {
+    return interval(1000).pipe(
+      takeWhile(() => !popupWindow.closed, true),
+      filter(() => popupWindow.closed)
+    );
+  }
+
+  // Method to handle pFDA login (using popup window) and return success/unsuccess flag
+  pfdaLogin(): Observable<boolean> {
+    const height = 700;
+    const width = 700;
+    const left = (screen.width / 2) - (width / 2);
+    const top = (screen.height / 2) - (height / 2);
+    const loginWindow = window.open(
+      '/login?force_fda_sso_login=true&user_return_to=%2Fginas%2Fclose-pfda-login-window',
+      'pFDA Login',
+      `height=${height},width=${width},top=${top},left=${left}`
+    );
+
+    return this.waitForPopupToClose(loginWindow).pipe(
+      concatMap(() =>
+        this.getAuth().pipe(
+          map(authAfterLogin => !!authAfterLogin), // Convert to boolean (true = success)
+          catchError(() => of(false)) // Return false if there's an error
+        )
+      )
+    );
+  }
+
   getAuth(): Observable<Auth> {
     return new Observable(observer => {
 
@@ -143,6 +173,10 @@ export class AuthService {
     });
   }
 
+  private deleteCookie(name: string) {
+    document.cookie = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/`;
+  }
+
   logout(): void {
     // if (
     //   !this.configService.configData
@@ -161,13 +195,22 @@ export class AuthService {
         document.cookie = name + '=;expires=Thu, 01 Jan 1970 00:00:00 GMT';
       }
     }
-    const url = `${this.configService.configData.apiBaseUrl}logout`;
-    this.http.get(url).subscribe(() => {
+    let url = `${this.configService.configData.apiBaseUrl}logout`;
+    let method = 'GET';
+
+    if (this.configService.configData.isPfdaVersion) {
+      url = '/logout';
+      method = 'DELETE';
+    }
+
+    this.http.request(method, url).subscribe(() => {
       this._auth = null;
       this._authUpdate.next(null);
+      this.deleteCookie('sessionExpiredAt');
     }, error => {
       this._auth = null;
       this._authUpdate.next(null);
+      this.deleteCookie('sessionExpiredAt');
     });
   }
 
@@ -307,11 +350,11 @@ export class AuthService {
         if (this.configService.configData && this.configService.configData.dummyWhoami) {
           observer.next(this.configService.configData.dummyWhoami);
         } else {
-        this.http.get<Auth>(`${url}whoami`)
+          this.http.get<Auth>(`${url}whoami`)
           .subscribe(
             auth => {
-            //  console.log("Authorized as");
-            //  console.log(auth);
+              //  console.log("Authorized as");
+              //  console.log(auth);
               observer.next(auth);
             },
             err => {

src/app/core/auth/csrf-token.interceptor.ts

@@ -1,35 +1,37 @@
 import { Injectable } from '@angular/core';
-import { HttpInterceptor, HttpRequest, HttpHandler, HttpEvent } from '@angular/common/http';
-import { Observable } from 'rxjs';
+import { HttpInterceptor, HttpRequest, HttpHandler, HttpEvent, HttpClient } from '@angular/common/http';
+import { from, Observable, switchMap } from 'rxjs';
+import { ConfigService } from "@gsrs-core/config";
 
 @Injectable()
 export class CsrfTokenInterceptor implements HttpInterceptor {
-
-  constructor() {}
+  constructor(private http: HttpClient, private configService: ConfigService) {}
 
   intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
 
-    // CSRF token for GET and HEAD is not needed
-    if (['GET', 'HEAD'].includes(request.method)) {
+    // CSRF token request needed in pFDA version only
+    if (['GET', 'HEAD'].includes(request.method)
+      || !(this.configService.configData?.isPfdaVersion)) {
       return next.handle(request);
     }
 
-    // Parse CSRF token from HTML meta tag
-    const metaTag: HTMLMetaElement | null = document.querySelector('meta[name=csrf-token]');
-    let csrfToken = metaTag?.content;
-    if (csrfToken === undefined) {
-      csrfToken = 'CSRF-TOKEN-NOT-PARSED';
-    }
+    return from(this.fetchCsrfToken()).pipe(
+      switchMap((token: string) => {
+        const modifiedRequest = this.addCsrfToken(request, token);
+        return next.handle(modifiedRequest);
+      })
+    );
+  }
 
-    // Clone the request and add the CSRF token to the headers
-    const modifiedRequest = request.clone({
+  private fetchCsrfToken(): Promise<string> {
+    return this.http.get(`/csrf-token`, { responseType: 'text' }).toPromise();
+  }
+
+  private addCsrfToken(request: HttpRequest<any>, token: string): HttpRequest<any> {
+    return request.clone({
       setHeaders: {
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        'X-CSRF-Token': csrfToken
+        'X-CSRF-Token': token
       }
     });
-
-    // Pass the modified request to the next handler
-    return next.handle(modifiedRequest);
   }
 }

src/app/core/auth/session-expiration/session-expiration-dialog/session-expiration-dialog.component.html

@@ -6,6 +6,7 @@ <h2 mat-dialog-title class="dialog-title">
 </div>
 <div class="dialog-actions flex-row" mat-dialog-actions>
   <span class="middle-fill"></span>
+  <button mat-flat-button color="primary" (click)="proceedAsGuest()">Proceed as a guest</button>
   <button *ngIf="timeRemainingSeconds>0" mat-flat-button color="primary" (click)="extendSession()">Extend Session</button>
   <button *ngIf="timeRemainingSeconds<=0" mat-flat-button color="primary" (click)="login()">Login</button>
 </div>

src/app/core/auth/session-expiration/session-expiration-dialog/session-expiration-dialog.component.ts

@@ -2,8 +2,9 @@ import { Component, OnInit, Inject } from '@angular/core';
 import { Router } from '@angular/router';
 import { HttpClient } from '@angular/common/http';
 import { ConfigService, SessionExpirationWarning } from '@gsrs-core/config';
-import { MatDialog, MatDialogRef, MAT_DIALOG_DATA  } from '@angular/material/dialog';
-import { AnyNsRecord } from 'dns';
+import { MatDialogRef, MAT_DIALOG_DATA  } from '@angular/material/dialog';
+import { AuthService } from '@gsrs-core/auth';
+import { concatMap } from "rxjs"
 
 @Component({
   selector: 'app-session-expiration-dialog',
@@ -23,7 +24,9 @@ export class SessionExpirationDialogComponent implements OnInit {
     @Inject(MAT_DIALOG_DATA) public data: any,
     // N.B. injected services has to come after data
     private router: Router,
-    private http: HttpClient
+    private http: HttpClient,
+    private authService: AuthService,
+    public configService: ConfigService
   ) {
     this.sessionExpirationWarning = data.sessionExpirationWarning;
     this.sessionExpiringAt = data.sessionExpiringAt;
@@ -49,11 +52,10 @@ export class SessionExpirationDialogComponent implements OnInit {
 
     if (this.timeRemainingSeconds > 0) {
       const remainingMinutes = Math.floor(this.timeRemainingSeconds / 60);
-      const reminaingSeconds = String(this.timeRemainingSeconds % 60).padStart(2, '0');
+      const remainingSeconds = String(this.timeRemainingSeconds % 60).padStart(2, '0');
       this.dialogTitle = "Session Ending Soon"
-      this.dialogMessage = `You will be logged out in ${remainingMinutes}:${reminaingSeconds}`
-    }
-    else {
+      this.dialogMessage = `You will be logged out in ${remainingMinutes}:${remainingSeconds}`
+    } else {
       this.dialogTitle = "Session Ended"
       this.dialogMessage = "Your session has expired, please login again."
     }
@@ -75,6 +77,23 @@ export class SessionExpirationDialogComponent implements OnInit {
   }
 
   login() {
-    window.location.assign('/login');
+    if (this.configService.configData.isPfdaVersion) {
+      this.authService.pfdaLogin().pipe(
+        concatMap(success => {
+          console.log('success: ', success);
+          if (success) {
+            this.closeDialog();
+            return this.authService.getAuth();
+          }
+        })).subscribe();
+    } else {
+      window.location.assign('/login');
+    }
+  }
+
+  proceedAsGuest() {
+    clearInterval(this.updateDialogInterval);
+    this.authService.logout();
+    this.closeDialog();
   }
 }