Merged PR 2033: Add, Lock, Unlock Customer Cards

Add, Lock, Unlock Customer Cards

Refs: #5313, #5329, #5334, #5335

libs/common/data-access/src/lib/operators/catch-response-args-error.ts

@@ -1,8 +1,9 @@
-import { catchError } from 'rxjs/operators';
-import { OperatorFunction, throwError } from 'rxjs';
+import { catchError, mergeMap } from 'rxjs/operators';
+import { OperatorFunction, throwError, pipe } from 'rxjs';
 import { ResponseArgsError } from '../errors';
 import { HttpErrorResponse } from '@angular/common/http';
 import { ResponseArgs } from '../models';
+import { isResponseArgs } from '../helpers';
 
 /**
  *
@@ -19,25 +20,34 @@ import { ResponseArgs } from '../models';
  *
  */
 export const catchResponseArgsErrorPipe = <T>(): OperatorFunction<T, T> =>
-  catchError((err: unknown) => {
-    if (err instanceof ResponseArgsError) {
-      return throwError(() => err);
-    }
-
-    if (err instanceof HttpErrorResponse && err.error) {
-      const payload = err.error as Partial<ResponseArgs<unknown>>;
-
-      if (payload.error === true) {
-        return throwError(
-          () =>
-            new ResponseArgsError({
-              error: true,
-              message: payload.message,
-              invalidProperties: payload.invalidProperties ?? {},
-            }),
-        );
+  pipe(
+    catchError((err: unknown) => {
+      if (err instanceof ResponseArgsError) {
+        return throwError(() => err);
       }
-    }
 
-    return throwError(() => err);
-  });
+      if (err instanceof HttpErrorResponse && err.error) {
+        const payload = err.error as Partial<ResponseArgs<unknown>>;
+
+        if (payload.error === true) {
+          return throwError(
+            () =>
+              new ResponseArgsError({
+                error: true,
+                message: payload.message,
+                invalidProperties: payload.invalidProperties ?? {},
+              }),
+          );
+        }
+      }
+
+      return throwError(() => err);
+    }),
+    mergeMap((response) => {
+      if (isResponseArgs(response) && response.error === true) {
+        return throwError(() => new ResponseArgsError(response));
+      }
+
+      return [response];
+    }),
+  );