V3.7.0 (#308)

* Remove rate plugin CTA from options.php.

* Update composer.json.

* Update packages.

* Add enterprise settings.

* Fix colored border of hCaptcha challenge arrow.

* Bump up version.

* Fix Enterpise section on mobile.

* Add other Enterprise params.

* Apply suggestions from code review

* Apply suggestions from code review

* Add urlencode for api.js params.

* WPCS.

* Add dot to helper text.

---------

Co-authored-by: e271828- <e271828-@users.noreply.github.com>

Author: kagg-design

.tests/php/integration/AAAMainTest.php

@@ -520,6 +520,10 @@ static function ( $name ) {
 	.h-captcha iframe {
 		position: relative;
 	}
+
+	div[style*="z-index: 2147483647"] div[style*="border-width: 11px"][style*="position: absolute"][style*="pointer-events: none"] {
+		border-style: none;
+	}
 CSS;
 
 		$expected = "<style>\n$expected\n</style>\n";

.tests/php/unit/HCaptchaTestCase.php

@@ -574,6 +574,49 @@ protected function get_test_general_form_fields(): array {
 					)
 				),
 			],
+			'api_host'                 => [
+				'label'   => 'API Host',
+				'type'    => 'text',
+				'section' => 'enterprise',
+				'default' => 'js.hcaptcha.com',
+				'helper'  => 'See Enterprise docs.',
+			],
+			'asset_host'               => [
+				'label'   => 'Asset Host',
+				'type'    => 'text',
+				'section' => 'enterprise',
+				'helper'  => 'See Enterprise docs.',
+			],
+			'endpoint'                 => [
+				'label'   => 'Endpoint',
+				'type'    => 'text',
+				'section' => 'enterprise',
+				'helper'  => 'See Enterprise docs.',
+			],
+			'host'                     => [
+				'label'   => 'Host',
+				'type'    => 'text',
+				'section' => 'enterprise',
+				'helper'  => 'See Enterprise docs.',
+			],
+			'image_host'               => [
+				'label'   => 'Image Host',
+				'type'    => 'text',
+				'section' => 'enterprise',
+				'helper'  => 'See Enterprise docs.',
+			],
+			'report_api'               => [
+				'label'   => 'Report API',
+				'type'    => 'text',
+				'section' => 'enterprise',
+				'helper'  => 'See Enterprise docs.',
+			],
+			'sentry'                   => [
+				'label'   => 'Sentry',
+				'type'    => 'text',
+				'section' => 'enterprise',
+				'helper'  => 'See Enterprise docs.',
+			],
 			'off_when_logged_in'       => [
 				'label'   => 'Other Settings',
 				'type'    => 'checkbox',

assets/css/general.css

@@ -124,6 +124,30 @@
 	width: 100%;
 }
 
