@nestlab/google-recaptcha 2.1.1 → 3.0.1

package/README.md

@@ -69,9 +69,7 @@ export class AppModule {
 | `secretKey`       | **Required.**<br> Type: `string`<br> Google recaptcha secret key |
 | `response`        | **Required.**<br> Type: `(request) => string`<br> Function that returns response (recaptcha token) by request |
 | `skipIf`          | Optional.<br> Type: `boolean` \| `(request) => boolean \| Promise<boolean>` <br> Function that returns true if you allow the request to skip the recaptcha verification. Useful for involing other check methods (e.g. custom privileged API key) or for development or testing |
-| `network`         | Optional.<br> Type: `GoogleRecaptchaNetwork` \| `boolean`<br> Default: `GoogleRecaptchaNetwork.Google` <br> If your server has trouble connecting to https://google.com then you can set networks:<br> `GoogleRecaptchaNetwork.Google` = 'https://www.google.com/recaptcha/api/siteverify'<br>`GoogleRecaptchaNetwork.Recaptcha` = 'https://recaptcha.net/recaptcha/api/siteverify'<br> or set any api url |
-| `applicationType` | **Deprecated.** Module detects it automatically from execution context. Optional.<br> Type: `ApplicationType` <br> Application type affect on type of request argument on `response` provider function <br> Context types:<br> `http` - `(req: express.Request \| fastify.Request) => string \| Promise<string>` <br> `graphql` - `(req: http.IncommingMessage) => string \| Promise<string>` |
-| `agent`           | **Deprecated.** Use `axiosConfig` option <br> Optional.<br> Type: `https.Agent`<br> If you need to use an agent |
+| `network`         | Optional.<br> Type: `GoogleRecaptchaNetwork` \| `string`<br> Default: `GoogleRecaptchaNetwork.Google` <br> If your server has trouble connecting to https://google.com then you can set networks:<br> `GoogleRecaptchaNetwork.Google` = 'https://www.google.com/recaptcha/api/siteverify'<br>`GoogleRecaptchaNetwork.Recaptcha` = 'https://recaptcha.net/recaptcha/api/siteverify'<br> or set any api url |
 | `score`           | Optional.<br> Type: `number` \| `(score: number) => boolean`<br> Score validator for reCAPTCHA v3. <br> `number` - minimum available score. <br> `(score: number) => boolean` - function with custom validation rules. |
 | `actions`         | Optional.<br> Type: `string[]`<br> Available action list for reCAPTCHA v3. <br> You can make this check stricter by passing the action property parameter to `@Recaptcha(...)` decorator. |
 | `axiosConfig`     | Optional.<br> Type: `AxiosRequestConfig`<br> Allows to setup proxy, response timeout, https agent etc... |

package/decorators/recaptcha-result.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RecaptchaResult = void 0;
 const common_1 = require("@nestjs/common");
 const load_module_1 = require("../helpers/load-module");
-exports.RecaptchaResult = common_1.createParamDecorator((data, context) => {
+exports.RecaptchaResult = (0, common_1.createParamDecorator)((data, context) => {
     var _a, _b, _c, _d;
     switch (context.getType()) {
         case 'http':
             return context.switchToHttp().getRequest().recaptchaValidationResult;
         case 'graphql':
-            const graphqlModule = load_module_1.loadModule('@nestjs/graphql', true);
+            const graphqlModule = (0, load_module_1.loadModule)('@nestjs/graphql', true);
             return (_d = (_c = (_b = (_a = graphqlModule.GqlExecutionContext.create(context).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;
         default:
             return null;

package/decorators/recaptcha-result.js.map

@@ -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,6BAAoB,CAAC,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,MAAM,aAAa,GAAG,wBAAU,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;YAC1D,+BAAO,aAAa,CAAC,mBAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC,GAAG,0CAAE,UAAU,0CAAE,YAAY,0CAAE,GAAG,0CAAE,yBAAyB,CAAC;QACxI;YACI,OAAO,IAAI,CAAC;KACnB;AACL,CAAC,CAAC,CAAC"}
+{"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,MAAM,aAAa,GAAG,IAAA,wBAAU,EAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;YAC1D,OAAO,MAAA,MAAA,MAAA,MAAA,aAAa,CAAC,mBAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC,GAAG,0CAAE,UAAU,0CAAE,YAAY,0CAAE,GAAG,0CAAE,yBAAyB,CAAC;QACxI;YACI,OAAO,IAAI,CAAC;KACnB;AACL,CAAC,CAAC,CAAC"}

package/decorators/recaptcha.js

@@ -5,7 +5,7 @@ const common_1 = require("@nestjs/common");
 const google_recaptcha_guard_1 = require("../guards/google-recaptcha.guard");
 const set_recaptcha_options_1 = require("./set-recaptcha-options");
 function Recaptcha(options) {
-    return common_1.applyDecorators(set_recaptcha_options_1.SetRecaptchaOptions(options), common_1.UseGuards(google_recaptcha_guard_1.GoogleRecaptchaGuard));
+    return (0, common_1.applyDecorators)((0, set_recaptcha_options_1.SetRecaptchaOptions)(options), (0, common_1.UseGuards)(google_recaptcha_guard_1.GoogleRecaptchaGuard));
 }
 exports.Recaptcha = Recaptcha;
 //# sourceMappingURL=recaptcha.js.map

package/decorators/recaptcha.js.map

@@ -1 +1 @@
-{"version":3,"file":"recaptcha.js","sourceRoot":"","sources":["../../src/decorators/recaptcha.ts"],"names":[],"mappings":";;;AAAA,2CAA4D;AAC5D,6EAAwE;AAExE,mEAA8D;AAE9D,SAAgB,SAAS,CAAC,OAAwC;IAC9D,OAAO,wBAAe,CAClB,2CAAmB,CAAC,OAAO,CAAC,EAC5B,kBAAS,CAAC,6CAAoB,CAAC,CAClC,CAAC;AACN,CAAC;AALD,8BAKC"}
+{"version":3,"file":"recaptcha.js","sourceRoot":"","sources":["../../src/decorators/recaptcha.ts"],"names":[],"mappings":";;;AAAA,2CAA4D;AAC5D,6EAAwE;AAExE,mEAA8D;AAE9D,SAAgB,SAAS,CAAC,OAAwC;IAC9D,OAAO,IAAA,wBAAe,EAClB,IAAA,2CAAmB,EAAC,OAAO,CAAC,EAC5B,IAAA,kBAAS,EAAC,6CAAoB,CAAC,CAClC,CAAC;AACN,CAAC;AALD,8BAKC"}

package/decorators/set-recaptcha-options.js

@@ -4,7 +4,7 @@ exports.SetRecaptchaOptions = void 0;
 const common_1 = require("@nestjs/common");
 const provider_declarations_1 = require("../provider.declarations");
 function SetRecaptchaOptions(options) {
-    return common_1.SetMetadata(provider_declarations_1.RECAPTCHA_VALIDATION_OPTIONS, options);
+    return (0, common_1.SetMetadata)(provider_declarations_1.RECAPTCHA_VALIDATION_OPTIONS, options);
 }
 exports.SetRecaptchaOptions = SetRecaptchaOptions;
 //# sourceMappingURL=set-recaptcha-options.js.map

package/decorators/set-recaptcha-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"set-recaptcha-options.js","sourceRoot":"","sources":["../../src/decorators/set-recaptcha-options.ts"],"names":[],"mappings":";;;AAAA,2CAA6C;AAE7C,oEAAwE;AAExE,SAAgB,mBAAmB,CAAC,OAAwC;IACxE,OAAO,oBAAW,CAAC,oDAA4B,EAAE,OAAO,CAAC,CAAC;AAC9D,CAAC;AAFD,kDAEC"}
+{"version":3,"file":"set-recaptcha-options.js","sourceRoot":"","sources":["../../src/decorators/set-recaptcha-options.ts"],"names":[],"mappings":";;;AAAA,2CAA6C;AAE7C,oEAAwE;AAExE,SAAgB,mBAAmB,CAAC,OAAwC;IACxE,OAAO,IAAA,oBAAW,EAAC,oDAA4B,EAAE,OAAO,CAAC,CAAC;AAC9D,CAAC;AAFD,kDAEC"}

package/google-recaptcha.module.d.ts

@@ -1,6 +1,7 @@
 import { DynamicModule } from '@nestjs/common';
 import { GoogleRecaptchaModuleAsyncOptions, GoogleRecaptchaModuleOptions } from './interfaces/google-recaptcha-module-options';
 export declare class GoogleRecaptchaModule {
+    private static axiosDefaultConfig;
     static forRoot(options: GoogleRecaptchaModuleOptions): DynamicModule;
     static forRootAsync(options: GoogleRecaptchaModuleAsyncOptions): DynamicModule;
     private static resolveHttpModule;

package/google-recaptcha.module.js

@@ -19,9 +19,11 @@ const recaptcha_request_resolver_1 = require("./services/recaptcha-request.resol
 const load_module_1 = require("./helpers/load-module");
 const core_1 = require("@nestjs/core");
 const axios = require("axios");
+const https_1 = require("https");
 class GoogleRecaptchaModule {
     static forRoot(options) {
         const providers = [
+            core_1.Reflector,
             google_recaptcha_guard_1.GoogleRecaptchaGuard,
             google_recaptcha_validator_1.GoogleRecaptchaValidator,
             recaptcha_request_resolver_1.RecaptchaRequestResolver,
@@ -32,7 +34,6 @@ class GoogleRecaptchaModule {
         ];
         const httpModule = this.resolveHttpModule();
         const internalProviders = [
-            core_1.Reflector,
             {
                 provide: provider_declarations_1.RECAPTCHA_HTTP_SERVICE,
                 useFactory: (axiosInstance) => new httpModule.HttpService(axiosInstance),
@@ -42,7 +43,7 @@ class GoogleRecaptchaModule {
             },
             {
                 provide: provider_declarations_1.RECAPTCHA_AXIOS_INSTANCE,
-                useFactory: () => axios.default.create(this.transformAxiosConfig(options.axiosConfig)),
+                useFactory: () => axios.default.create(this.transformAxiosConfig(Object.assign(Object.assign(Object.assign({}, this.axiosDefaultConfig), options.axiosConfig), { headers: null }))),
             },
         ];
         return {
@@ -57,6 +58,7 @@ class GoogleRecaptchaModule {
     }
     static forRootAsync(options) {
         const providers = [
+            core_1.Reflector,
             google_recaptcha_guard_1.GoogleRecaptchaGuard,
             google_recaptcha_validator_1.GoogleRecaptchaValidator,
             recaptcha_request_resolver_1.RecaptchaRequestResolver,
@@ -64,7 +66,6 @@ class GoogleRecaptchaModule {
         ];
         const httpModule = this.resolveHttpModule();
         const internalProviders = [
-            core_1.Reflector,
             {
                 provide: provider_declarations_1.RECAPTCHA_HTTP_SERVICE,
                 useFactory: (axiosInstance) => new httpModule.HttpService(axiosInstance),
@@ -75,7 +76,7 @@ class GoogleRecaptchaModule {
             {
                 provide: provider_declarations_1.RECAPTCHA_AXIOS_INSTANCE,
                 useFactory: (options) => {
-                    const transformedAxiosConfig = this.transformAxiosConfig(options.axiosConfig);
+                    const transformedAxiosConfig = this.transformAxiosConfig(Object.assign(Object.assign(Object.assign({}, this.axiosDefaultConfig), options.axiosConfig), { headers: null }));
                     return axios.default.create(transformedAxiosConfig);
                 },
                 inject: [
@@ -96,10 +97,10 @@ class GoogleRecaptchaModule {
     }
     static resolveHttpModule() {
         try {
-            return load_module_1.loadModule('@nestjs/axios');
+            return (0, load_module_1.loadModule)('@nestjs/axios');
         }
         catch (e) {
-            return load_module_1.loadModule('@nestjs/common');
+            return (0, load_module_1.loadModule)('@nestjs/common');
         }
     }
     static transformAxiosConfig(axiosConfig) {
@@ -140,4 +141,8 @@ class GoogleRecaptchaModule {
     }
 }
 exports.GoogleRecaptchaModule = GoogleRecaptchaModule;
+GoogleRecaptchaModule.axiosDefaultConfig = {
+    timeout: 60000,
+    httpsAgent: new https_1.Agent({ keepAlive: true }),
+};
 //# sourceMappingURL=google-recaptcha.module.js.map

package/google-recaptcha.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"google-recaptcha.module.js","sourceRoot":"","sources":["../src/google-recaptcha.module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"google-recaptcha.module.js","sourceRoot":"","sources":["../src/google-recaptcha.module.ts"],"names":[],"mappings":"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"}

package/guards/google-recaptcha.guard.js

@@ -27,9 +27,7 @@ let GoogleRecaptchaGuard = class GoogleRecaptchaGuard {
         this.options = options;
     }
     async canActivate(context) {
-        const request = this.options.applicationType
-            ? this.requestResolver.resolveByApplicationType(context, this.options.applicationType)
-            : this.requestResolver.resolve(context);
+        const request = this.requestResolver.resolve(context);
         const skip = typeof this.options.skipIf === 'function'
             ? await this.options.skipIf(request)
             : !!this.options.skipIf;
@@ -37,7 +35,8 @@ let GoogleRecaptchaGuard = class GoogleRecaptchaGuard {
             return true;
         }
         const options = this.reflector.get(provider_declarations_1.RECAPTCHA_VALIDATION_OPTIONS, context.getHandler());
-        const response = (options === null || options === void 0 ? void 0 : options.response) ? await (options === null || options === void 0 ? void 0 : options.response(request))
+        const response = (options === null || options === void 0 ? void 0 : options.response)
+            ? await (options === null || options === void 0 ? void 0 : options.response(request))
             : await this.options.response(request);
         const score = (options === null || options === void 0 ? void 0 : options.score) || this.options.score;
         const action = options === null || options === void 0 ? void 0 : options.action;
@@ -49,8 +48,8 @@ let GoogleRecaptchaGuard = class GoogleRecaptchaGuard {
     }
 };
 GoogleRecaptchaGuard = __decorate([
-    common_1.Injectable(),
-    __param(3, common_1.Inject(provider_declarations_1.RECAPTCHA_OPTIONS)),
+    (0, common_1.Injectable)(),
+    __param(3, (0, common_1.Inject)(provider_declarations_1.RECAPTCHA_OPTIONS)),
     __metadata("design:paramtypes", [google_recaptcha_validator_1.GoogleRecaptchaValidator,
         core_1.Reflector,
         recaptcha_request_resolver_1.RecaptchaRequestResolver, Object])

package/guards/google-recaptcha.guard.js.map

@@ -1 +1 @@
-{"version":3,"file":"google-recaptcha.guard.js","sourceRoot":"","sources":["../../src/guards/google-recaptcha.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAmF;AACnF,uFAAkF;AAElF,oEAA2F;AAC3F,yFAAoF;AACpF,uCAAyC;AACzC,uFAAkF;AAIlF,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAC7B,YAA6B,SAAmC,EACnC,SAAoB,EACpB,eAAyC,EACd,OAAoC;QAH/D,cAAS,GAAT,SAAS,CAA0B;QACnC,cAAS,GAAT,SAAS,CAAW;QACpB,oBAAe,GAAf,eAAe,CAA0B;QACd,YAAO,GAAP,OAAO,CAA6B;IAC5F,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAyB;QACvC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe;YACxC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,wBAAwB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC;YACtF,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAE5C,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,EAC9B,CAAC,CAAC,OAAM,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,CAAC,OAAO,EAAC;YAClC,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,OAAO,CAAC,yBAAyB,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAC,CAAC,CAAC;QAE7F,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;CACJ,CAAA;AArCY,oBAAoB;IADhC,mBAAU,EAAE;IAKI,WAAA,eAAM,CAAC,yCAAiB,CAAC,CAAA;qCAHE,qDAAwB;QACxB,gBAAS;QACH,qDAAwB;GAH7D,oBAAoB,CAqChC;AArCY,oDAAoB"}
+{"version":3,"file":"google-recaptcha.guard.js","sourceRoot":"","sources":["../../src/guards/google-recaptcha.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAmF;AACnF,uFAAkF;AAElF,oEAA2F;AAC3F,yFAAoF;AACpF,uCAAyC;AACzC,uFAAkF;AAIlF,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAC7B,YAA6B,SAAmC,EACnC,SAAoB,EACpB,eAAyC,EACd,OAAoC;QAH/D,cAAS,GAAT,SAAS,CAA0B;QACnC,cAAS,GAAT,SAAS,CAAW;QACpB,oBAAe,GAAf,eAAe,CAA0B;QACd,YAAO,GAAP,OAAO,CAA6B;IAC5F,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAyB;QACvC,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAEtD,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,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;YAClC,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,OAAO,CAAC,yBAAyB,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAC,CAAC,CAAC;QAE7F,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;CACJ,CAAA;AAnCY,oBAAoB;IADhC,IAAA,mBAAU,GAAE;IAKI,WAAA,IAAA,eAAM,EAAC,yCAAiB,CAAC,CAAA;qCAHE,qDAAwB;QACxB,gBAAS;QACH,qDAAwB;GAH7D,oBAAoB,CAmChC;AAnCY,oDAAoB"}

package/index.d.ts

@@ -1,4 +1,6 @@
 export { Recaptcha } from './decorators/recaptcha';
+export { SetRecaptchaOptions } from './decorators/set-recaptcha-options';
+export { RecaptchaResult } from './decorators/recaptcha-result';
 export { GoogleRecaptchaGuard } from './guards/google-recaptcha.guard';
 export { GoogleRecaptchaModule } from './google-recaptcha.module';
 export { GoogleRecaptchaModuleOptions } from './interfaces/google-recaptcha-module-options';

package/index.js

@@ -1,7 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.GoogleRecaptchaNetworkException = exports.GoogleRecaptchaException = exports.GoogleRecaptchaNetwork = exports.ApplicationType = exports.ErrorCode = exports.GoogleRecaptchaModule = exports.GoogleRecaptchaGuard = exports.RecaptchaResult = exports.SetRecaptchaOptions = exports.Recaptcha = void 0;
 var recaptcha_1 = require("./decorators/recaptcha");
 Object.defineProperty(exports, "Recaptcha", { enumerable: true, get: function () { return recaptcha_1.Recaptcha; } });
+var set_recaptcha_options_1 = require("./decorators/set-recaptcha-options");
+Object.defineProperty(exports, "SetRecaptchaOptions", { enumerable: true, get: function () { return set_recaptcha_options_1.SetRecaptchaOptions; } });
+var recaptcha_result_1 = require("./decorators/recaptcha-result");
+Object.defineProperty(exports, "RecaptchaResult", { enumerable: true, get: function () { return recaptcha_result_1.RecaptchaResult; } });
 var google_recaptcha_guard_1 = require("./guards/google-recaptcha.guard");
 Object.defineProperty(exports, "GoogleRecaptchaGuard", { enumerable: true, get: function () { return google_recaptcha_guard_1.GoogleRecaptchaGuard; } });
 var google_recaptcha_module_1 = require("./google-recaptcha.module");

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAAA,oDAAmD;AAA1C,sGAAA,SAAS,OAAA;AAClB,0EAAuE;AAA9D,8HAAA,oBAAoB,OAAA;AAC7B,qEAAkE;AAAzD,gIAAA,qBAAqB,OAAA;AAE9B,iDAA+C;AAAtC,uGAAA,SAAS,OAAA;AAClB,6DAA2D;AAAlD,mHAAA,eAAe,OAAA;AACxB,6EAAyE;AAAhE,kIAAA,sBAAsB,OAAA;AAC/B,sFAAmF;AAA1E,sIAAA,wBAAwB,OAAA;AACjC,sGAAkG;AAAzF,qJAAA,+BAA+B,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,oDAAmD;AAA1C,sGAAA,SAAS,OAAA;AAClB,4EAAyE;AAAhE,4HAAA,mBAAmB,OAAA;AAC5B,kEAAgE;AAAvD,mHAAA,eAAe,OAAA;AACxB,0EAAuE;AAA9D,8HAAA,oBAAoB,OAAA;AAC7B,qEAAkE;AAAzD,gIAAA,qBAAqB,OAAA;AAE9B,iDAA+C;AAAtC,uGAAA,SAAS,OAAA;AAClB,6DAA2D;AAAlD,mHAAA,eAAe,OAAA;AACxB,6EAAyE;AAAhE,kIAAA,sBAAsB,OAAA;AAC/B,sFAAmF;AAA1E,sIAAA,wBAAwB,OAAA;AACjC,sGAAkG;AAAzF,qJAAA,+BAA+B,OAAA"}

package/interfaces/google-recaptcha-guard-options.d.ts

@@ -1,11 +1,6 @@
 import { RecaptchaResponseProvider, ScoreValidator } from '../types';
-import { ApplicationType } from '../enums/application-type';
 export interface GoogleRecaptchaGuardOptions {
     response: RecaptchaResponseProvider;
-    /**
-     * @deprecated
-     */
-    applicationType?: ApplicationType;
     skipIf?: boolean | ((request: any) => boolean | Promise<boolean>);
     score?: ScoreValidator;
 }

package/interfaces/google-recaptcha-validator-options.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-import * as https from 'https';
 import { GoogleRecaptchaNetwork } from '../enums/google-recaptcha-network';
 import { ScoreValidator } from '../types';
 import { AxiosRequestConfig } from 'axios';
@@ -14,12 +12,5 @@ export interface GoogleRecaptchaValidatorOptions {
      * or set any api url
      */
     network?: GoogleRecaptchaNetwork | string;
-    /**
-     * @deprecated
-     * Use axiosConfig for setup agent.
-     * If your server has trouble connecting to https://www.google.com,
-     * you can use an agent (`proxy-agent` or other NPM modules)
-     */
-    agent?: https.Agent;
     axiosConfig?: AxiosRequestConfig;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestlab/google-recaptcha",
-  "version": "2.1.1",
+  "version": "3.0.1",
   "description": "Google recaptcha module for NestJS.",
   "keywords": [
     "nest",
@@ -33,25 +33,27 @@
   },
   "homepage": "https://github.com/chvarkov/google-recaptcha",
   "peerDependencies": {
-    "@nestjs/core": ">=6.0.0 <9.0.0",
-    "@nestjs/common": ">=6.0.0 <9.0.0"
+    "@nestjs/axios": ">=0.0.1 <1.0.0",
+    "@nestjs/common": ">=8.0.0 <10.0.0",
+    "@nestjs/core": ">=8.0.0 <10.0.0"
   },
   "devDependencies": {
-    "@nestjs/common": "^6.0.0",
-    "@nestjs/core": "^6.0.0",
-    "@nestjs/graphql": "^7.9.8",
-    "@nestjs/platform-express": "^6.11.11",
-    "@nestjs/testing": "^6.11.11",
-    "@types/express": "^4.17.11",
-    "@types/jest": "^24.9.1",
-    "@types/node": "^12.12.14",
-    "jest": "^24.9.0",
+    "@nestjs/axios": "^0.1.0",
+    "@nestjs/common": "^9.0.5",
+    "@nestjs/core": "^9.0.5",
+    "@nestjs/graphql": "^10.0.21",
+    "@nestjs/platform-express": "^9.0.5",
+    "@nestjs/testing": "^9.0.5",
+    "@types/express": "^4.17.13",
+    "@types/jest": "^28.1.6",
+    "@types/node": "^18.0.6",
+    "jest": "^28.1.3",
     "reflect-metadata": "^0.1.13",
-    "rxjs": "^6.5.4",
-    "ts-jest": "^24.2.0",
-    "ts-loader": "^8.0.0",
-    "ts-node": "^8.5.2",
-    "typescript": "^3.7.2"
+    "rxjs": "^7.5.6",
+    "ts-jest": "^28.0.7",
+    "ts-loader": "^9.3.1",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.7.4"
   },
   "jest": {
     "moduleFileExtensions": [

package/services/google-recaptcha.validator.d.ts

@@ -1,7 +1,7 @@
-import { HttpService } from '@nestjs/common';
 import { GoogleRecaptchaValidatorOptions } from '../interfaces/google-recaptcha-validator-options';
 import { GoogleRecaptchaValidationResult } from '../interfaces/google-recaptcha-validation-result';
 import { VerifyResponseOptions } from '../interfaces/verify-response-decorator-options';
+import { HttpService } from "@nestjs/axios";
 export declare class GoogleRecaptchaValidator {
     private readonly http;
     private readonly options;

package/services/google-recaptcha.validator.js

@@ -19,6 +19,7 @@ const qs = require("querystring");
 const google_recaptcha_network_1 = require("../enums/google-recaptcha-network");
 const error_code_1 = require("../enums/error-code");
 const google_recaptcha_network_exception_1 = require("../exceptions/google-recaptcha-network.exception");
+const axios_1 = require("@nestjs/axios");
 let GoogleRecaptchaValidator = class GoogleRecaptchaValidator {
     constructor(http, options) {
         this.http = http;
@@ -51,9 +52,6 @@ let GoogleRecaptchaValidator = class GoogleRecaptchaValidator {
         const config = {
             headers: this.headers,
         };
-        if (this.options.agent) {
-            config.httpsAgent = this.options.agent;
-        }
         return this.http.post(url, data, config)
             .toPromise()
             .then(res => res.data)
@@ -97,10 +95,10 @@ let GoogleRecaptchaValidator = class GoogleRecaptchaValidator {
     }
 };
 GoogleRecaptchaValidator = __decorate([
-    common_1.Injectable(),
-    __param(0, common_1.Inject(provider_declarations_1.RECAPTCHA_HTTP_SERVICE)),
-    __param(1, common_1.Inject(provider_declarations_1.RECAPTCHA_OPTIONS)),
-    __metadata("design:paramtypes", [common_1.HttpService, Object])
+    (0, common_1.Injectable)(),
+    __param(0, (0, common_1.Inject)(provider_declarations_1.RECAPTCHA_HTTP_SERVICE)),
+    __param(1, (0, common_1.Inject)(provider_declarations_1.RECAPTCHA_OPTIONS)),
+    __metadata("design:paramtypes", [axios_1.HttpService, Object])
 ], GoogleRecaptchaValidator);
 exports.GoogleRecaptchaValidator = GoogleRecaptchaValidator;
 //# sourceMappingURL=google-recaptcha.validator.js.map

package/services/google-recaptcha.validator.js.map

@@ -1 +1 @@
-{"version":3,"file":"google-recaptcha.validator.js","sourceRoot":"","sources":["../../src/services/google-recaptcha.validator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"google-recaptcha.validator.js","sourceRoot":"","sources":["../../src/services/google-recaptcha.validator.ts"],"names":[],"mappings":"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"}

package/services/recaptcha-request.resolver.d.ts

@@ -1,9 +1,4 @@
 import { ExecutionContext } from '@nestjs/common';
-import { ApplicationType } from '../enums/application-type';
 export declare class RecaptchaRequestResolver {
     resolve<T = any>(context: ExecutionContext): T;
-    /**
-     * @deprecated
-     */
-    resolveByApplicationType<T = any>(context: ExecutionContext, type: ApplicationType): T;
 }

package/services/recaptcha-request.resolver.js

@@ -8,7 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RecaptchaRequestResolver = void 0;
 const common_1 = require("@nestjs/common");
-const application_type_1 = require("../enums/application-type");
 const load_module_1 = require("../helpers/load-module");
 let RecaptchaRequestResolver = class RecaptchaRequestResolver {
     resolve(context) {
@@ -18,30 +17,15 @@ let RecaptchaRequestResolver = class RecaptchaRequestResolver {
             case 'http':
                 return context.switchToHttp().getRequest();
             case 'graphql':
-                const graphqlModule = load_module_1.loadModule('@nestjs/graphql', true);
-                return (_c = (_b = (_a = graphqlModule.GqlExecutionContext.create(context).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;
+                const graphqlModule = (0, load_module_1.loadModule)('@nestjs/graphql', true);
+                return (_c = (_b = (_a = graphqlModule.GqlExecutionContext.create(context).getContext().req) === null || _a === void 0 ? void 0 : _a.socket) === null || _b === void 0 ? void 0 : _b._httpMessage) === null || _c === void 0 ? void 0 : _c.req;
             default:
                 throw new Error(`Unsupported request type '${contextType}'.`);
         }
     }
-    /**
-     * @deprecated
-     */
-    resolveByApplicationType(context, type) {
-        var _a, _b, _c;
-        switch (type) {
-            case application_type_1.ApplicationType.Rest:
-                return context.switchToHttp().getRequest();
-            case application_type_1.ApplicationType.GraphQL:
-                const graphqlModule = load_module_1.loadModule('@nestjs/graphql', true);
-                return (_c = (_b = (_a = graphqlModule.GqlExecutionContext.create(context).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;
-            default:
-                throw new Error(`Unsupported request type '${type}'.`);
-        }
-    }
 };
 RecaptchaRequestResolver = __decorate([
-    common_1.Injectable()
+    (0, common_1.Injectable)()
 ], RecaptchaRequestResolver);
 exports.RecaptchaRequestResolver = RecaptchaRequestResolver;
 //# sourceMappingURL=recaptcha-request.resolver.js.map

package/services/recaptcha-request.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"recaptcha-request.resolver.js","sourceRoot":"","sources":["../../src/services/recaptcha-request.resolver.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA8D;AAC9D,gEAA4D;AAC5D,wDAAoD;AAIpD,IAAa,wBAAwB,GAArC,MAAa,wBAAwB;IACjC,OAAO,CAAU,OAAyB;;QACtC,MAAM,WAAW,GAAyB,OAAO,CAAC,OAAO,EAAE,CAAC;QAE5D,QAAQ,WAAW,EAAE;YACjB,KAAK,MAAM;gBACP,OAAO,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;YAE/C,KAAK,SAAS;gBACV,MAAM,aAAa,GAAG,wBAAU,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;gBAC1D,yBAAO,aAAa,CAAC,mBAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC,GAAG,0CAAE,UAAU,0CAAE,YAAY,0CAAE,GAAG,CAAC;YAC7G;gBACI,MAAM,IAAI,KAAK,CAAC,6BAA6B,WAAW,IAAI,CAAC,CAAC;SACrE;IACL,CAAC;IAED;;OAEG;IACH,wBAAwB,CAAU,OAAyB,EAAE,IAAqB;;QAC9E,QAAQ,IAAI,EAAE;YACV,KAAK,kCAAe,CAAC,IAAI;gBACrB,OAAO,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;YAE/C,KAAK,kCAAe,CAAC,OAAO;gBACxB,MAAM,aAAa,GAAG,wBAAU,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;gBAC1D,yBAAO,aAAa,CAAC,mBAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC,GAAG,0CAAE,UAAU,0CAAE,YAAY,0CAAE,GAAG,CAAC;YAC7G;gBACI,MAAM,IAAI,KAAK,CAAC,6BAA6B,IAAI,IAAI,CAAC,CAAC;SAC9D;IACL,CAAC;CACJ,CAAA;AA/BY,wBAAwB;IADpC,mBAAU,EAAE;GACA,wBAAwB,CA+BpC;AA/BY,4DAAwB"}
+{"version":3,"file":"recaptcha-request.resolver.js","sourceRoot":"","sources":["../../src/services/recaptcha-request.resolver.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA8D;AAC9D,wDAAoD;AAIpD,IAAa,wBAAwB,GAArC,MAAa,wBAAwB;IACjC,OAAO,CAAU,OAAyB;;QACtC,MAAM,WAAW,GAAyB,OAAO,CAAC,OAAO,EAAE,CAAC;QAE5D,QAAQ,WAAW,EAAE;YACjB,KAAK,MAAM;gBACP,OAAO,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;YAE/C,KAAK,SAAS;gBACV,MAAM,aAAa,GAAG,IAAA,wBAAU,EAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;gBAC1D,OAAO,MAAA,MAAA,MAAA,aAAa,CAAC,mBAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC,GAAG,0CAAE,MAAM,0CAAE,YAAY,0CAAE,GAAG,CAAC;YACzG;gBACI,MAAM,IAAI,KAAK,CAAC,6BAA6B,WAAW,IAAI,CAAC,CAAC;SACrE;IACL,CAAC;CACJ,CAAA;AAfY,wBAAwB;IADpC,IAAA,mBAAU,GAAE;GACA,wBAAwB,CAepC;AAfY,4DAAwB"}