Merge pull request #124 from /issues/123

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

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReCaptchaAdminUi\Model;
+
+use Magento\Framework\Data\OptionSourceInterface;
+
+/**
+ * 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 options
+ *
+ * @api
+ */
+class OptionSource implements OptionSourceInterface
+{
+    /**
+     * @var array
+     */
+    private $options;
+
+    /**
+     * @param array $options
+     */
+    public function __construct(array $options = [])
+    {
+        $this->options = $options;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function toOptionArray(): array
+    {
+        return array_values($this->options);
+    }
+}

ReCaptcha/etc/acl.xml

@@ -1,19 +1,13 @@
 {
     "name": "magento/module-re-captcha-admin-ui",
-    "version": "1.0.0",
-    "description": "Google reCaptcha integration for Magento2",
+    "description": "Google reCAPTCHA integration for Magento2",
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
         "magento/framework": "102.0.*",
         "magento/module-config": "*",
-        "magento/module-re-captcha-api": "*"
+        "magento/module-re-captcha-api": "*",
+        "magento/module-re-captcha-ui": "*"
     },
-    "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>