+/* Section Enterprise */
+.hcaptcha-section-enterprise + table {
+	max-width: 760px;
+}
+
+.hcaptcha-section-enterprise + table tbody {
+	display: grid;
+	grid-template-columns: repeat(2, 1fr);
+	gap: 10px 20px;
+	padding: 15px 20px;
+}
+
+.hcaptcha-section-enterprise + table tbody th {
+	width: auto;
+}
+
+.hcaptcha-section-enterprise + table tbody tr th {
+	padding: 0 0 10px 0;
+}
+
+.hcaptcha-section-enterprise + table tbody tr td input {
+	width: 100%;
+}
+
 /* Section Other */
 .hcaptcha-section-other + table {
 	max-width: 760px;

composer.json

@@ -40,8 +40,8 @@
     "codeception/module-db": "^1.2.0",
     "codeception/module-webdriver": "^1.4.1",
     "lucatume/function-mocker": "dev-master",
-    "lucatume/wp-browser": "^3.2.1",
-    "squizlabs/php_codesniffer": "^3.7.2",
+    "lucatume/wp-browser": "^3.2.3",
+    "squizlabs/php_codesniffer": "^3.8.1",
     "phpcompatibility/php-compatibility": "^9.3.5",
     "phpcompatibility/phpcompatibility-wp": "^2.1.4",
     "wp-coding-standards/wpcs": "^3.0.1"

hcaptcha.php

@@ -10,7 +10,7 @@
  * Plugin Name:          hCaptcha for WordPress
  * Plugin URI:           https://www.hcaptcha.com/
  * Description:          hCaptcha keeps out bots and spam while putting privacy first. It is a drop-in replacement for reCAPTCHA.
- * Version:              3.6.0
+ * Version:              3.7.0
  * Requires at least:    5.0
  * Requires PHP:         7.0
  * Author:               hCaptcha
@@ -39,7 +39,7 @@
 /**
  * Plugin version.
  */
-const HCAPTCHA_VERSION = '3.6.0';
+const HCAPTCHA_VERSION = '3.7.0';
 
 /**
  * Path to the plugin dir.

package.json

@@ -41,30 +41,30 @@
     }
   },
   "engines": {
-    "node": ">=21.2.0",
-    "npm": ">=10.2.4"
+    "node": ">=21.5.0",
+    "npm": ">=10.3.0"
   },
   "packageManager": "yarn@4.0.2",
   "dependencies": {
-    "@wordpress/hooks": "^3.47.0"
+    "@wordpress/hooks": "^3.48.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.5",
-    "@babel/preset-env": "^7.23.5",
-    "@inrupt/jest-jsdom-polyfills": "^2.5.0",
-    "@wordpress/eslint-plugin": "^17.4.0",
+    "@babel/core": "^7.23.7",
+    "@babel/preset-env": "^7.23.8",
+    "@inrupt/jest-jsdom-polyfills": "^3.0.2",
+    "@wordpress/eslint-plugin": "^17.5.0",
     "babel-loader": "^9.1.3",
     "coveralls": "^3.1.1",
-    "css-loader": "^6.8.1",
+    "css-loader": "^6.9.0",
     "css-minimizer-webpack-plugin": "^5.0.1",
-    "eslint": "8.55.0",
+    "eslint": "8.56.0",
     "glob": "^10.3.10",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "jest-fetch-mock": "^3.0.3",
     "jquery": "^3.7.0",
-    "mini-css-extract-plugin": "^2.7.6",
-    "terser-webpack-plugin": "^5.3.9",
+    "mini-css-extract-plugin": "^2.7.7",
+    "terser-webpack-plugin": "^5.3.10",
     "webpack": "^5.89.0",
     "webpack-cli": "^5.1.4",
     "webpack-remove-empty-scripts": "^1.0.4"

readme.txt

@@ -4,7 +4,7 @@ Tags: captcha, hcaptcha, recaptcha, spam, abuse
 Requires at least: 5.0
 Tested up to: 6.4
 Requires PHP: 7.0.0
-Stable tag: 3.6.0
+Stable tag: 3.7.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -540,6 +540,12 @@ Instructions for popular native integrations are below:
 
 == Changelog ==
 
+= 3.7.0 =
+* Tested with WooCommerce 8.5.
+* Added optional Enterprise settings.
+* Fixed improper display of the "rate plugin" message on options.php.
+* Fixed colored border of hCaptcha challenge arrow.
+
 = 3.6.0 =
 * Tested with WooCommerce 8.4.
 * Added compatibility with BuddyPress 12.0.

src/php/Main.php

@@ -46,6 +46,11 @@ class Main {
 	 */
 	const OBJECT = 'HCaptchaMainObject';
 
+	/**
+	 * Default API host.
+	 */
+	const API_HOST = 'js.hcaptcha.com';
+
 	/**
 	 * Form shown somewhere, use this flag to run the script.
 	 *
@@ -358,6 +363,10 @@ public function print_inline_styles() {
 	.h-captcha iframe {
 		position: relative;
 	}
+
+	div[style*="z-index: 2147483647"] div[style*="border-width: 11px"][style*="position: absolute"][style*="pointer-events: none"] {
+		border-style: none;
+	}
 CSS;
 
 		HCaptcha::css_display( $css );
@@ -407,7 +416,26 @@ public function get_api_src(): string {
 			$params['custom'] = 'true';
 		}
 
-		return add_query_arg( $params, 'https://js.hcaptcha.com/1/api.js' );
+		$api_host = trim( $this->settings()->get( 'api_host' ) ) ?: self::API_HOST;
+
+		$enterprise_params = [
+			'asset_host',
+			'endpoint',
+			'host',
+			'image_host',
+			'report_api',
+			'sentry',
+		];
+
+		foreach ( $enterprise_params as $enterprise_param ) {
+			$value = trim( $this->settings()->get( $enterprise_param ) );
+
+			if ( $value ) {
+				$params[ $enterprise_param ] = rawurlencode( $value );
+			}
+		}
+
+		return add_query_arg( $params, "https://$api_host/1/api.js" );
 	}
 
 	/**

src/php/Settings/Abstracts/SettingsBase.php

@@ -1271,9 +1271,13 @@ public function load_plugin_textdomain() {
 	/**
 	 * Is current admin screen the plugin options screen.
 	 *
+	 * @param string|array $ids Additional screen id or ids to check.
+	 *
 	 * @return bool
 	 */
-	protected function is_options_screen(): bool {
+	protected function is_options_screen( $ids = 'options' ): bool {
+		$ids = (array) $ids;
+
 		if ( ! function_exists( 'get_current_screen' ) ) {
 			return false;
 		}
@@ -1290,7 +1294,7 @@ protected function is_options_screen(): bool {
 			$screen_id = str_replace( 'settings_page', 'toplevel_page', $screen_id );
 		}
 
-		return 'options' === $current_screen->id || $screen_id === $current_screen->id;
+		return $screen_id === $current_screen->id || in_array( $current_screen->id, $ids, true );
 	}
 
 	/**

src/php/Settings/General.php

@@ -9,6 +9,7 @@
 
 use HCaptcha\Admin\Notifications;
 use HCaptcha\Helpers\HCaptcha;
+use HCaptcha\Main;
 use KAGG\Settings\Abstracts\SettingsBase;
 
 /**
@@ -48,6 +49,11 @@ class General extends PluginSettingsBase {
 	 */
 	const SECTION_CUSTOM = 'custom';
 
+	/**
+	 * Enterprise section id.
+	 */
+	const SECTION_ENTERPRISE = 'enterprise';
+
 	/**
 	 * Other section id.
 	 */
@@ -369,6 +375,49 @@ public function init_form_fields() {
 					)
 				),
 			],
