Merge remote-tracking branch 'origin' into AC-12092_PHPUnit10

Author: Raj Mohan

ReCaptchaWebapiGraphQl/Model/Resolver/ReCaptchaV3.php

@@ -82,7 +82,8 @@ public function resolve(
             'badge_position' => $this->reCaptchaV3Config->getBadgePosition(),
             'language_code' => $this->reCaptchaV3Config->getLanguageCode(),
             'failure_message' => $this->getFailureMessage(),
-            'forms' => $this->getEnumFormTypes()
+            'forms' => $this->getEnumFormTypes(),
+            'theme' => $this->reCaptchaV3Config->getTheme()
         ];
     }
 

ReCaptchaWebapiGraphQl/Test/Api/ReCaptchaV3ConfigTest.php

@@ -7,6 +7,7 @@
 
 namespace Magento\ReCaptchaWebapiGraphQl\Test\Api;
 
+use Exception;
 use Magento\Framework\Encryption\EncryptorInterface;
 use Magento\TestFramework\Fixture\Config;
 use Magento\Framework\App\ResourceConnection;
@@ -29,6 +30,7 @@ class ReCaptchaV3ConfigTest extends GraphQlAbstract
         language_code
         failure_message
         forms
+        theme
     }
 }
 QUERY;
@@ -49,6 +51,7 @@ public function setUp(): void
         Config('recaptcha_frontend/type_recaptcha_v3/score_threshold', 0.75),
         Config('recaptcha_frontend/type_recaptcha_v3/position', 'bottomright'),
         Config('recaptcha_frontend/type_recaptcha_v3/lang', 'en'),
+        Config('recaptcha_frontend/type_recaptcha_v3/theme', 'light'),
         Config('recaptcha_frontend/failure_messages/validation_failure_message', 'Test failure message'),
         Config('recaptcha_frontend/type_for/customer_login', 'recaptcha_v3')
     ]
@@ -65,7 +68,8 @@ public function testQueryRecaptchaNoPublicKeyConfigured(): void
                     'failure_message' => 'Test failure message',
                     'forms' => [
                         'CUSTOMER_LOGIN'
-                    ]
+                    ],
+                    'theme' => 'light'
                 ]
             ],
             $this->graphQlQuery(self::QUERY)
@@ -76,6 +80,7 @@ public function testQueryRecaptchaNoPublicKeyConfigured(): void
         Config('recaptcha_frontend/type_recaptcha_v3/score_threshold', 0.75),
         Config('recaptcha_frontend/type_recaptcha_v3/position', 'bottomright'),
         Config('recaptcha_frontend/type_recaptcha_v3/lang', 'en'),
+        Config('recaptcha_frontend/type_recaptcha_v3/theme', 'light'),
         Config('recaptcha_frontend/failure_messages/validation_failure_message', 'Test failure message')
     ]
     public function testQueryRecaptchaNoFormsConfigured(): void
@@ -100,7 +105,8 @@ public function testQueryRecaptchaNoFormsConfigured(): void
                     'badge_position' => 'bottomright',
                     'language_code' => 'en',
                     'failure_message' => 'Test failure message',
-                    'forms' => []
+                    'forms' => [],
+                    'theme' => 'light'
                 ]
             ],
             $this->graphQlQuery(self::QUERY)
@@ -111,6 +117,7 @@ public function testQueryRecaptchaNoFormsConfigured(): void
         Config('recaptcha_frontend/type_recaptcha_v3/score_threshold', 0.75),
         Config('recaptcha_frontend/type_recaptcha_v3/position', 'bottomright'),
         Config('recaptcha_frontend/type_recaptcha_v3/lang', 'en'),
+        Config('recaptcha_frontend/type_recaptcha_v3/theme', 'dark'),
         Config('recaptcha_frontend/failure_messages/validation_failure_message', 'Test failure message'),
         Config('recaptcha_frontend/type_for/customer_login', 'recaptcha_v3')
     ]
@@ -138,7 +145,8 @@ public function testQueryRecaptchaConfigured(): void
                     'failure_message' => 'Test failure message',
                     'forms' => [
                         'CUSTOMER_LOGIN'
-                    ]
+                    ],
+                    'theme' => 'dark'
                 ]
             ],
             $this->graphQlQuery(self::QUERY)
@@ -151,7 +159,7 @@ public function tearDown(): void
         $resource = Bootstrap::getObjectManager()->get(ResourceConnection::class);
         /** @var AdapterInterface $connection */
         $connection = $resource->getConnection(ResourceConnection::DEFAULT_CONNECTION);
-        
+
         $connection->delete(
             $resource->getTableName('core_config_data')
         );

ReCaptchaWebapiGraphQl/etc/schema.graphqls

@@ -50,4 +50,5 @@ type ReCaptchaConfigurationV3 @doc(description: "Contains reCAPTCHA V3-Invisible
     language_code: String @doc(description: "A two-character code that specifies the language that is used for Google reCAPTCHA text and messaging.")
     failure_message: String! @doc(description: "The message that appears to the user if validation fails.")
     forms: [ReCaptchaFormEnum!]! @doc(description: "A list of forms on the storefront that have been configured to use reCAPTCHA V3.")
+    theme: String! @doc(description: "Theme to be used to render reCaptcha.")
 }