Add redirect handler

.gitignore

@@ -35,6 +35,7 @@ yarn-error.log
 /libpeerconnection.log
 testem.log
 /typings
+/scripts/*
 
 # System files
 .DS_Store

src/app/adf-user-management/guards/url-query-login.guard.ts

@@ -1,13 +1,16 @@
 import { inject } from '@angular/core';
-import { Router, ActivatedRouteSnapshot } from '@angular/router';
+import { Router } from '@angular/router';
 import { DfAuthService } from '../services/df-auth.service';
 import { catchError, map, of } from 'rxjs';
 import { ROUTES } from '../../shared/types/routes';
+import { getHashAwareQueryParams } from '../../shared/utilities/url';
 
-export const urlQueryLoginGuard = (next: ActivatedRouteSnapshot) => {
+export const urlQueryLoginGuard = () => {
   const router = inject(Router);
   const authService = inject(DfAuthService);
-  const sessionToken = next.queryParams['session_token'];
+
+  const urlParams = getHashAwareQueryParams();
+  const sessionToken = urlParams.get('session_token');
 
   if (sessionToken) {
     return authService.loginWithToken().pipe(

src/app/app.component.ts

@@ -1,12 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { DfLoadingSpinnerService } from './shared/services/df-loading-spinner.service';
 import { NgIf, AsyncPipe } from '@angular/common';
-import {
-  RouterOutlet,
-  Router,
-  ActivatedRoute,
-  NavigationEnd,
-} from '@angular/router';
+import { RouterOutlet, Router, ActivatedRoute } from '@angular/router';
 import { DfSideNavComponent } from './shared/components/df-side-nav/df-side-nav.component';
 import { DfEngagementBannerComponent } from './shared/components/df-engagement-banner/df-engagement-banner.component';
 import { DfLicenseCheckService } from './shared/services/df-license-check.service';
@@ -15,7 +10,6 @@ import { AuthService } from './shared/services/auth.service';
 import { LoggingService } from './shared/services/logging.service';
 import { LoginResponse } from './shared/types/auth.types';
 import { ROUTES } from './shared/types/routes';
-import { filter } from 'rxjs/operators';
 import { IntercomService } from './shared/services/intercom.service';
 import { DfUserDataService } from './shared/services/df-user-data.service';
 

src/app/shared/guards/logged-in.guard.ts

@@ -3,8 +3,9 @@ import { DfAuthService } from '../../adf-user-management/services/df-auth.servic
 import { map, switchMap } from 'rxjs/operators';
 import { Router } from '@angular/router';
 import { ROUTES } from '../types/routes';
-import { of } from 'rxjs';
+import { EMPTY, of } from 'rxjs';
 import { DfUserDataService } from '../services/df-user-data.service';
+import { handleRedirectIfPresent } from '../utilities/url';
 
 export const loggedInGuard = () => {
   const authService = inject(DfAuthService);
@@ -18,10 +19,18 @@ export const loggedInGuard = () => {
             if (!validSession) {
               return router.createUrlTree([ROUTES.AUTH]);
             }
+            // Session is valid, check for redirect
+            if (handleRedirectIfPresent(userDataService.token)) {
+              return false; // Prevent Angular navigation, external redirect in progress
+            }
             return true;
           })
         );
       }
+      // Already logged in, check for redirect
+      if (handleRedirectIfPresent(userDataService.token)) {
+        return EMPTY; // Don't emit, external redirect in progress
+      }
       return of(true);
     })
   );

src/app/shared/guards/not-logged-in.guard.ts

@@ -4,24 +4,36 @@ import { map, switchMap } from 'rxjs/operators';
 import { Router } from '@angular/router';
 import { ROUTES } from '../types/routes';
 import { DfUserDataService } from '../services/df-user-data.service';
-import { of } from 'rxjs';
+import { EMPTY, of } from 'rxjs';
+import { captureRedirectUrl, handleRedirectIfPresent } from '../utilities/url';
 
 export const notLoggedInGuard = () => {
   const authService = inject(DfAuthService);
   const userDataService = inject(DfUserDataService);
   const router = inject(Router);
+
+  captureRedirectUrl();
+
   return userDataService.isLoggedIn$.pipe(
     switchMap(isLoggedIn => {
       if (!isLoggedIn) {
         return authService.checkSession().pipe(
           map(validSession => {
             if (validSession) {
+              // User has valid session, check for redirect
+              if (handleRedirectIfPresent(userDataService.token)) {
+                return false; // External redirect in progress
+              }
               return router.createUrlTree([ROUTES.HOME]);
             }
             return true;
           })
         );
       }
+      // Already logged in, check for redirect
+      if (handleRedirectIfPresent(userDataService.token)) {
+        return EMPTY; // External redirect in progress
+      }
       return of(router.createUrlTree([ROUTES.HOME]));
     })
   );