security-package/issues/123: reCAPTCHA adapters modularity

naydav · naydav · commit a9a7797df4fd · 2020-02-25T23:36:06.000-06:00
diff --git a/ReCaptchaAdminUi/composer.json b/ReCaptchaAdminUi/composer.json
@@ -1,6 +1,5 @@
 {
     "name": "magento/module-re-captcha-admin-ui",
-    "version": "1.0.0",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
diff --git a/ReCaptchaAdminUi/etc/adminhtml/di.xml b/ReCaptchaAdminUi/etc/adminhtml/di.xml
diff --git a/ReCaptchaApi/composer.json b/ReCaptchaApi/composer.json
@@ -1,6 +1,5 @@
 {
     "name": "magento/module-re-captcha-api",
-    "version": "1.0.0",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
diff --git a/ReCaptchaCheckout/composer.json b/ReCaptchaCheckout/composer.json
@@ -1,6 +1,5 @@
 {
     "name": "magento/module-re-captcha-checkout",
-    "version": "1.0.0",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
diff --git a/ReCaptchaContact/composer.json b/ReCaptchaContact/composer.json
@@ -1,6 +1,5 @@
 {
     "name": "magento/module-re-captcha-contact",
-    "version": "1.0.0",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
diff --git a/ReCaptchaCustomer/composer.json b/ReCaptchaCustomer/composer.json
@@ -1,6 +1,5 @@
 {
     "name": "magento/module-re-captcha-customer",
-    "version": "1.0.0",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
diff --git a/ReCaptchaFrontendUi/composer.json b/ReCaptchaFrontendUi/composer.json
@@ -1,6 +1,5 @@
 {
     "name": "magento/module-re-captcha-frontend-ui",
-    "version": "1.0.0",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
diff --git a/ReCaptchaFrontendUi/etc/di.xml b/ReCaptchaFrontendUi/etc/di.xml
diff --git a/ReCaptchaNewsletter/composer.json b/ReCaptchaNewsletter/composer.json
@@ -1,6 +1,5 @@
 {
     "name": "magento/module-re-captcha-newsletter",
-    "version": "1.0.0",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
diff --git a/ReCaptchaReview/composer.json b/ReCaptchaReview/composer.json
@@ -1,6 +1,5 @@
 {
     "name": "magento/module-re-captcha-review",
-    "version": "1.0.0",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
diff --git a/ReCaptchaSendFriend/composer.json b/ReCaptchaSendFriend/composer.json
@@ -1,6 +1,5 @@
 {
     "name": "magento/module-re-captcha-send-friend",
-    "version": "1.0.0",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
diff --git a/ReCaptchaUi/Model/UiConfigResolver.php b/ReCaptchaUi/Model/UiConfigResolver.php
@@ -63,7 +63,7 @@ public function get(string $key): array
 
         if (!isset($this->captchaUiConfigProviders[$captchaType])) {
             throw new InputException(
-                __('UI config provider for "%type" does not configured.', ['type' => $captchaType])
+                __('UI config provider for "%type" is not configured.', ['type' => $captchaType])
             );
         }
         return $this->captchaUiConfigProviders[$key]->get();
diff --git a/ReCaptchaUi/Model/UiConfigResolverInterface.php b/ReCaptchaUi/Model/UiConfigResolverInterface.php
@@ -21,7 +21,7 @@ interface UiConfigResolverInterface
      *
      * @param string $key Functionality identifier
      * @return array
-     * @throws InputException If UI config for "%key" does not configured
+     * @throws InputException If UI config for "%key" is not configured
      */
     public function get(string $key): array;
 }
diff --git a/ReCaptchaUi/composer.json b/ReCaptchaUi/composer.json
@@ -1,6 +1,5 @@
 {
     "name": "magento/module-re-captcha-ui",
-    "version": "1.0.0",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
diff --git a/ReCaptchaUser/Test/Integration/ForgotPasswordFormTest.php b/ReCaptchaUser/Test/Integration/ForgotPasswordFormTest.php
@@ -63,7 +63,7 @@ protected function setUp()
      * @magentoAdminConfigFixture recaptcha/backend/public_key test_public_key
      * @magentoAdminConfigFixture recaptcha/backend/private_key test_private_key
      * @magentoAdminConfigFixture recaptcha/backend/type invisible
-     * @magentoAdminConfigFixture recaptcha/backend/enabled_for_user_forgot_password 0
+     * @magentoAdminConfigFixture recaptcha_backend/type_for/user_forgot_password 0
      */
     public function testGetRequestIfReCaptchaIsDisabled()
     {
@@ -73,7 +73,7 @@ public function testGetRequestIfReCaptchaIsDisabled()
     /**
      * @magentoAdminConfigFixture admin/captcha/enable 0
      * @magentoAdminConfigFixture recaptcha/backend/type invisible
-     * @magentoAdminConfigFixture recaptcha/backend/enabled_for_user_forgot_password 1
+     * @magentoAdminConfigFixture recaptcha_backend/type_for/user_forgot_password 1
      */
     public function testGetRequestIfReCaptchaKeysAreNotConfigured()
     {
@@ -85,7 +85,7 @@ public function testGetRequestIfReCaptchaKeysAreNotConfigured()
      * @magentoAdminConfigFixture recaptcha/backend/type invisible
      * @magentoAdminConfigFixture recaptcha/backend/public_key test_public_key
      * @magentoAdminConfigFixture recaptcha/backend/private_key test_private_key
-     * @magentoAdminConfigFixture recaptcha/backend/enabled_for_user_forgot_password 1
+     * @magentoAdminConfigFixture recaptcha_backend/type_for/user_forgot_password 1
      */
     public function testGetRequestIfReCaptchaIsEnabled()
     {
@@ -97,7 +97,7 @@ public function testGetRequestIfReCaptchaIsEnabled()
      * @magentoAdminConfigFixture recaptcha/backend/public_key test_public_key
      * @magentoAdminConfigFixture recaptcha/backend/private_key test_private_key
      * @magentoAdminConfigFixture recaptcha/backend/type invisible
-     * @magentoAdminConfigFixture recaptcha/backend/enabled_for_user_forgot_password 0
+     * @magentoAdminConfigFixture recaptcha_backend/type_for/user_forgot_password 0
      */
     public function testPostRequestIfReCaptchaIsDisabled()
     {
@@ -108,7 +108,7 @@ public function testPostRequestIfReCaptchaIsDisabled()
      * @magentoAdminConfigFixture admin/captcha/enable 0
      * @magentoAdminConfigFixture recaptcha/backend/type invisible
      * @magentoAdminConfigFixture admin/captcha/always_for/backend_forgotpassword 0
-     * @magentoAdminConfigFixture recaptcha/backend/enabled_for_user_forgot_password 1
+     * @magentoAdminConfigFixture recaptcha_backend/type_for/user_forgot_password 1
      */
     public function testPostRequestIfReCaptchaKeysAreNotConfigured()
     {
@@ -120,7 +120,7 @@ public function testPostRequestIfReCaptchaKeysAreNotConfigured()
      * @magentoAdminConfigFixture recaptcha/backend/public_key test_public_key
      * @magentoAdminConfigFixture recaptcha/backend/private_key test_private_key
      * @magentoAdminConfigFixture recaptcha/backend/type invisible
-     * @magentoAdminConfigFixture recaptcha/backend/enabled_for_user_forgot_password 1
+     * @magentoAdminConfigFixture recaptcha_backend/type_for/user_forgot_password 1
      */
     public function testPostRequestWithSuccessfulReCaptchaValidation()
     {
@@ -138,7 +138,7 @@ public function testPostRequestWithSuccessfulReCaptchaValidation()
      * @magentoAdminConfigFixture recaptcha/backend/public_key test_public_key
      * @magentoAdminConfigFixture recaptcha/backend/private_key test_private_key
      * @magentoAdminConfigFixture recaptcha/backend/type invisible
-     * @magentoAdminConfigFixture recaptcha/backend/enabled_for_user_forgot_password 1
+     * @magentoAdminConfigFixture recaptcha_backend/type_for/user_forgot_password 1
      * @expectedException \Magento\Framework\Exception\InputException
      * @expectedExceptionMessage Can not resolve reCAPTCHA parameter.
      */
@@ -160,7 +160,7 @@ public function testPostRequestIfReCaptchaParameterIsMissed()
      * @magentoAdminConfigFixture recaptcha/backend/public_key test_public_key
      * @magentoAdminConfigFixture recaptcha/backend/private_key test_private_key
      * @magentoAdminConfigFixture recaptcha/backend/type invisible
-     * @magentoAdminConfigFixture recaptcha/backend/enabled_for_user_forgot_password 1
+     * @magentoAdminConfigFixture recaptcha_backend/type_for/user_forgot_password 1
      */
     public function testPostRequestWithFailedReCaptchaValidation()
     {
diff --git a/ReCaptchaUser/Test/Integration/LoginFormTest.php b/ReCaptchaUser/Test/Integration/LoginFormTest.php
@@ -67,7 +67,7 @@ protected function setUp()
      * @magentoAdminConfigFixture recaptcha/backend/public_key test_public_key
      * @magentoAdminConfigFixture recaptcha/backend/private_key test_private_key
      * @magentoAdminConfigFixture recaptcha/backend/type invisible
-     * @magentoAdminConfigFixture recaptcha/backend/enabled_for_user_login 0
+     * @magentoAdminConfigFixture recaptcha_backend/type_for/user_login 0
      */
     public function testGetRequestIfReCaptchaIsDisabled()
     {
@@ -78,7 +78,7 @@ public function testGetRequestIfReCaptchaIsDisabled()
      * @magentoAdminConfigFixture admin/security/use_form_key 0
      * @magentoAdminConfigFixture admin/captcha/enable 0
      * @magentoAdminConfigFixture recaptcha/backend/type invisible
-     * @magentoAdminConfigFixture recaptcha/backend/enabled_for_user_login 1
+     * @magentoAdminConfigFixture recaptcha_backend/type_for/user_login 1
      */
     public function testGetRequestIfReCaptchaKeysAreNotConfigured()
     {
@@ -91,7 +91,7 @@ public function testGetRequestIfReCaptchaKeysAreNotConfigured()
      * @magentoAdminConfigFixture recaptcha/backend/type invisible
      * @magentoAdminConfigFixture recaptcha/backend/public_key test_public_key
      * @magentoAdminConfigFixture recaptcha/backend/private_key test_private_key
-     * @magentoAdminConfigFixture recaptcha/backend/enabled_for_user_login 1
+     * @magentoAdminConfigFixture recaptcha_backend/type_for/user_login 1
      */
     public function testGetRequestIfReCaptchaIsEnabled()
     {
@@ -104,7 +104,7 @@ public function testGetRequestIfReCaptchaIsEnabled()
      * @magentoAdminConfigFixture recaptcha/backend/public_key test_public_key
      * @magentoAdminConfigFixture recaptcha/backend/private_key test_private_key
      * @magentoAdminConfigFixture recaptcha/backend/type invisible
-     * @magentoAdminConfigFixture recaptcha/backend/enabled_for_user_login 0
+     * @magentoAdminConfigFixture recaptcha_backend/type_for/user_login 0
      */
     public function testPostRequestIfReCaptchaIsDisabled()
     {
@@ -115,7 +115,7 @@ public function testPostRequestIfReCaptchaIsDisabled()
      * @magentoAdminConfigFixture admin/security/use_form_key 0
      * @magentoAdminConfigFixture admin/captcha/enable 0
      * @magentoAdminConfigFixture recaptcha/backend/type invisible
-     * @magentoAdminConfigFixture recaptcha/backend/enabled_for_user_login 1
+     * @magentoAdminConfigFixture recaptcha_backend/type_for/user_login 1
      */
     public function testPostRequestIfReCaptchaKeysAreNotConfigured()
     {
@@ -128,7 +128,7 @@ public function testPostRequestIfReCaptchaKeysAreNotConfigured()
      * @magentoAdminConfigFixture recaptcha/backend/public_key test_public_key
      * @magentoAdminConfigFixture recaptcha/backend/private_key test_private_key
      * @magentoAdminConfigFixture recaptcha/backend/type invisible
-     * @magentoAdminConfigFixture recaptcha/backend/enabled_for_user_login 1
+     * @magentoAdminConfigFixture recaptcha_backend/type_for/user_login 1
      */
     public function testPostRequestWithSuccessfulReCaptchaValidation()
     {
@@ -147,7 +147,7 @@ public function testPostRequestWithSuccessfulReCaptchaValidation()
      * @magentoAdminConfigFixture recaptcha/backend/public_key test_public_key
      * @magentoAdminConfigFixture recaptcha/backend/private_key test_private_key
      * @magentoAdminConfigFixture recaptcha/backend/type invisible
-     * @magentoAdminConfigFixture recaptcha/backend/enabled_for_user_login 1
+     * @magentoAdminConfigFixture recaptcha_backend/type_for/user_login 1
      */
     public function testPostRequestIfReCaptchaParameterIsMissed()
     {
@@ -177,7 +177,7 @@ public function testPostRequestIfReCaptchaParameterIsMissed()
      * @magentoAdminConfigFixture recaptcha/backend/public_key test_public_key
      * @magentoAdminConfigFixture recaptcha/backend/private_key test_private_key
      * @magentoAdminConfigFixture recaptcha/backend/type invisible
-     * @magentoAdminConfigFixture recaptcha/backend/enabled_for_user_login 1
+     * @magentoAdminConfigFixture recaptcha_backend/type_for/user_login 1
      */
     public function testPostRequestWithFailedReCaptchaValidation()
     {
diff --git a/ReCaptchaUser/composer.json b/ReCaptchaUser/composer.json
@@ -1,6 +1,5 @@
 {
     "name": "magento/module-re-captcha-user",
-    "version": "1.0.0",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
diff --git a/ReCaptchaVersion2Checkbox/Model/Frontend/UiConfigProvider.php b/ReCaptchaVersion2Checkbox/Model/Frontend/UiConfigProvider.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\ReCaptchaVersion2Checkbox\Model;
+namespace Magento\ReCaptchaVersion2Checkbox\Model\Frontend;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\ReCaptchaUi\Model\UiConfigProviderInterface;
diff --git a/ReCaptchaVersion2Checkbox/composer.json b/ReCaptchaVersion2Checkbox/composer.json
@@ -1,6 +1,5 @@
 {
     "name": "magento/module-re-captcha-version-2-checkbox",
-    "version": "1.0.0",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
diff --git a/ReCaptchaVersion2Checkbox/etc/frontend/di.xml b/ReCaptchaVersion2Checkbox/etc/frontend/di.xml
@@ -10,7 +10,7 @@
     <type name="Magento\ReCaptchaUi\Model\UiConfigResolver">
         <arguments>
             <argument name="captchaUiConfigProviders" xsi:type="array">
-                <item name="recaptcha" xsi:type="object">Magento\ReCaptchaVersion2Checkbox\Model\UiConfigProvider\Proxy</item>
+                <item name="recaptcha" xsi:type="object">Magento\ReCaptchaVersion2Checkbox\Model\Frontend\UiConfigProvider\Proxy</item>
             </argument>
         </arguments>
     </type>
diff --git a/ReCaptchaVersion2Invisible/Model/Frontend/UiConfigProvider.php b/ReCaptchaVersion2Invisible/Model/Frontend/UiConfigProvider.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\ReCaptchaVersion2Invisible\Model;
+namespace Magento\ReCaptchaVersion2Invisible\Model\Frontend;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\ReCaptchaUi\Model\UiConfigProviderInterface;
diff --git a/ReCaptchaVersion2Invisible/composer.json b/ReCaptchaVersion2Invisible/composer.json
@@ -1,6 +1,5 @@
 {
     "name": "magento/module-re-captcha-version-2-invisible",
-    "version": "1.0.0",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
diff --git a/ReCaptchaVersion2Invisible/etc/di.xml b/ReCaptchaVersion2Invisible/etc/di.xml
@@ -54,12 +54,4 @@
             </argument>
         </arguments>
     </type>
-
-    <type name="Magento\ReCaptcha\Model\CaptchaValidator">
-        <arguments>
-            <argument name="validators" xsi:type="array">
-                <item name="invisible" xsi:type="object">Magento\ReCaptchaVersion2Invisible\Model\CaptchaValidator</item>
-            </argument>
-        </arguments>
-    </type>
 </config>
diff --git a/ReCaptchaVersion2Invisible/etc/frontend/di.xml b/ReCaptchaVersion2Invisible/etc/frontend/di.xml
@@ -10,7 +10,7 @@
     <type name="Magento\ReCaptchaUi\Model\UiConfigResolver">
         <arguments>
             <argument name="captchaUiConfigProviders" xsi:type="array">
-                <item name="invisible" xsi:type="object">Magento\ReCaptchaVersion2Invisible\Model\UiConfigProvider\Proxy</item>
+                <item name="invisible" xsi:type="object">Magento\ReCaptchaVersion2Invisible\Model\Frontend\UiConfigProvider\Proxy</item>
             </argument>
         </arguments>
     </type>
diff --git a/ReCaptchaVersion3Invisible/Model/Frontend/UiConfigProvider.php b/ReCaptchaVersion3Invisible/Model/Frontend/UiConfigProvider.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\ReCaptchaVersion3Invisible\Model;
+namespace Magento\ReCaptchaVersion3Invisible\Model\Frontend;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\ReCaptchaUi\Model\UiConfigProviderInterface;
diff --git a/ReCaptchaVersion3Invisible/composer.json b/ReCaptchaVersion3Invisible/composer.json
@@ -1,6 +1,5 @@
 {
     "name": "magento/module-re-captcha-version-3-invisible",
-    "version": "1.0.0",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
diff --git a/ReCaptchaVersion3Invisible/etc/di.xml b/ReCaptchaVersion3Invisible/etc/di.xml
@@ -54,12 +54,4 @@
             </argument>
         </arguments>
     </type>
-
-    <type name="Magento\ReCaptcha\Model\CaptchaValidator">
-        <arguments>
-            <argument name="validators" xsi:type="array">
-                <item name="recaptcha_v3" xsi:type="object">Magento\ReCaptchaVersion3Invisible\Model\CaptchaValidator</item>
-            </argument>
-        </arguments>
-    </type>
 </config>
diff --git a/ReCaptchaVersion3Invisible/etc/frontend/di.xml b/ReCaptchaVersion3Invisible/etc/frontend/di.xml
@@ -10,7 +10,7 @@
     <type name="Magento\ReCaptchaUi\Model\UiConfigResolver">
         <arguments>
             <argument name="captchaUiConfigProviders" xsi:type="array">
-                <item name="recaptcha_v3" xsi:type="object">Magento\ReCaptchaVersion3Invisible\Model\UiConfigProvider\Proxy</item>
+                <item name="recaptcha_v3" xsi:type="object">Magento\ReCaptchaVersion3Invisible\Model\Frontend\UiConfigProvider\Proxy</item>
             </argument>
         </arguments>
     </type>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "magento/module-re-captcha-admin-ui",`
`3`		`- "version": "1.0.0",`
`4`	`3`	`"description": "Google reCAPTCHA integration for Magento2",`
`5`	`4`	`"require": {`
`6`	`5`	`"php": "~7.1.3\|\|~7.2.0\|\|~7.3.0",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "magento/module-re-captcha-api",`
`3`		`- "version": "1.0.0",`
`4`	`3`	`"description": "Google reCAPTCHA integration for Magento2",`
`5`	`4`	`"require": {`
`6`	`5`	`"php": "~7.1.3\|\|~7.2.0\|\|~7.3.0",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "magento/module-re-captcha-checkout",`
`3`		`- "version": "1.0.0",`
`4`	`3`	`"description": "Google reCAPTCHA integration for Magento2",`
`5`	`4`	`"require": {`
`6`	`5`	`"php": "~7.1.3\|\|~7.2.0\|\|~7.3.0",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "magento/module-re-captcha-contact",`
`3`		`- "version": "1.0.0",`
`4`	`3`	`"description": "Google reCAPTCHA integration for Magento2",`
`5`	`4`	`"require": {`
`6`	`5`	`"php": "~7.1.3\|\|~7.2.0\|\|~7.3.0",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "magento/module-re-captcha-customer",`
`3`		`- "version": "1.0.0",`
`4`	`3`	`"description": "Google reCAPTCHA integration for Magento2",`
`5`	`4`	`"require": {`
`6`	`5`	`"php": "~7.1.3\|\|~7.2.0\|\|~7.3.0",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "magento/module-re-captcha-frontend-ui",`
`3`		`- "version": "1.0.0",`
`4`	`3`	`"description": "Google reCAPTCHA integration for Magento2",`
`5`	`4`	`"require": {`
`6`	`5`	`"php": "~7.1.3\|\|~7.2.0\|\|~7.3.0",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "magento/module-re-captcha-newsletter",`
`3`		`- "version": "1.0.0",`
`4`	`3`	`"description": "Google reCAPTCHA integration for Magento2",`
`5`	`4`	`"require": {`
`6`	`5`	`"php": "~7.1.3\|\|~7.2.0\|\|~7.3.0",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "magento/module-re-captcha-review",`
`3`		`- "version": "1.0.0",`
`4`	`3`	`"description": "Google reCAPTCHA integration for Magento2",`
`5`	`4`	`"require": {`
`6`	`5`	`"php": "~7.1.3\|\|~7.2.0\|\|~7.3.0",`