Invisible reCaptcha management

magespecialist · Aug 22, 2017 · 5cfdc05 · 5cfdc05
1 parent 44f5a0c
commit 5cfdc05
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 27 deletions.
diff --git a/Block/Adminhtml/ReCaptcha.php b/Block/Adminhtml/ReCaptcha.php
@@ -54,6 +54,24 @@ public function getPublicKey()
         return $this->config->getPublicKey();
     }
 
+    /**
+     * Get backend theme
+     * @return string
+     */
+    public function getTheme()
+    {
+        return $this->config->getBackendTheme();
+    }
+
+    /**
+     * Get backend size
+     * @return string
+     */
+    public function getSize()
+    {
+        return $this->config->getBackendSize();
+    }
+
     /**
      * Return true if can display reCaptcha
      * @return bool

diff --git a/Model/Config.php b/Model/Config.php
@@ -28,7 +28,6 @@ class Config
     const XML_PATH_ENABLED_BACKEND = 'msp_securitysuite_recaptcha/backend/enabled';
     const XML_PATH_ENABLED_FRONTEND = 'msp_securitysuite_recaptcha/frontend/enabled';
 
-    const XML_PATH_TYPE_BACKEND = 'msp_securitysuite_recaptcha/backend/type';
     const XML_PATH_TYPE_FRONTEND = 'msp_securitysuite_recaptcha/frontend/type';
 
     const XML_PATH_POSITION_FRONTEND = 'msp_securitysuite_recaptcha/frontend/position';
@@ -180,10 +179,6 @@ public function getFrontendSize()
      */
     public function getBackendSize()
     {
-        if ($this->getBackendType() == Type::TYPE_INVISIBLE) {
-            return 'invisible';
-        }
-
         return $this->scopeConfig->getValue(static::XML_PATH_SIZE_BACKEND);
     }
 
@@ -206,10 +201,6 @@ public function getFrontendTheme()
      */
     public function getBackendTheme()
     {
-        if ($this->getBackendType() == Type::TYPE_INVISIBLE) {
-            return null;
-        }
-
         return $this->scopeConfig->getValue(static::XML_PATH_THEME_BACKEND);
     }
 
@@ -234,13 +225,4 @@ public function getFrontendType()
     {
         return $this->scopeConfig->getValue(static::XML_PATH_TYPE_FRONTEND);
     }
-
-    /**
-     * Get data size
-     * @return string
-     */
-    public function getBackendType()
-    {
-        return $this->scopeConfig->getValue(static::XML_PATH_TYPE_BACKEND);
-    }
 }
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -49,13 +49,6 @@
                     <label>Enable</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="type" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                    <label>reCaptcha type</label>
-                    <source_model>MSP\ReCaptcha\Model\Config\Source\Type</source_model>
-                    <depends>
-                        <field id="enabled">1</field>
-                    </depends>
-                </field>
                 <field id="theme" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Theme</label>
                     <source_model>MSP\ReCaptcha\Model\Config\Source\Theme</source_model>

diff --git a/etc/config.xml b/etc/config.xml
@@ -26,7 +26,6 @@
             <backend>
                 <enabled>0</enabled>
                 <size>normal</size>
-                <type>standard</type>
                 <theme>light</theme>
             </backend>
             <frontend>

diff --git a/view/adminhtml/templates/msp_recaptcha.phtml b/view/adminhtml/templates/msp_recaptcha.phtml
@@ -22,6 +22,10 @@
 ?>
 <?php if ($block->canDisplayCaptcha()): ?>
 <div class="admin__field field-recaptcha">
-    <div class="g-recaptcha" data-sitekey="<?php echo $block->getPublicKey() ?>"></div>
+    <div class="g-recaptcha"
+         data-sitekey="<?php echo $block->getPublicKey() ?>"
+         data-size="<?php echo $block->getSize() ?>"
+         data-theme="<?php echo $block->getTheme() ?>"
+    ></div>
 </div>
 <?php endif; ?>
diff --git a/view/frontend/layout/default.xml b/view/frontend/layout/default.xml
@@ -37,6 +37,7 @@
                                     <item name="configSource" xsi:type="string">checkoutConfig</item>
                                     <item name="reCaptchaId" xsi:type="string">msp-recaptcha-popup-login</item>
                                     <item name="zone" xsi:type="string">login</item>
+                                    <item name="badge" xsi:type="string">inline</item>
                                 </item>
                             </item>
                         </item>

diff --git a/view/frontend/web/js/reCaptcha.js b/view/frontend/web/js/reCaptcha.js
@@ -72,6 +72,7 @@ define(
 
           // Move our (last) handler topmost. We need this to avoid submit bindings with ko.
           var listeners = $._data($parentForm[0], 'events').submit;
+          debugger;
           listeners.unshift(listeners.pop());
 
           // Create a virtual token field