fix: manage soap errors (#138)

zextras · Oct 11, 2022 · b26ed75 · b26ed75
1 parent cf4ca25
commit b26ed75
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 20 deletions.
diff --git a/src/network/fetch.ts b/src/network/fetch.ts
@@ -6,23 +6,20 @@
 
 import { find, map, maxBy } from 'lodash';
 import { goToLogin } from './go-to-login';
-import { Account, ErrorSoapResponse, SoapContext, SoapResponse } from '../../types';
+import {
+	Account,
+	ErrorSoapBodyResponse,
+	ErrorSoapResponse,
+	SoapContext,
+	SoapResponse
+} from '../../types';
 import { userAgent } from './user-agent';
 import { report } from '../reporting';
 import { useAccountStore } from '../store/account';
 import { IS_STANDALONE, SHELL_APP_ID } from '../constants';
 import { useNetworkStore } from '../store/network';
 import { handleSync } from '../store/network/utils';
 
-class SoapException extends Error {
-	constructor(response: ErrorSoapResponse) {
-		super(response?.Body.Fault.Reason.Text);
-		this.response = response;
-	}
-
-	response: ErrorSoapResponse;
-}
-
 export const noOp = (): void => {
 	// eslint-disable-next-line @typescript-eslint/no-use-before-define
 	getSoapFetch(SHELL_APP_ID)(
@@ -94,7 +91,7 @@ const normalizeContext = (context: any): SoapContext => {
 	return context;
 };
 
-const handleResponse = <R>(api: string, res: SoapResponse<R>): R => {
+const handleResponse = <R>(api: string, res: SoapResponse<R>): R | ErrorSoapBodyResponse => {
 	const { pollingInterval, noOpTimeout } = useNetworkStore.getState();
 	const { usedQuota } = useAccountStore.getState();
 	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -120,8 +117,6 @@ const handleResponse = <R>(api: string, res: SoapResponse<R>): R => {
 				}`
 			)
 		);
-
-		throw new SoapException(<ErrorSoapResponse>res);
 	}
 	if (res.Header?.context) {
 		const responseUsedQuota =
@@ -143,9 +138,10 @@ const handleResponse = <R>(api: string, res: SoapResponse<R>): R => {
 			..._context
 		});
 	}
+
 	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 	// @ts-ignore
-	return res.Body[`${api}Response`] as R;
+	return res?.Body?.Fault ? (res.Body as ErrorSoapBodyResponse) : (res.Body[`${api}Response`] as R);
 };
 export const getSoapFetch =
 	(app: string) =>

diff --git a/types/exports/index.d.ts b/types/exports/index.d.ts
@@ -130,9 +130,6 @@ export const soapFetch: SoapFetch;
 export const xmlSoapFetch: SoapFetch;
 export const report: (error: Error, hint?: unknown) => void;
 export const setAppContext: <T>(obj: T) => void;
-export class SoapException extends Error {
-	response: ErrorSoapResponse;
-}
 
 export const removeActions: (...ids: Array<string>) => void;
 export const registerActions: (

diff --git a/types/network/soap.d.ts b/types/network/soap.d.ts
@@ -10,10 +10,12 @@ import { BaseFolder, LinkFolderFields, SearchFolderFields } from '../misc';
 export type SoapHeader = {
 	context: SoapContext;
 };
+
 export type SuccessSoapResponse<R> = {
 	Body: Record<string, R>;
 	Header: SoapHeader;
 };
+
 export type SoapFault = {
 	Detail: {
 		Error: {
@@ -25,10 +27,13 @@ export type SoapFault = {
 		Text: string;
 	};
 };
+
+export type ErrorSoapBodyResponse = {
+	Fault: SoapFault;
+};
+
 export type ErrorSoapResponse = {
-	Body: {
-		Fault: SoapFault;
-	};
+	Body: ErrorSoapBodyResponse;
 	Header: SoapHeader;
 };