Merge pull request #457 from equalizedigital/hotfix/basic-auth-fix

Hotfix/basic auth fix

accessibility-checker.php

@@ -10,7 +10,7 @@
  * Plugin Name:       Accessibility Checker
  * Plugin URI:        https://a11ychecker.com
  * Description:       Audit and check your website for accessibility before you hit publish. In-post accessibility scanner and guidance.
- * Version:           1.7.1
+ * Version:           1.7.1-beta.7
  * Author:            Equalize Digital
  * Author URI:        https://equalizedigital.com
  * License:           GPL-2.0+
@@ -45,7 +45,7 @@
 
 // Current plugin version.
 if ( ! defined( 'EDAC_VERSION' ) ) {
-	define( 'EDAC_VERSION', '1.7.1' );
+	define( 'EDAC_VERSION', '1.7.1-beta.7' );
 }
 
 // Current database version.
@@ -834,8 +834,9 @@ function edac_summary_ajax() {
 	$html['content'] = '';
 
 	// password check.
-	$is_pasword_protected = (bool) get_option( 'edac_password_protected', false );
-	if ( $is_pasword_protected ) {
+	if (
+		(bool) get_option( 'edac_password_protected', false )
+	) {
 		$admin_notices              = new \EDAC\Admin_Notices();
 		$notice_text                = $admin_notices->edac_password_protected_notice_text();
 		$html['password_protected'] = $notice_text;

composer.json

@@ -25,15 +25,16 @@
     "prefer-stable": true,
     "repositories": [
         {
-          "type": "vcs",
-          "url": "https://github.com/equalizedigital/accessibility-checker-wp-env"
+            "type": "vcs",
+            "url": "https://github.com/equalizedigital/accessibility-checker-wp-env"
         }
-      ],
+    ],
     "require-dev": {
         "automattic/vipwpcs": "^3",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
         "phpcompatibility/php-compatibility": "*",
-        "php-parallel-lint/php-parallel-lint": "^1.3"
+        "php-parallel-lint/php-parallel-lint": "^1.3",
+        "equalizedigital/accessibility-checker-wp-env": "*"
     },
     "require": {
         "cbschuld/browser.php": "^1.9",

includes/enqueue-scripts.php

@@ -57,12 +57,6 @@ function edac_admin_enqueue_scripts() {
 				$active = false;
 			}
 
-			$headers = array(
-				'Content-Type'  => 'application/json',
-				'X-WP-Nonce'    => wp_create_nonce( 'wp_rest' ),
-				'Authorization' => 'None',
-
-			);
 
 			$pro = edac_check_plugin_active( 'accessibility-checker-pro/accessibility-checker-pro.php' ) && EDAC_KEY_VALID;
 
@@ -81,16 +75,15 @@ function edac_admin_enqueue_scripts() {
 				'edac-editor-app',
 				'edac_editor_app',
 				array(
-					'postID'      => $post_id,
-					'edacUrl'     => esc_url_raw( get_site_url() ),
-					'edacHeaders' => $headers,
-					'edacApiUrl'  => esc_url_raw( rest_url() . 'accessibility-checker/v1' ),
-					'baseurl'     => plugin_dir_url( __DIR__ ),
-					'active'      => $active,
-					'pro'         => $pro,
-					'hasAuth'     => (bool) get_option( 'edac_password_protected', false ),
-					'debug'       => $debug,
-					'scanUrl'     => get_preview_post_link(
+					'postID'     => $post_id,
+					'edacUrl'    => esc_url_raw( get_site_url() ),
+					'edacApiUrl' => esc_url_raw( rest_url() . 'accessibility-checker/v1' ),
+					'baseurl'    => plugin_dir_url( __DIR__ ),
+					'active'     => $active,
+					'pro'        => $pro,
+					'authOk'     => false === (bool) get_option( 'edac_password_protected', false ),
+					'debug'      => $debug,
+					'scanUrl'    => get_preview_post_link(
 						$post_id, 
 						array( 'edac_pageScanner' => 1 )
 					),

includes/options-page.php

@@ -77,9 +77,6 @@ function edac_display_welcome_page() {
  */
 function edac_display_options_page() {
 	include_once plugin_dir_path( __DIR__ ) . 'partials/settings-page.php';
-
-	// force edac_auth_type to reset in case user updates auth options.
-	delete_transient( 'edac_auth_type' );
 }
 
 /**

includes/validate.php

@@ -112,11 +112,10 @@ function edac_validate( $post_ID, $post, $action ) {
 	do_action( 'edac_after_get_content', $post_ID, $content, $action );
 
 	if ( ! $content['html'] ) {
-		delete_transient( 'edac_auth_type' );
-		add_option( 'edac_password_protected', true );
+		update_option( 'edac_password_protected', true );
 		return;
 	} else {
-		delete_option( 'edac_password_protected' );
+		update_option( 'edac_password_protected', false );
 	}
 
 	// set record check flag on previous error records.
@@ -357,9 +356,8 @@ function edac_get_content( $post ) {
 			// will not be followed, so $content['html] will be false.
 			$merged_context_opts = array_merge( $default_context_opts, $context_opts );
 			$context             = stream_context_create( $merged_context_opts );
-
-			$dom             = file_get_html( $url, false, $context );      
-			$content['html'] = edac_remove_elements(
+			$dom                 = file_get_html( $url, false, $context );   
+			$content['html']     = edac_remove_elements(
 				$dom, 
 				array(
 					'#wpadminbar',            // wp admin bar.