security-package/issues/123: reCAPTCHA adapters modularity - bugfixes.

engcom-Foxtrot · engcom-Foxtrot · commit 2de6064feb4e · 2020-02-27T17:07:28.000+02:00
diff --git a/ReCaptchaFrontendUi/view/frontend/web/js/reCaptcha.js b/ReCaptchaFrontendUi/view/frontend/web/js/reCaptcha.js
@@ -122,7 +122,8 @@ define(
                         },
                         'expired-callback': function () {
                             me.validateReCaptcha(false);
-                        }
+                        },
+                        'size': 'invisible'
                     },
                     this.settings.rendering
                 );
diff --git a/ReCaptchaUi/Model/UiConfigResolver.php b/ReCaptchaUi/Model/UiConfigResolver.php
@@ -66,6 +66,6 @@ public function get(string $key): array
                 __('UI config provider for "%type" is not configured.', ['type' => $captchaType])
             );
         }
-        return $this->captchaUiConfigProviders[$key]->get();
+        return $this->captchaUiConfigProviders[$captchaType]->get();
     }
 }
diff --git a/ReCaptchaVersion2Checkbox/etc/adminhtml/system.xml b/ReCaptchaVersion2Checkbox/etc/adminhtml/system.xml
@@ -14,6 +14,7 @@
                 <field id="private_key" translate="label" type="obscure" sortOrder="20" showInDefault="1" showInWebsite="0"
                        showInStore="0" canRestore="0">
                     <label>Google API Secret Key</label>
+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                 </field>
 
                 <field id="theme" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="0"
@@ -51,6 +52,7 @@
                 <field id="private_key" translate="label" type="obscure" sortOrder="20" showInDefault="1" showInWebsite="1"
                        showInStore="0" canRestore="0">
                     <label>Google API Secret Key</label>
+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                 </field>
 
                 <field id="theme" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1"
diff --git a/ReCaptchaVersion2Invisible/etc/adminhtml/system.xml b/ReCaptchaVersion2Invisible/etc/adminhtml/system.xml
@@ -14,6 +14,7 @@
                 <field id="private_key" translate="label" type="obscure" sortOrder="20" showInDefault="1" showInWebsite="0"
                        showInStore="0" canRestore="0">
                     <label>Google API Secret Key</label>
+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                 </field>
 
                 <field id="position" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="0"
@@ -36,6 +37,7 @@
                 <field id="private_key" translate="label" type="obscure" sortOrder="20" showInDefault="1" showInWebsite="1"
                        showInStore="0" canRestore="0">
                     <label>Google API Secret Key</label>
+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                 </field>
 
                 <field id="position" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1"
diff --git a/ReCaptchaVersion3Invisible/etc/adminhtml/system.xml b/ReCaptchaVersion3Invisible/etc/adminhtml/system.xml
@@ -14,6 +14,7 @@
                 <field id="private_key" translate="label" type="obscure" sortOrder="20" showInDefault="1" showInWebsite="0"
                        showInStore="0" canRestore="0">
                     <label>Google API Secret Key</label>
+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                 </field>
 
                 <field id="score_threshold" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="0"
@@ -46,6 +47,7 @@
                 <field id="private_key" translate="label" type="obscure" sortOrder="20" showInDefault="1" showInWebsite="1"
                        showInStore="0" canRestore="0">
                     <label>Google API Secret Key</label>
+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                 </field>
 
                 <field id="score_threshold" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="0"

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,6 @@ public function get(string $key): array`
`66`	`66`	`__('UI config provider for "%type" is not configured.', ['type' => $captchaType])`
`67`	`67`	`);`
`68`	`68`	`}`
`69`		`- return $this->captchaUiConfigProviders[$key]->get();`
	`69`	`+ return $this->captchaUiConfigProviders[$captchaType]->get();`
`70`	`70`	`}`
`71`	`71`	`}`