fix: parse network error code

chvarkov · Sep 10, 2024 · dad24b7 · dad24b7
1 parent 60374ff
commit dad24b7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/helpers/get-error-info.ts b/src/helpers/get-error-info.ts
@@ -1,8 +1,7 @@
-
 import * as axios from 'axios';
 import { LiteralObject } from '../interfaces/literal-object';
 
-export function isAxiosError(error: Error | axios.AxiosError): error is axios.AxiosError {
+export function isAxiosError<T = LiteralObject>(error: Error | axios.AxiosError<T>): error is axios.AxiosError<T> {
 	return (<axios.AxiosError>error).isAxiosError;
 }
 

diff --git a/src/services/validators/google-recaptcha-enterprise.validator.ts b/src/services/validators/google-recaptcha-enterprise.validator.ts
@@ -98,7 +98,7 @@ export class GoogleRecaptchaEnterpriseValidator extends AbstractGoogleRecaptchaV
 
 		return this.axios.post<VerifyResponseEnterprise>(url, body, config)
 			.then((res) => res.data)
-			.then((data): VerifyResponse => {
+			.then((data: VerifyResponseEnterprise): VerifyResponse => {
 				if (this.options.valueOf.debug) {
 					this.logger.debug(data, `${GoogleRecaptchaContext.GoogleRecaptchaEnterprise}.response`);
 				}
@@ -110,7 +110,7 @@ export class GoogleRecaptchaEnterpriseValidator extends AbstractGoogleRecaptchaV
 					this.logger.debug(getErrorInfo(err), `${GoogleRecaptchaContext.GoogleRecaptchaEnterprise}.error`);
 				}
 
-				const networkErrorCode = err.isAxiosError && err.code;
+				const networkErrorCode = err.isAxiosError && !err.response && err.code;
 
 				if (networkErrorCode) {
 					throw new GoogleRecaptchaNetworkException(networkErrorCode);

diff --git a/src/services/validators/google-recaptcha.validator.ts b/src/services/validators/google-recaptcha.validator.ts
@@ -12,7 +12,7 @@ import { RecaptchaVerificationResult } from '../../models/recaptcha-verification
 import { GoogleRecaptchaContext } from '../../enums/google-recaptcha-context';
 import { getErrorInfo } from '../../helpers/get-error-info';
 import { AxiosInstance } from 'axios';
-import { RecaptchaConfigRef } from "../../models/recaptcha-config-ref";
+import { RecaptchaConfigRef } from '../../models/recaptcha-config-ref';
 
 @Injectable()
 export class GoogleRecaptchaValidator extends AbstractGoogleRecaptchaValidator<VerifyResponseV3> {
@@ -105,7 +105,7 @@ export class GoogleRecaptchaValidator extends AbstractGoogleRecaptchaValidator<V
 					this.logger.debug(getErrorInfo(err), `${GoogleRecaptchaContext.GoogleRecaptcha}.error`);
 				}
 
-				const networkErrorCode = err.isAxiosError && err.code;
+				const networkErrorCode = err.isAxiosError && !err.response && err.code;
 
 				if (networkErrorCode) {
 					throw new GoogleRecaptchaNetworkException(networkErrorCode);

diff --git a/test/load-module.spec.ts b/test/load-module.spec.ts
@@ -10,5 +10,6 @@ describe('loadModule', () => {
 
 	test('failed load', () => {
 		expect(() => loadModule('@unknown/unknown-package', true)).toThrowError('Cannot find module');
+		expect(() => loadModule('@unknown/unknown-package', false)).toThrowError('Cannot find module');
 	});
 });