NAS-132648 / 25.04 / query param handling for auth tokens

src/app/core/testing/utils/empty-auth.service.ts

@@ -15,4 +15,5 @@ export class EmptyAuthService {
   logout = getMissingInjectionErrorFactory(AuthService.name);
   refreshUser = getMissingInjectionErrorFactory(AuthService.name);
   loginWithToken = getMissingInjectionErrorFactory(AuthService.name);
+  setQueryTokenIfExists = getMissingInjectionErrorFactory(AuthService.name);
 }

src/app/pages/signin/store/signin.store.spec.ts

@@ -1,10 +1,10 @@
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { createServiceFactory, SpectatorService } from '@ngneat/spectator';
 import { mockProvider } from '@ngneat/spectator/jest';
 import { BehaviorSubject, firstValueFrom, of } from 'rxjs';
 import { MockApiService } from 'app/core/testing/classes/mock-api.service';
 import { getTestScheduler } from 'app/core/testing/utils/get-test-scheduler.utils';
-import { mockCall, mockApi } from 'app/core/testing/utils/mock-api.utils';
+import { mockApi, mockCall } from 'app/core/testing/utils/mock-api.utils';
 import { FailoverDisabledReason } from 'app/enums/failover-disabled-reason.enum';
 import { FailoverStatus } from 'app/enums/failover-status.enum';
 import { LoginResult } from 'app/enums/login-result.enum';
@@ -66,6 +66,7 @@
           },
         },
       },
+      mockProvider(ActivatedRoute, { snapshot: { queryParamMap: { get: jest.fn() } } }),
     ],
   });
 
@@ -82,6 +83,7 @@
     });
     jest.spyOn(authService, 'loginWithToken').mockReturnValue(of(LoginResult.Success));
     jest.spyOn(authService, 'clearAuthToken').mockReturnValue(null);
+    jest.spyOn(authService, 'setQueryTokenIfExists').mockReturnValue(undefined)
   });
 
   describe('selectors', () => {

src/app/pages/signin/store/signin.store.ts

@@ -1,6 +1,6 @@
 import { Inject, Injectable } from '@angular/core';
 import { MatSnackBar } from '@angular/material/snack-bar';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
 import { ComponentStore } from '@ngrx/component-store';
 import { Actions, ofType } from '@ngrx/effects';
@@ -81,6 +81,7 @@ export class SigninStore extends ComponentStore<SigninState> {
     private authService: AuthService,
     private updateService: UpdateService,
     private actions$: Actions,
+    private activatedRoute: ActivatedRoute,
     @Inject(WINDOW) private window: Window,
   ) {
     super(initialState);
@@ -240,6 +241,9 @@ export class SigninStore extends ComponentStore<SigninState> {
   }
 
   private handleLoginWithToken(): Observable<LoginResult> {
+    this.authService.setQueryTokenIfExists(
+      this.activatedRoute.snapshot.queryParamMap.get('token'),
+    );
     return this.tokenLastUsedService.isTokenWithinTimeline$.pipe(take(1)).pipe(
       filter((isTokenWithinTimeline) => {
         if (!isTokenWithinTimeline) {

src/app/services/auth/auth-guard.service.ts

@@ -1,5 +1,5 @@
 import { Inject, Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, RouterStateSnapshot, Router } from '@angular/router';
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
 import { WINDOW } from 'app/helpers/window.helper';
 import { AuthService } from 'app/services/auth/auth.service';
@@ -20,13 +20,13 @@ export class AuthGuardService {
     });
   }
 
-  canActivate(_: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
+  canActivate({ queryParams }: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
     if (this.isAuthenticated) {
       return true;
     }
 
-    this.window.sessionStorage.setItem('redirectUrl', state.url);
-    this.router.navigate(['/signin']);
+    this.window.sessionStorage.setItem('redirectUrl', state.url.split('?')[0]);
+    this.router.navigate(['/signin'], { queryParams });
 
     return false;
   }

src/app/services/auth/auth.service.ts

@@ -131,6 +131,16 @@ export class AuthService {
     );
   }
 
+  setQueryTokenIfExists(token: string | null): void {
+    if (!token || this.window.location.protocol !== 'https:') {
+      return;
+    }
+
+    this.token = token;
+    this.tokenLastUsedService.updateTokenLastUsed();
+    this.latestTokenGenerated$.next(token);
+  }
+
   loginWithToken(): Observable<LoginResult> {
     if (!this.token) {
       return of(LoginResult.NoToken);

src/main.ts

@@ -11,6 +11,7 @@ import {
   provideRouter,
   PreloadAllModules,
   withComponentInputBinding,
+  withDebugTracing,
 } from '@angular/router';
 import { provideEffects } from '@ngrx/effects';
 import { provideRouterStore } from '@ngrx/router-store';
@@ -121,6 +122,6 @@ bootstrapApplication(AppComponent, {
     provideCharts(withDefaultRegisterables()),
     provideHttpClient(withInterceptorsFromDi()),
     provideAnimations(),
-    provideRouter(rootRoutes, withPreloading(PreloadAllModules), withComponentInputBinding()),
+    provideRouter(rootRoutes, withPreloading(PreloadAllModules), withComponentInputBinding(), withDebugTracing()),
   ],
 });