@nestlab/google-recaptcha 3.1.3 → 3.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/decorators/recaptcha-result.js +0 -2
- package/decorators/recaptcha-result.js.map +1 -1
- package/guards/google-recaptcha.guard.js +1 -1
- package/guards/google-recaptcha.guard.js.map +1 -1
- package/helpers/get-error-info.d.ts +4 -0
- package/helpers/get-error-info.js +16 -0
- package/helpers/get-error-info.js.map +1 -0
- package/package.json +9 -15
- package/services/validators/google-recaptcha-enterprise.validator.js +9 -8
- package/services/validators/google-recaptcha-enterprise.validator.js.map +1 -1
- package/services/validators/google-recaptcha.validator.js +12 -4
- package/services/validators/google-recaptcha.validator.js.map +1 -1
package/README.md
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
[](https://github.com/chvarkov/google-recaptcha/blob/master/LICENSE)
|
|
4
4
|
[](https://www.npmjs.com/package/@nestlab/google-recaptcha)
|
|
5
5
|
[](https://github.com/chvarkov/google-recaptcha/tree/master)
|
|
6
|
-
[](https://coveralls.io/github/chvarkov/google-recaptcha?branch=
|
|
6
|
+
[](https://coveralls.io/github/chvarkov/google-recaptcha?branch=master)
|
|
7
7
|
|
|
8
8
|
The [NestJS](https://docs.nestjs.com/) module to protect your endpoints via [google recaptcha](https://www.google.com/recaptcha/about/).
|
|
9
9
|
|
|
@@ -13,8 +13,6 @@ exports.RecaptchaResult = (0, common_1.createParamDecorator)((data, context) =>
|
|
|
13
13
|
.GqlExecutionContext
|
|
14
14
|
.create(context)
|
|
15
15
|
.getContext().req) === null || _a === void 0 ? void 0 : _a.connection) === null || _b === void 0 ? void 0 : _b._httpMessage) === null || _c === void 0 ? void 0 : _c.req) === null || _d === void 0 ? void 0 : _d.recaptchaValidationResult;
|
|
16
|
-
default:
|
|
17
|
-
return null;
|
|
18
16
|
}
|
|
19
17
|
});
|
|
20
18
|
//# sourceMappingURL=recaptcha-result.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recaptcha-result.js","sourceRoot":"","sources":["../../src/decorators/recaptcha-result.ts"],"names":[],"mappings":";;;AAAA,2CAAwE;AACxE,wDAAoD;AAEvC,QAAA,eAAe,GAAG,IAAA,6BAAoB,EAAC,CAAC,IAAI,EAAE,OAAyB,EAAE,EAAE;;IACpF,QAAQ,OAAO,CAAC,OAAO,EAAsB,EAAE;QAC3C,KAAK,MAAM;YACP,OAAO,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC,yBAAyB,CAAC;QACzE,KAAK,SAAS;YACV,OAAO,MAAA,MAAA,MAAA,MAAA,IAAA,wBAAU,EAAC,iBAAiB,EAAE,IAAI,CAAC;iBACrC,mBAAmB;iBACnB,MAAM,CAAC,OAAO,CAAC;iBACf,UAAU,EAAE,CAAC,GAAG,0CAAE,UAAU,0CAAE,YAAY,0CAAE,GAAG,0CAAE,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"recaptcha-result.js","sourceRoot":"","sources":["../../src/decorators/recaptcha-result.ts"],"names":[],"mappings":";;;AAAA,2CAAwE;AACxE,wDAAoD;AAEvC,QAAA,eAAe,GAAG,IAAA,6BAAoB,EAAC,CAAC,IAAI,EAAE,OAAyB,EAAE,EAAE;;IACpF,QAAQ,OAAO,CAAC,OAAO,EAAsB,EAAE;QAC3C,KAAK,MAAM;YACP,OAAO,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC,yBAAyB,CAAC;QACzE,KAAK,SAAS;YACV,OAAO,MAAA,MAAA,MAAA,MAAA,IAAA,wBAAU,EAAC,iBAAiB,EAAE,IAAI,CAAC;iBACrC,mBAAmB;iBACnB,MAAM,CAAC,OAAO,CAAC;iBACf,UAAU,EAAE,CAAC,GAAG,0CAAE,UAAU,0CAAE,YAAY,0CAAE,GAAG,0CAAE,yBAAyB,CAAC;KACvF;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -39,7 +39,7 @@ let GoogleRecaptchaGuard = class GoogleRecaptchaGuard {
|
|
|
39
39
|
}
|
|
40
40
|
const options = this.reflector.get(provider_declarations_1.RECAPTCHA_VALIDATION_OPTIONS, context.getHandler());
|
|
41
41
|
const response = (options === null || options === void 0 ? void 0 : options.response)
|
|
42
|
-
? await
|
|
42
|
+
? await options.response(request)
|
|
43
43
|
: await this.options.response(request);
|
|
44
44
|
const score = (options === null || options === void 0 ? void 0 : options.score) || this.options.score;
|
|
45
45
|
const action = options === null || options === void 0 ? void 0 : options.action;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google-recaptcha.guard.js","sourceRoot":"","sources":["../../src/guards/google-recaptcha.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA0G;AAC1G,oEAA6G;AAC7G,yFAAoF;AACpF,uCAAyC;AACzC,uFAAkF;AAGlF,2FAAsF;AACtF,gFAA2E;AAE3E,wHAAkH;AAGlH,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAC7B,YAA6B,SAAoB,EACpB,eAAyC,EACzC,iBAA6C,EACnB,MAAc,EACb,OAAqC;QAJhE,cAAS,GAAT,SAAS,CAAW;QACpB,oBAAe,GAAf,eAAe,CAA0B;QACzC,sBAAiB,GAAjB,iBAAiB,CAA4B;QACnB,WAAM,GAAN,MAAM,CAAQ;QACb,YAAO,GAAP,OAAO,CAA8B;IAC7F,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAyB;QACvC,MAAM,OAAO,GAAkB,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAErE,MAAM,IAAI,GAAG,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,UAAU;YAClD,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;YACpC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QAE5B,IAAI,IAAI,EAAE;YACN,OAAO,IAAI,CAAC;SACf;QAED,MAAM,OAAO,GAAmC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,oDAA4B,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;QAEvH,MAAM,QAAQ,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ;YAC9B,CAAC,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"google-recaptcha.guard.js","sourceRoot":"","sources":["../../src/guards/google-recaptcha.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA0G;AAC1G,oEAA6G;AAC7G,yFAAoF;AACpF,uCAAyC;AACzC,uFAAkF;AAGlF,2FAAsF;AACtF,gFAA2E;AAE3E,wHAAkH;AAGlH,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAC7B,YAA6B,SAAoB,EACpB,eAAyC,EACzC,iBAA6C,EACnB,MAAc,EACb,OAAqC;QAJhE,cAAS,GAAT,SAAS,CAAW;QACpB,oBAAe,GAAf,eAAe,CAA0B;QACzC,sBAAiB,GAAjB,iBAAiB,CAA4B;QACnB,WAAM,GAAN,MAAM,CAAQ;QACb,YAAO,GAAP,OAAO,CAA8B;IAC7F,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAyB;QACvC,MAAM,OAAO,GAAkB,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAErE,MAAM,IAAI,GAAG,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,UAAU;YAClD,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;YACpC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QAE5B,IAAI,IAAI,EAAE;YACN,OAAO,IAAI,CAAC;SACf;QAED,MAAM,OAAO,GAAmC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,oDAA4B,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;QAEvH,MAAM,QAAQ,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ;YAC9B,CAAC,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;YACjC,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE3C,MAAM,KAAK,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,KAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;QACnD,MAAM,MAAM,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC;QAE/B,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC;QAEnD,OAAO,CAAC,yBAAyB,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,EAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAC,CAAC,CAAC;QAExF,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;YACpB,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;YACpD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,yBAAyB,EAAE,GAAG,SAAS,SAAS,CAAC,CAAC;SAC/E;QAED,IAAI,OAAO,CAAC,yBAAyB,CAAC,OAAO,EAAE;YAC3C,OAAO,IAAI,CAAC;SACf;QAED,MAAM,IAAI,qDAAwB,CAAC,OAAO,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC;IACjF,CAAC;IAEO,iBAAiB,CAAC,SAAoD;QAC1E,OAAO,SAAS,YAAY,0EAAkC;YAC1D,CAAC,CAAC,iDAAsB,CAAC,yBAAyB;YAClD,CAAC,CAAC,iDAAsB,CAAC,eAAe,CAAC;IACjD,CAAC;CACJ,CAAA;AAjDY,oBAAoB;IADhC,IAAA,mBAAU,GAAE;IAKI,WAAA,IAAA,eAAM,EAAC,wCAAgB,CAAC,CAAA;IACxB,WAAA,IAAA,eAAM,EAAC,yCAAiB,CAAC,CAAA;qCAJE,gBAAS;QACH,qDAAwB;QACtB,yDAA0B;QACX,eAAM;GAJ5D,oBAAoB,CAiDhC;AAjDY,oDAAoB"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getErrorInfo = exports.isAxiosError = void 0;
|
|
4
|
+
function isAxiosError(error) {
|
|
5
|
+
return error.isAxiosError;
|
|
6
|
+
}
|
|
7
|
+
exports.isAxiosError = isAxiosError;
|
|
8
|
+
function getErrorInfo(error) {
|
|
9
|
+
var _a;
|
|
10
|
+
if (isAxiosError(error)) {
|
|
11
|
+
return ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data) || error.code || 'Unknown axios error';
|
|
12
|
+
}
|
|
13
|
+
return { error: error.name, message: error.message, stack: error.stack };
|
|
14
|
+
}
|
|
15
|
+
exports.getErrorInfo = getErrorInfo;
|
|
16
|
+
//# sourceMappingURL=get-error-info.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-error-info.js","sourceRoot":"","sources":["../../src/helpers/get-error-info.ts"],"names":[],"mappings":";;;AAGA,SAAgB,YAAY,CAAC,KAA+B;IACxD,OAA0B,KAAM,CAAC,YAAY,CAAC;AAClD,CAAC;AAFD,oCAEC;AAED,SAAgB,YAAY,CAAC,KAAY;;IACrC,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE;QACrB,OAAO,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,IAAI,KAAI,KAAK,CAAC,IAAI,IAAI,qBAAqB,CAAC;KACtE;IAED,OAAO,EAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAC,CAAC;AAC3E,CAAC;AAND,oCAMC"}
|
package/package.json
CHANGED
|
@@ -1,32 +1,22 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nestlab/google-recaptcha",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.4",
|
|
4
4
|
"description": "Google recaptcha module for NestJS.",
|
|
5
5
|
"keywords": [
|
|
6
|
-
"nest",
|
|
7
6
|
"nestjs",
|
|
8
|
-
"module",
|
|
9
|
-
"guard",
|
|
10
|
-
"google",
|
|
11
7
|
"recaptcha",
|
|
12
|
-
"
|
|
13
|
-
"
|
|
14
|
-
"nestjs captcha",
|
|
15
|
-
"nestjs recaptcha",
|
|
16
|
-
"graphql"
|
|
8
|
+
"google recaptcha",
|
|
9
|
+
"nestjs recaptcha"
|
|
17
10
|
],
|
|
18
11
|
"private": false,
|
|
19
12
|
"main": "index.js",
|
|
20
|
-
"module": "index.js",
|
|
21
|
-
"types": "index.d.ts",
|
|
22
|
-
"readme": "README.md",
|
|
23
13
|
"scripts": {
|
|
24
14
|
"build": "rimraf dist && tsc && cp package.json dist && cp README.md dist && cp LICENSE dist && cp CONTRIBUTING.md dist",
|
|
25
15
|
"lint:fix": "eslint . --fix",
|
|
26
16
|
"lint:check": "eslint . --max-warnings=0",
|
|
27
17
|
"test": "jest --silent=false",
|
|
28
18
|
"test:cov": "jest --coverage",
|
|
29
|
-
"test:coveralls": "jest --coverage && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage"
|
|
19
|
+
"test:coveralls": "jest --runInBand --coverage && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage"
|
|
30
20
|
},
|
|
31
21
|
"repository": {
|
|
32
22
|
"type": "git",
|
|
@@ -49,19 +39,23 @@
|
|
|
49
39
|
}
|
|
50
40
|
},
|
|
51
41
|
"devDependencies": {
|
|
42
|
+
"@nestjs/apollo": "^10.0.22",
|
|
52
43
|
"@nestjs/axios": "^0.1.0",
|
|
53
44
|
"@nestjs/common": "^9.0.11",
|
|
54
45
|
"@nestjs/core": "^9.0.11",
|
|
55
|
-
"@nestjs/graphql": "^10.0.
|
|
46
|
+
"@nestjs/graphql": "^10.0.22",
|
|
56
47
|
"@nestjs/platform-express": "^9.0.11",
|
|
57
48
|
"@nestjs/testing": "^9.0.11",
|
|
58
49
|
"@types/express": "^4.17.13",
|
|
59
50
|
"@types/jest": "^28.1.7",
|
|
60
51
|
"@types/node": "^18.7.6",
|
|
52
|
+
"@types/supertest": "^2.0.12",
|
|
61
53
|
"@typescript-eslint/eslint-plugin": "^5.33.1",
|
|
62
54
|
"@typescript-eslint/parser": "^5.33.1",
|
|
55
|
+
"apollo-server-express": "^3.10.2",
|
|
63
56
|
"coveralls": "^3.1.1",
|
|
64
57
|
"eslint": "^8.22.0",
|
|
58
|
+
"graphql": "^16.6.0",
|
|
65
59
|
"jest": "^28.1.3",
|
|
66
60
|
"reflect-metadata": "^0.1.13",
|
|
67
61
|
"rxjs": "^7.5.6",
|
|
@@ -23,6 +23,7 @@ const google_recaptcha_network_exception_1 = require("../../exceptions/google-re
|
|
|
23
23
|
const google_recaptcha_context_1 = require("../../enums/google-recaptcha-context");
|
|
24
24
|
const enterprise_reason_transformer_1 = require("../enterprise-reason.transformer");
|
|
25
25
|
const rxjs_1 = require("rxjs");
|
|
26
|
+
const get_error_info_1 = require("../../helpers/get-error-info");
|
|
26
27
|
let GoogleRecaptchaEnterpriseValidator = class GoogleRecaptchaEnterpriseValidator extends abstract_google_recaptcha_validator_1.AbstractGoogleRecaptchaValidator {
|
|
27
28
|
constructor(http, logger, options, enterpriseReasonTransformer) {
|
|
28
29
|
super(options);
|
|
@@ -35,14 +36,14 @@ let GoogleRecaptchaEnterpriseValidator = class GoogleRecaptchaEnterpriseValidato
|
|
|
35
36
|
var _a, _b, _c;
|
|
36
37
|
const [result, errorDetails] = await this.verifyResponse(options.response, options.action);
|
|
37
38
|
const errors = [];
|
|
38
|
-
let success = result.tokenProperties.valid;
|
|
39
|
-
if (result.tokenProperties.invalidReason) {
|
|
40
|
-
errors.push(this.enterpriseReasonTransformer.transform(result.tokenProperties.invalidReason));
|
|
41
|
-
}
|
|
39
|
+
let success = (result === null || result === void 0 ? void 0 : result.tokenProperties.valid) || false;
|
|
42
40
|
if (errorDetails) {
|
|
43
41
|
errors.push(error_code_1.ErrorCode.UnknownError);
|
|
44
42
|
}
|
|
45
|
-
if (
|
|
43
|
+
if (result) {
|
|
44
|
+
if (result.tokenProperties.invalidReason) {
|
|
45
|
+
errors.push(this.enterpriseReasonTransformer.transform(result.tokenProperties.invalidReason));
|
|
46
|
+
}
|
|
46
47
|
if (!this.isValidAction(result.tokenProperties.action, options)) {
|
|
47
48
|
success = false;
|
|
48
49
|
errors.push(error_code_1.ErrorCode.ForbiddenAction);
|
|
@@ -89,15 +90,15 @@ let GoogleRecaptchaEnterpriseValidator = class GoogleRecaptchaEnterpriseValidato
|
|
|
89
90
|
return [data, null];
|
|
90
91
|
})
|
|
91
92
|
.catch((err) => {
|
|
92
|
-
var _a
|
|
93
|
+
var _a;
|
|
93
94
|
if (this.options.debug) {
|
|
94
|
-
this.logger.debug((
|
|
95
|
+
this.logger.debug((0, get_error_info_1.getErrorInfo)(err), `${google_recaptcha_context_1.GoogleRecaptchaContext.GoogleRecaptchaEnterprise}.error`);
|
|
95
96
|
}
|
|
96
97
|
const networkErrorCode = err.isAxiosError && err.code;
|
|
97
98
|
if (networkErrorCode) {
|
|
98
99
|
throw new google_recaptcha_network_exception_1.GoogleRecaptchaNetworkException(networkErrorCode);
|
|
99
100
|
}
|
|
100
|
-
const errData = (
|
|
101
|
+
const errData = (_a = err.response) === null || _a === void 0 ? void 0 : _a.data;
|
|
101
102
|
return [null, errData];
|
|
102
103
|
});
|
|
103
104
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google-recaptcha-enterprise.validator.js","sourceRoot":"","sources":["../../../src/services/validators/google-recaptcha-enterprise.validator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA2E;AAC3E,uEAA0G;AAC1G,yCAA4C;AAG5C,+FAAyF;AACzF,8FAAyF;AACzF,uDAAmD;AAEnD,4GAAsG;AACtG,mFAA8E;AAE9E,oFAA+E;AAC/E,+BAAsC;
|
|
1
|
+
{"version":3,"file":"google-recaptcha-enterprise.validator.js","sourceRoot":"","sources":["../../../src/services/validators/google-recaptcha-enterprise.validator.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,7 @@ const abstract_google_recaptcha_validator_1 = require("./abstract-google-recaptc
|
|
|
24
24
|
const recaptcha_verification_result_1 = require("../../models/recaptcha-verification-result");
|
|
25
25
|
const google_recaptcha_context_1 = require("../../enums/google-recaptcha-context");
|
|
26
26
|
const rxjs_1 = require("rxjs");
|
|
27
|
+
const get_error_info_1 = require("../../helpers/get-error-info");
|
|
27
28
|
let GoogleRecaptchaValidator = class GoogleRecaptchaValidator extends abstract_google_recaptcha_validator_1.AbstractGoogleRecaptchaValidator {
|
|
28
29
|
constructor(http, logger, options) {
|
|
29
30
|
super(options);
|
|
@@ -38,9 +39,16 @@ let GoogleRecaptchaValidator = class GoogleRecaptchaValidator extends abstract_g
|
|
|
38
39
|
*/
|
|
39
40
|
async validate(options) {
|
|
40
41
|
const result = await this.verifyResponse(options.response);
|
|
41
|
-
const nativeResponse = Object.assign({}, result);
|
|
42
42
|
if (!this.isUseV3(result)) {
|
|
43
|
-
|
|
43
|
+
const resV2 = result;
|
|
44
|
+
return new recaptcha_verification_result_1.RecaptchaVerificationResult({
|
|
45
|
+
nativeResponse: resV2,
|
|
46
|
+
score: undefined,
|
|
47
|
+
action: undefined,
|
|
48
|
+
errors: resV2.errors,
|
|
49
|
+
success: resV2.success,
|
|
50
|
+
hostname: resV2.hostname,
|
|
51
|
+
});
|
|
44
52
|
}
|
|
45
53
|
if (!this.isValidAction(result.action, options)) {
|
|
46
54
|
result.success = false;
|
|
@@ -50,6 +58,7 @@ let GoogleRecaptchaValidator = class GoogleRecaptchaValidator extends abstract_g
|
|
|
50
58
|
result.success = false;
|
|
51
59
|
result.errors.push(error_code_1.ErrorCode.LowScore);
|
|
52
60
|
}
|
|
61
|
+
const nativeResponse = Object.assign({}, result);
|
|
53
62
|
return new recaptcha_verification_result_1.RecaptchaVerificationResult({
|
|
54
63
|
nativeResponse: nativeResponse,
|
|
55
64
|
score: result.score,
|
|
@@ -82,9 +91,8 @@ let GoogleRecaptchaValidator = class GoogleRecaptchaValidator extends abstract_g
|
|
|
82
91
|
return result;
|
|
83
92
|
})
|
|
84
93
|
.catch((err) => {
|
|
85
|
-
var _a;
|
|
86
94
|
if (this.options.debug) {
|
|
87
|
-
this.logger.debug((
|
|
95
|
+
this.logger.debug((0, get_error_info_1.getErrorInfo)(err), `${google_recaptcha_context_1.GoogleRecaptchaContext.GoogleRecaptcha}.error`);
|
|
88
96
|
}
|
|
89
97
|
const networkErrorCode = err.isAxiosError && err.code;
|
|
90
98
|
if (networkErrorCode) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google-recaptcha.validator.js","sourceRoot":"","sources":["../../../src/services/validators/google-recaptcha.validator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4D;AAC5D,uEAA0G;AAC1G,kCAAkC;AAElC,mFAA8E;AAG9E,uDAAmD;AACnD,4GAAsG;AACtG,yCAA4C;AAE5C,+FAAyF;AACzF,8FAAyF;AACzF,mFAA8E;AAC9E,+BAAsC;
|
|
1
|
+
{"version":3,"file":"google-recaptcha.validator.js","sourceRoot":"","sources":["../../../src/services/validators/google-recaptcha.validator.ts"],"names":[],"mappings":"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"}
|