NAS-131213: Fix remarks

truenas · Nov 1, 2024 · e6d4c7e · e6d4c7e
1 parent 466b025
commit e6d4c7e
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/app/services/auth/auth.service.ts b/src/app/services/auth/auth.service.ts
@@ -14,6 +14,7 @@ import {
   switchMap,
   take,
   tap,
+  throwError,
   timer,
 } from 'rxjs';
 import { AccountAttribute } from 'app/enums/account-attribute.enum';
@@ -258,12 +259,13 @@ export class AuthService {
   private getFilteredWebSocketResponse<T>(uuid: string): Observable<T> {
     return this.wsManager.websocket$.pipe(
       filter((data: IncomingWebSocketMessage) => data.msg === IncomingApiMessageType.Result && data.id === uuid),
-      map((data: ResultMessage<T>) => {
-        if (data.error) {
-          throw data.error as unknown;
+      switchMap((data: IncomingWebSocketMessage) => {
+        if ('error' in data && data.error) {
+          return throwError(() => data.error);
         }
-        return data.result;
+        return of(data);
       }),
+      map((data: ResultMessage<T>) => data.result),
       take(1),
     );
   }