security-package/issues/123: reCAPTCHA adapters modularity

Author: naydav

ReCaptcha/Model/CaptchaValidator.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReCaptchaAdminUi\Model;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\ReCaptchaUi\Model\CaptchaTypeResolverInterface;
+
+/**
+ * @inheritdoc
+ */
+class CaptchaTypeResolver implements CaptchaTypeResolverInterface
+{
+    private const XML_PATH_TYPE_FOR = 'recaptcha_backend/type_for/';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig
+    ) {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCaptchaTypeFor(string $key): ?string
+    {
+        $type = $this->scopeConfig->getValue(
+            self::XML_PATH_TYPE_FOR . $key
+        );
+        return $type;
+    }
+}

ReCaptcha/composer.json

@@ -5,18 +5,19 @@
  */
 declare(strict_types=1);
 
-namespace Magento\ReCaptchaVersion2Checkbox\Model\OptionSource;
+namespace Magento\ReCaptchaAdminUi\Model;
 
 use Magento\Framework\Data\OptionSourceInterface;
 
 /**
- * reCAPTCHA v2 sizes
+ * Generic class for reCAPTCHA Stores/System Configuration options
+ * Should not use directly, only as base class for "virtual type" in DI configuration
  *
- * Extension point for adding reCAPTCHA sizes
+ * Extension point for adding reCAPTCHA options
  *
  * @api
  */
-class Size implements OptionSourceInterface
+class OptionSource implements OptionSourceInterface
 {
     /**
      * @var array

ReCaptcha/etc/acl.xml

@@ -7,12 +7,6 @@
         "magento/module-config": "*",
         "magento/module-re-captcha-api": "*"
     },
-    "authors": [
-        {
-            "name": "Riccardo Tempesta",
-            "email": "[email protected]"
-        }
-    ],
     "type": "magento2-module",
     "license": "OSL-3.0",
     "autoload": {

ReCaptcha/etc/di.xml

@@ -7,6 +7,6 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <preference for="Magento\ReCaptchaApi\Api\CaptchaConfigInterface"
-                type="Magento\ReCaptchaAdminUi\Model\CaptchaConfig"/>
+    <preference for="Magento\ReCaptchaUi\Model\CaptchaTypeResolverInterface"
+                type="Magento\ReCaptchaAdminUi\Model\CaptchaTypeResolver"/>
 </config>

ReCaptchaAdminUi/Model/CaptchaConfig.php

@@ -17,7 +17,7 @@
             <class>separator-top</class>
             <label>Google reCAPTCHA Admin Panel</label>
             <tab>security</tab>
-            <resource>Magento_ReCaptcha::config</resource>
+            <resource>Magento_ReCaptchaUi::config</resource>
 
             <group id="type_for" translate="label" type="text" sortOrder="1000" showInDefault="1" showInWebsite="0"
                    showInStore="0">
@@ -30,7 +30,7 @@
             <class>separator-top</class>
             <label>Google reCAPTCHA Storefront</label>
             <tab>security</tab>
-            <resource>Magento_ReCaptcha::config</resource>
+            <resource>Magento_ReCaptchaUi::config</resource>
 
             <group id="type_for" translate="label" type="text" sortOrder="1000" showInDefault="1" showInWebsite="1"
                    showInStore="0">