re-new component

Author: kekaadrenalin

.gitignore

@@ -0,0 +1,2 @@
+# Created by .ignore support plugin (hsz.mobi)
+.idea

RecaptchaV3Widget.php

@@ -1,21 +1,33 @@
 {
-    "name": "baha2odeh/yii2-recaptcha-v3",
-    "description": "Yii2 reCAPTCHA v3",
+    "name": "kekaadrenalin/yii2-module-recaptcha-v3",
+    "description": "This is reCAPTCHA v3 for Yii2.",
     "type": "yii2-extension",
-    "keywords": ["yii2","extension","recaptcha v3","captcha","recaptcha 3","Yii2 recaptcha","Yii2 recaptcha 3","Yii2 recaptcha v3"],
-    "license": "Apache-2.0",
+    "keywords": ["yii2","module","recaptcha v3","captcha","recaptcha 3","Yii2 recaptcha","Yii2 recaptcha 3","Yii2 recaptcha v3"],
+    "license": "BSD-3-Clause",
+    "support": {
+        "source": "https://github.com/kekaadrenalin/yii2-module-recaptcha-v3",
+        "issues": "https://github.com/kekaadrenalin/yii2-module-recaptcha-v3/issues"
+    },
     "authors": [
         {
-            "name": "Bahaa Odeh",
-            "email": "bw4@hotmail.it"
+            "name": "kekaadrenalin",
+            "email": ""
         }
     ],
+    "minimum-stability": "stable",
     "require": {
-        "yiisoft/yii2": "~2.0.0"
+        "ext-curl": "*",
+        "yiisoft/yii2": "~2.0.15"
     },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://asset-packagist.org"
+        }
+    ],
     "autoload": {
         "psr-4": {
-            "Baha2Odeh\\RecaptchaV3\\": ""
+            "kekaadrenalin\\recaptcha3\\": "src"
         }
     }
 }

composer.json

@@ -1,73 +1,73 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: bahaaodeh
- * Date: 12/22/18
- * Time: 7:07 PM
- */
 
-namespace Baha2Odeh\RecaptchaV3;
+namespace kekaadrenalin\recaptcha3;
 
-
-use Yii;
-use yii\base\Component;
-use yii\helpers\Json;
-use yii\web\View;
-
-class RecaptchaV3 extends Component
+class ReCaptcha extends \yii\base\Component
 {
     public $site_key = null;
+
     public $secret_key = null;
 
     private $verify_endpoint = 'https://www.google.com/recaptcha/api/siteverify';
 
+    /**
+     * @inheritdoc
+     */
     public function init()
     {
         parent::init(); // TODO: Change the autogenerated stub
 
-        if(empty($this->site_key)){
+        if (empty($this->site_key)) {
             throw new \Exception('site key cant be null');
         }
-        if(empty($this->secret_key)){
+
+        if (empty($this->secret_key)) {
             throw new \Exception('secret key cant be null');
         }
-
     }
 
     /**
      * @param $view
      *
      */
-    public function registerScript($view){
+    public function registerScript($view)
+    {
         /** @var View $view */
-        $view->registerJsFile('https://www.google.com/recaptcha/api.js?render='.$this->site_key,[
-            'position'=>$view::POS_HEAD,
-        ],'recaptcha-v3-script');
+        $view->registerJsFile('https://www.google.com/recaptcha/api.js?render=' . $this->site_key, [
+            'position' => $view::POS_HEAD,
+        ], 'recaptcha-v3-script');
     }
 
 
-
+    /**
+     * @param $value
+     *
+     * @return bool
+     */
     public function validateValue($value)
     {
 
         try {
             $response = $this->curl([
-                'secret' => $this->secret_key,
+                'secret'   => $this->secret_key,
                 'response' => $value,
                 'remoteip' => Yii::$app->has('request') ? Yii::$app->request->userIP : null,
             ]);
-            if(!empty($response) && $response['success']){
+            if (!empty($response) && $response['success']) {
                 return $response['score'];
             }
-        }catch (\Exception $e){
+        } catch (\Exception $e) {
 
         }
 
         return false;
     }
+
     /**
      * Sends User post data with curl to google and receives 'success' if valid
+     *
      * @param array $params
+     *
      * @return bool
      */
     protected function curl(array $params)
@@ -79,6 +79,7 @@ protected function curl(array $params)
         curl_setopt($curl, CURLOPT_POSTFIELDS, $params);
         $curlData = curl_exec($curl);
         curl_close($curl);
+
         return Json::decode($curlData, true);
     }
 }

RecaptchaV3.php src/ReCaptcha.phpRecaptchaV3.php renamed to src/ReCaptcha.php

@@ -1,20 +1,13 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: bahaaodeh
- * Date: 12/22/18
- * Time: 7:23 PM
- */
-
-namespace Baha2Odeh\RecaptchaV3;
 
+namespace kekaadrenalin\recaptcha3;
 
 use Yii;
 use yii\base\InvalidConfigException;
 use yii\di\Instance;
 use yii\validators\Validator;
 
-class RecaptchaV3Validator extends Validator
+class ReCaptchaValidator extends Validator
 {
     /**
      * @var bool
@@ -24,9 +17,9 @@ class RecaptchaV3Validator extends Validator
 
     /**
      * Recaptcha component
-     * @var string|array|RecaptchaV3
+     * @var string|array|ReCaptcha
      */
-    public $component = 'recaptchaV3';
+    public $component = 'reCaptcha3';
 
 
     /**
@@ -36,24 +29,25 @@ class RecaptchaV3Validator extends Validator
     public $acceptance_score = null;
 
     /**
-     * @var RecaptchaV3
+     * @var ReCaptcha
      */
     private $_component = null;
+
     /**
      * @inheritdoc
      * @throws InvalidConfigException
      */
     public function init()
     {
         parent::init();
-        $component = Instance::ensure($this->component, RecaptchaV3::class);
+        $component = Instance::ensure($this->component, ReCaptcha::class);
         if ($component == null) {
-            throw new InvalidConfigException(Yii::t('recaptchav3', 'component is required.'));
+            throw new InvalidConfigException('Component is required.');
         }
         $this->_component = $component;
 
         if ($this->message === null) {
-            $this->message = Yii::t('recaptchav3', 'The verification code is incorrect.');
+            $this->message = 'The verification code is incorrect.';
         }
     }
 
@@ -63,12 +57,14 @@ public function init()
     protected function validateValue($value)
     {
         $result = $this->_component->validateValue($value);
-        if($result === false){
+        if ($result === false) {
             return [$this->message, []];
         }
-        if($this->acceptance_score !== null && $result < $this->acceptance_score){
+
+        if ($this->acceptance_score !== null && $result < $this->acceptance_score) {
             return [$this->message, []];
         }
+
         return null;
     }