Merge pull request #16 from chvarkov/develop

Updated skipIf option.
chvarkov · Nov 1, 2020 · 822d9cb · 822d9cb
2 parents fd91053 + 6279078
commit 822d9cb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ $ npm i @nestlab/google-recaptcha
         GoogleRecaptchaModule.forRoot({
             secretKey: process.env.GOOGLE_RECAPTCHA_SECRET_KEY,
             response: req => req.headers.recaptcha,
-            skipIf: async req => process.env.NODE_ENV !== 'production',
+            skipIf: process.env.NODE_ENV !== 'production',
             useRecaptchaNet: false,
             agent: null
         })
@@ -36,13 +36,13 @@ export class AppModule {
 
 **Configuration options**
 
-| Property          |   | Type                                        | Description |
-|-------------------|---|---------------------------------------------|-------------|
-| `secretKey`       | ✔ | string                                      | Google recaptcha secret key |
-| `response`        | ✔ | (request) => string                         | Function that returns response (recaptcha token) by request |
-| `skipIf`          | ✖ | (request) => boolean \| Promise\<boolean\>  | 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 |
-| `useRecaptchaNet` | ✖ | boolean                                     | If your server has trouble connecting to https://www.google.com. You can use https://recaptcha.net instead, just set true |
-| `agent`           | ✖ | https.Agent                                 | If you need to use an agent |
+| Property          | Type                                                   | Description |
+|-------------------|--------------------------------------------------------|-------------|
+| `secretKey`       | `string`                                               | **Required.** Google recaptcha secret key |
+| `response`        | `(request) => string`                                  | **Required.** Function that returns response (recaptcha token) by request |
+| `skipIf`          | `boolean | (request) => boolean \| Promise\<boolean\>` | Optional. 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 |
+| `useRecaptchaNet` | `boolean`                                              | Optional. If your server has trouble connecting to https://www.google.com. You can use https://recaptcha.net instead, just set true |
+| `agent`           | `https.Agent`                                          | Optional. If you need to use an agent |
 
 
 If you want import configs from your [ConfigService](https://docs.nestjs.com/techniques/configuration#getting-started) via [custom getter function](https://docs.nestjs.com/techniques/configuration#custom-getter-functions) that will return `GoogleRecaptchaModuleOptions` object.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nestlab/google-recaptcha",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "Google recaptcha module for NestJS.",
   "keywords": [
     "nest",

diff --git a/src/guards/google-recaptcha.guard.ts b/src/guards/google-recaptcha.guard.ts
@@ -15,7 +15,9 @@ export class GoogleRecaptchaGuard implements CanActivate {
     async canActivate(context: ExecutionContext): Promise<true | never> {
         const request = context.switchToHttp().getRequest();
 
-        const skip = this.options.skipIf ? await this.options.skipIf(request) : false;
+        const skip = typeof this.options.skipIf === 'function'
+            ? await this.options.skipIf(request)
+            : !!this.options.skipIf;
 
         if (skip) {
             return true;

diff --git a/src/interfaces/google-recaptcha-guard-options.ts b/src/interfaces/google-recaptcha-guard-options.ts
@@ -2,5 +2,5 @@ import { RecaptchaResponseProvider } from '../types';
 
 export interface GoogleRecaptchaGuardOptions {
     response: RecaptchaResponseProvider;
-    skipIf?: (request: any) => boolean | Promise<boolean>;
+    skipIf?: boolean | ((request: any) => boolean | Promise<boolean>);
 }