From b746987075d9930ec286306e14fa123a60e6898a Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Fri, 2 Jul 2021 11:09:40 +0530
Subject: [PATCH] Some Refactoring Done

---
 packages/Webkul/Customer/src/Captcha.php      | 27 +++++++++++++++++++
 .../CustomerForgotPasswordRequest.php         |  9 ++-----
 .../Http/Requests/CustomerLoginRequest.php    |  8 ++----
 .../Requests/CustomerRegistrationRequest.php  |  8 ++----
 4 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/packages/Webkul/Customer/src/Captcha.php b/packages/Webkul/Customer/src/Captcha.php
index 350c21b1c..c061c9658 100644
--- a/packages/Webkul/Customer/src/Captcha.php
+++ b/packages/Webkul/Customer/src/Captcha.php
@@ -125,6 +125,33 @@ class Captcha implements CaptchaContract
         return json_decode($response->getBody())->success;
     }
 
+    /**
+     * Get or merge existing validations with your captcha validations.
+     *
+     * @return array
+     */
+    public function getValidations($rules = []): array
+    {
+        return $this->isActive()
+            ? array_merge($rules, ['g-recaptcha-response' => 'required|captcha'])
+            : $rules;
+    }
+
+    /**
+     * Get or merge existing validation messages with your captcha validation messages.
+     *
+     * @return array
+     */
+    public function getValidationMessages($messages = []): array
+    {
+        return $this->isActive()
+            ? array_merge($messages, [
+                'g-recaptcha-response.required' => __('customer::app.admin.system.captcha.validations.required'),
+                'g-recaptcha-response.captcha' => __('customer::app.admin.system.captcha.validations.captcha')
+            ])
+            : $messages;
+    }
+
     /**
      * Get attributes.
      *
diff --git a/packages/Webkul/Customer/src/Http/Requests/CustomerForgotPasswordRequest.php b/packages/Webkul/Customer/src/Http/Requests/CustomerForgotPasswordRequest.php
index da57091ea..5dc1209df 100644
--- a/packages/Webkul/Customer/src/Http/Requests/CustomerForgotPasswordRequest.php
+++ b/packages/Webkul/Customer/src/Http/Requests/CustomerForgotPasswordRequest.php
@@ -33,9 +33,7 @@ class CustomerForgotPasswordRequest extends FormRequest
      */
     public function rules()
     {
-        return Captcha::isActive()
-            ? array_merge($this->rules, ['g-recaptcha-response' => 'required|captcha'])
-            : $this->rules;
+        return Captcha::getValidations($this->rules);
     }
 
     /**
@@ -45,9 +43,6 @@ class CustomerForgotPasswordRequest extends FormRequest
      */
     public function messages()
     {
-        return [
-            'g-recaptcha-response.required' => __('customer::app.admin.system.captcha.validations.required'),
-            'g-recaptcha-response.captcha' => __('customer::app.admin.system.captcha.validations.captcha')
-        ];
+        return Captcha::getValidationMessages();
     }
 }
diff --git a/packages/Webkul/Customer/src/Http/Requests/CustomerLoginRequest.php b/packages/Webkul/Customer/src/Http/Requests/CustomerLoginRequest.php
index ee74a874f..9e9854a63 100644
--- a/packages/Webkul/Customer/src/Http/Requests/CustomerLoginRequest.php
+++ b/packages/Webkul/Customer/src/Http/Requests/CustomerLoginRequest.php
@@ -34,9 +34,7 @@ class CustomerLoginRequest extends FormRequest
      */
     public function rules()
     {
-        return Captcha::isActive()
-            ? array_merge($this->rules, ['g-recaptcha-response' => 'required|captcha'])
-            : $this->rules;
+        return Captcha::getValidations($this->rules);
     }
 
     /**
@@ -46,8 +44,6 @@ class CustomerLoginRequest extends FormRequest
      */
     public function messages()
     {
-        return [
-            'g-recaptcha-response.required' => __('customer::app.admin.system.captcha.validations.required')
-        ];
+        return Captcha::getValidationMessages();
     }
 }
diff --git a/packages/Webkul/Customer/src/Http/Requests/CustomerRegistrationRequest.php b/packages/Webkul/Customer/src/Http/Requests/CustomerRegistrationRequest.php
index 9e96d17e3..dafe84390 100644
--- a/packages/Webkul/Customer/src/Http/Requests/CustomerRegistrationRequest.php
+++ b/packages/Webkul/Customer/src/Http/Requests/CustomerRegistrationRequest.php
@@ -36,9 +36,7 @@ class CustomerRegistrationRequest extends FormRequest
      */
     public function rules()
     {
-        return Captcha::isActive()
-            ? array_merge($this->rules, ['g-recaptcha-response' => 'required|captcha'])
-            : $this->rules;
+        return Captcha::getValidations($this->rules);
     }
 
     /**
@@ -48,8 +46,6 @@ class CustomerRegistrationRequest extends FormRequest
      */
     public function messages()
     {
-        return [
-            'g-recaptcha-response.required' => __('customer::app.admin.system.captcha.validations.required')
-        ];
+        return Captcha::getValidationMessages();
     }
 }