Updated GoogleRecaptchaException.

chvarkov · Oct 23, 2020 · 599c695 · 599c695
1 parent 83b64be
commit 599c695
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 52 deletions.
diff --git a/README.md b/README.md
@@ -70,7 +70,7 @@ Google recaptcha guard will throw GoogleRecaptchaException on error.
 
 `GoogleRecaptchaException` has data with google recaptcha error codes.
 
-`GoogleRecaptchaException` ← `BadRequestException` ← `HttpException` ← `Error`.
+`GoogleRecaptchaException` ← `HttpException` ← `Error`.
 
 You can handle it via [ExceptionFilter](https://docs.nestjs.com/exception-filters).
 
@@ -81,53 +81,7 @@ Example exception filter implementation.
 @Catch(GoogleRecaptchaException)
 export class GoogleRecaptchaFilter implements ExceptionFilter {
     catch(exception: GoogleRecaptchaException, host: ArgumentsHost): any {
-        const res: Response = host.switchToHttp().getResponse();
-
-        const firstErrorCode = exception.errorCodes.shift();
-
-        const transformedError = this.transformError(firstErrorCode);
-
-        res.status(transformedError.status).send({
-            type: 'GoogleRecaptchaError',
-            message: transformedError.message,
-        });
-    }
-
-    transformError(errorCode: ErrorCode): {status: number, message: string} {
-        switch (errorCode) {
-            case ErrorCode.InvalidInputResponse:
-                return {
-                    status: HttpStatus.BAD_REQUEST,
-                    message: 'The response parameter is invalid or malformed.',
-                };
-
-            case ErrorCode.MissingInputResponse:
-                return {
-                    status: HttpStatus.BAD_REQUEST,
-                    message: 'The response parameter is missing.',
-                };
-
-            case ErrorCode.TimeoutOrDuplicate:
-                return {
-                    status: HttpStatus.BAD_REQUEST,
-                    message: 'The response is no longer valid: either is too old or has been used previously.',
-                };
-
-            case ErrorCode.InvalidInputSecret:
-            case ErrorCode.MissingInputSecret:
-                return {
-                    status: HttpStatus.INTERNAL_SERVER_ERROR,
-                    message: 'Invalid module configuration. Please check public-secret keys.',
-                };
-
-            case ErrorCode.UnknownError:
-            case ErrorCode.BadRequest:
-            default:
-                return {
-                    status: HttpStatus.INTERNAL_SERVER_ERROR,
-                    message: 'Unexpected error. Please submit issue to @nestlab/google-recaptcha.',
-                };
-        }
+        // TODO: Your exception filter implementation
     }
 }
 

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

diff --git a/src/exceptions/google-recaptcha.exception.ts b/src/exceptions/google-recaptcha.exception.ts
@@ -1,8 +1,38 @@
-import { BadRequestException } from '@nestjs/common';
+import { HttpException, HttpStatus } from '@nestjs/common';
 import { ErrorCode } from '../enums/error-code';
 
-export class GoogleRecaptchaException extends BadRequestException {
+export class GoogleRecaptchaException extends HttpException {
+
 	constructor(public readonly errorCodes: ErrorCode[]) {
-		super(`Google recaptcha errors: ${errorCodes.join(', ')}.`);
+        super(GoogleRecaptchaException.getErrorMessage(errorCodes[0]), GoogleRecaptchaException.getErrorStatus(errorCodes[0]));
+	}
+
+	private static getErrorMessage(errorCode: ErrorCode): string {
+		switch (errorCode) {
+			case ErrorCode.InvalidInputResponse:
+				return 'The response parameter is invalid or malformed.';
+
+			case ErrorCode.MissingInputResponse:
+				return  'The response parameter is missing.';
+			case ErrorCode.TimeoutOrDuplicate:
+				return 'The response is no longer valid: either is too old or has been used previously.';
+
+			case ErrorCode.InvalidInputSecret:
+			case ErrorCode.MissingInputSecret:
+				return 'Invalid module configuration. Please check public-secret keys.';
+
+			case ErrorCode.UnknownError:
+			case ErrorCode.BadRequest:
+			default:
+				return 'Unexpected error. Please submit issue to @nestlab/google-recaptcha.';
+		}
+	}
+
+	private static getErrorStatus(errorCode: ErrorCode): number {
+		return errorCode === ErrorCode.InvalidInputResponse ||
+			errorCode === ErrorCode.MissingInputResponse ||
+			errorCode === ErrorCode.TimeoutOrDuplicate
+		? HttpStatus.BAD_REQUEST
+		: HttpStatus.INTERNAL_SERVER_ERROR;
 	}
 }