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

src/app/core/guards/websocket-connection.guard.ts

@@ -18,7 +18,7 @@ export class WebSocketConnectionGuard {
     private translate: TranslateService,
   ) {
     this.wsManager.isClosed$.pipe(untilDestroyed(this)).subscribe((isClosed) => {
-      if (isClosed) {
+      if (isClosed && this.wsManager.hasOpenedOnce) {
         this.resetUi();
         // TODO: Test why manually changing close status is needed
         // Test a shutdown function to see how UI acts when this isn't done

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);
+  setQueryToken = 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 @@ describe('SigninStore', () => {
           },
         },
       },
+      mockProvider(ActivatedRoute, { snapshot: { queryParamMap: { get: jest.fn(() => null) } } }),
     ],
   });
 
@@ -82,6 +83,7 @@ describe('SigninStore', () => {
     });
     jest.spyOn(authService, 'loginWithToken').mockReturnValue(of(LoginResult.Success));
     jest.spyOn(authService, 'clearAuthToken').mockReturnValue(null);
+    jest.spyOn(authService, 'setQueryToken').mockReturnValue(undefined);
   });
 
   describe('selectors', () => {
@@ -187,14 +189,24 @@ describe('SigninStore', () => {
       expect(spectator.inject(Router).navigateByUrl).toHaveBeenCalledWith('/dashboard');
     });
 
-    it('should not call "loginWithToken" if token is not within timeline and clear auth token', () => {
+    it('should not call "loginWithToken" if token is not within timeline and clear auth token and queryToken is null', () => {
       isTokenWithinTimeline$.next(false);
       spectator.service.init();
 
       expect(authService.clearAuthToken).toHaveBeenCalled();
       expect(authService.loginWithToken).not.toHaveBeenCalled();
       expect(spectator.inject(Router).navigateByUrl).not.toHaveBeenCalled();
     });
+
+    it('should call "loginWithToken" if queryToken is not null', () => {
+      isTokenWithinTimeline$.next(false);
+      const token = 'token';
+      const activatedRoute = spectator.inject(ActivatedRoute);
+      jest.spyOn(activatedRoute.snapshot.queryParamMap, 'get').mockImplementationOnce(() => token);
+      spectator.service.init();
+      expect(authService.setQueryToken).toHaveBeenCalledWith(token);
+      expect(authService.loginWithToken).toHaveBeenCalled();
+    });
   });
 
   describe('init - failover subscriptions', () => {

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';
@@ -68,6 +68,14 @@ export class SigninStore extends ComponentStore<SigninState> {
   private failoverStatusSubscription: Subscription;
   private disabledReasonsSubscription: Subscription;
 
+  private handleLoginResult = (loginResult: LoginResult): void => {
+    if (loginResult !== LoginResult.Success) {
+      this.authService.clearAuthToken();
+    } else {
+      this.handleSuccessfulLogin();
+    }
+  };
+
   constructor(
     private api: ApiService,
     private translate: TranslateService,
@@ -81,6 +89,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);
@@ -97,7 +106,14 @@ export class SigninStore extends ComponentStore<SigninState> {
       this.updateService.hardRefreshIfNeeded(),
     ])),
     tap(() => this.setLoadingState(false)),
-    switchMap(() => this.handleLoginWithToken()),
+    switchMap(() => {
+      const queryToken = this.activatedRoute.snapshot.queryParamMap.get('token');
+      if (queryToken) {
+        return this.handleLoginWithQueryToken(queryToken);
+      }
+
+      return this.handleLoginWithToken();
+    }),
   ));
 
   handleSuccessfulLogin = this.effect((trigger$: Observable<void>) => trigger$.pipe(
@@ -239,8 +255,23 @@ export class SigninStore extends ComponentStore<SigninState> {
       .subscribe((event) => this.setFailoverDisabledReasons(event.disabled_reasons));
   }
 
+  private handleLoginWithQueryToken(token: string): Observable<LoginResult> {
+    this.authService.setQueryToken(token);
+
+    return this.authService.loginWithToken().pipe(
+      tap(this.handleLoginResult.bind(this)),
+      tapResponse(
+        () => {},
+        (error: unknown) => {
+          this.dialogService.error(this.errorHandler.parseError(error));
+        },
+      ),
+    );
+  }
+
   private handleLoginWithToken(): Observable<LoginResult> {
-    return this.tokenLastUsedService.isTokenWithinTimeline$.pipe(take(1)).pipe(
+    return this.tokenLastUsedService.isTokenWithinTimeline$.pipe(
+      take(1),
       filter((isTokenWithinTimeline) => {
         if (!isTokenWithinTimeline) {
           this.authService.clearAuthToken();
@@ -249,13 +280,7 @@ export class SigninStore extends ComponentStore<SigninState> {
         return isTokenWithinTimeline;
       }),
       switchMap(() => this.authService.loginWithToken()),
-      tap((loginResult) => {
-        if (loginResult !== LoginResult.Success) {
-          this.authService.clearAuthToken();
-        } else {
-          this.handleSuccessfulLogin();
-        }
-      }),
+      tap(this.handleLoginResult.bind(this)),
       tapResponse(
         () => {},
         (error: unknown) => {

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,14 @@ export class AuthService {
     );
   }
 
+  setQueryToken(token: string | null): void {
+    if (!token || this.window.location.protocol !== 'https:') {
+      return;
+    }
+
+    this.token = token;
+  }
+
   loginWithToken(): Observable<LoginResult> {
     if (!this.token) {
       return of(LoginResult.NoToken);

src/app/services/websocket/websocket-handler.service.ts

@@ -67,6 +67,11 @@ export class WebSocketHandlerService {
     return this.wsConnection.stream$ as Observable<IncomingApiMessage>;
   }
 
+  private hasOpened = false;
+  get hasOpenedOnce(): boolean {
+    return this.hasOpened;
+  }
+
   private readonly triggerNextCall$ = new Subject<void>();
   private activeCalls = 0;
   private readonly queuedCalls: { id: string; [key: string]: unknown }[] = [];
@@ -228,6 +233,7 @@ export class WebSocketHandlerService {
   }
 
   private onOpen(): void {
+    this.hasOpened = true;
     if (this.reconnectTimerSubscription) {
       this.wsConnection.close();
       return;

src/main.ts

@@ -7,10 +7,7 @@ import { MAT_SNACK_BAR_DEFAULT_OPTIONS, MatSnackBarConfig } from '@angular/mater
 import { BrowserModule, bootstrapApplication } from '@angular/platform-browser';
 import { provideAnimations } from '@angular/platform-browser/animations';
 import {
-  withPreloading,
-  provideRouter,
-  PreloadAllModules,
-  withComponentInputBinding,
+  withPreloading, provideRouter, PreloadAllModules, withComponentInputBinding,
 } from '@angular/router';
 import { provideEffects } from '@ngrx/effects';
 import { provideRouterStore } from '@ngrx/router-store';