+			'api_host'             => [
+				'label'   => __( 'API Host', 'hcaptcha-for-forms-and-more' ),
+				'type'    => 'text',
+				'section' => self::SECTION_ENTERPRISE,
+				'default' => Main::API_HOST,
+				'helper'  => __( 'See Enterprise docs.' ),
+			],
+			'asset_host'           => [
+				'label'   => __( 'Asset Host', 'hcaptcha-for-forms-and-more' ),
+				'type'    => 'text',
+				'section' => self::SECTION_ENTERPRISE,
+				'helper'  => __( 'See Enterprise docs.', 'hcaptcha-for-forms-and-more' ),
+			],
+			'endpoint'             => [
+				'label'   => __( 'Endpoint', 'hcaptcha-for-forms-and-more' ),
+				'type'    => 'text',
+				'section' => self::SECTION_ENTERPRISE,
+				'helper'  => __( 'See Enterprise docs.', 'hcaptcha-for-forms-and-more' ),
+			],
+			'host'                 => [
+				'label'   => __( 'Host', 'hcaptcha-for-forms-and-more' ),
+				'type'    => 'text',
+				'section' => self::SECTION_ENTERPRISE,
+				'helper'  => __( 'See Enterprise docs.', 'hcaptcha-for-forms-and-more' ),
+			],
+			'image_host'           => [
+				'label'   => __( 'Image Host', 'hcaptcha-for-forms-and-more' ),
+				'type'    => 'text',
+				'section' => self::SECTION_ENTERPRISE,
+				'helper'  => __( 'See Enterprise docs.', 'hcaptcha-for-forms-and-more' ),
+			],
+			'report_api'           => [
+				'label'   => __( 'Report API', 'hcaptcha-for-forms-and-more' ),
+				'type'    => 'text',
+				'section' => self::SECTION_ENTERPRISE,
+				'helper'  => __( 'See Enterprise docs.', 'hcaptcha-for-forms-and-more' ),
+			],
+			'sentry'               => [
+				'label'   => __( 'Sentry', 'hcaptcha-for-forms-and-more' ),
+				'type'    => 'text',
+				'section' => self::SECTION_ENTERPRISE,
+				'helper'  => __( 'See Enterprise docs.', 'hcaptcha-for-forms-and-more' ),
+			],
 			'off_when_logged_in'   => [
 				'label'   => __( 'Other Settings', 'hcaptcha-for-forms-and-more' ),
 				'type'    => 'checkbox',
@@ -474,6 +523,9 @@ public function section_callback( array $arguments ) {
 			case self::SECTION_CUSTOM:
 				$this->print_section_header( $arguments['id'], __( 'Custom', 'hcaptcha-for-forms-and-more' ) );
 				break;
+			case self::SECTION_ENTERPRISE:
+				$this->print_section_header( $arguments['id'], __( 'Enterprise', 'hcaptcha-for-forms-and-more' ) );
+				break;
 			case self::SECTION_OTHER:
 				$this->print_section_header( $arguments['id'], __( 'Other', 'hcaptcha-for-forms-and-more' ) );
 				break;