Merge pull request #680 from 10up/ehnancement/669

Remove the `AccessControl` class.

Author: dkotter

includes/Classifai/Blocks/recommended-content-block/register.php

@@ -7,6 +7,7 @@
 
 namespace Classifai\Blocks\RecommendedContentBlock;
 
+use Classifai\Features\RecommendedContent;
 use Classifai\Providers\Azure\Personalizer;
 use function Classifai\get_asset_info;
 
@@ -18,7 +19,6 @@ function register() {
 		return __NAMESPACE__ . "\\$function_name";
 	};
 
-	$personalizer = new Personalizer( false );
 	wp_register_script(
 		'recommended-content-block-editor-script',
 		CLASSIFAI_PLUGIN_URL . 'dist/recommended-content-block.js',
@@ -31,7 +31,7 @@ function register() {
 		'recommended-content-block-editor-script',
 		sprintf(
 			'var hasRecommendedContentAccess = %d;',
-			$personalizer->is_feature_enabled( 'recommended_content' )
+			( new RecommendedContent() )->is_feature_enabled()
 		),
 		'before'
 	);

includes/Classifai/Providers/AccessControl.php

@@ -140,22 +140,22 @@ public function get_default_provider_settings(): array {
 	public function sanitize_settings( array $new_settings ): array {
 		$settings = $this->feature_instance->get_settings();
 
-		$new_settings['endpoint_url'] = esc_url_raw( $new_settings['endpoint_url'] ?? $settings['endpoint_url'] );
-		$new_settings['api_key']      = sanitize_text_field( $new_settings['api_key'] ?? $settings['api_key'] );
+		$new_settings['endpoint_url'] = esc_url_raw( $new_settings[ static::ID ]['endpoint_url'] ?? $settings[ static::ID ]['endpoint_url'] );
+		$new_settings['api_key']      = sanitize_text_field( $new_settings[ static::ID ]['api_key'] ?? $settings[ static::ID ]['api_key'] );
 
-		if ( ! empty( $new_settings['endpoint_url'] ) && ! empty( $new_settings['api_key'] ) ) {
-			$auth_check = $this->authenticate_credentials( $new_settings['endpoint_url'], $new_settings['api_key'] );
+		if ( ! empty( $new_settings[ static::ID ]['endpoint_url'] ) && ! empty( $new_settings[ static::ID ]['api_key'] ) ) {
+			$auth_check = $this->authenticate_credentials( $new_settings[ static::ID ]['endpoint_url'], $new_settings[ static::ID ]['api_key'] );
 
 			if ( is_wp_error( $auth_check ) ) {
 				$settings_errors['classifai-registration-credentials-error'] = $auth_check->get_error_message();
-				$new_settings['authenticated']                               = false;
+				$new_settings[ static::ID ]['authenticated']                 = false;
 			} else {
-				$new_settings['authenticated'] = true;
+				$new_settings[ static::ID ]['authenticated'] = true;
 			}
 		} else {
-			$new_settings['authenticated'] = false;
-			$new_settings['endpoint_url']  = '';
-			$new_settings['api_key']       = '';
+			$new_settings[ static::ID ]['authenticated'] = false;
+			$new_settings[ static::ID ]['endpoint_url']  = '';
+			$new_settings[ static::ID ]['api_key']       = '';
 
 			$settings_errors['classifai-registration-credentials-empty'] = __( 'Please enter your credentials', 'classifai' );
 		}

includes/Classifai/Providers/Azure/Personalizer.php

@@ -214,80 +214,4 @@ public function add_api_key_field( array $args = [] ) {
 			]
 		);
 	}
-
-	/**
-	 * Determine if the current user has access of the feature
-	 *
-	 * @param string $feature Feature to check.
-	 * @return bool
-	 */
-	protected function has_access( string $feature ): bool {
-		$access_control = new AccessControl( $this, $feature );
-		return $access_control->has_access();
-	}
-
-	/**
-	 * Determine if the feature is enabled and current user can access the feature
-	 *
-	 * @param string $feature Feature to check.
-	 * @return bool
-	 */
-	public function is_feature_enabled( string $feature ): bool {
-		$is_feature_enabled = false;
-		$settings           = $this->get_settings();
-
-		// Check if provider is configured, user has access to the feature and the feature is turned on.
-		if (
-			$this->is_configured() &&
-			$this->has_access( $feature ) &&
-			$this->is_enabled( $feature )
-		) {
-			$is_feature_enabled = true;
-		}
-
-		/**
-		 * Filter to override permission to a specific classifai feature.
-		 *
-		 * @since 2.4.0
-		 * @hook classifai_{$this->option_name}_enable_{$feature}
-		 *
-		 * @param {bool}  $is_feature_enabled Is the feature enabled?
-		 * @param {array} $settings           Current feature settings.
-		 *
-		 * @return {bool} Returns true if the user has access and the feature is enabled, false otherwise.
-		 */
-		return apply_filters( "classifai_{$this->option_name}_enable_{$feature}", $is_feature_enabled, $settings );
-	}
-
-	/**
-	 * Determine if the feature is turned on.
-	 *
-	 * Note: This function does not check if the user has access to the feature.
-	 *
-	 * - Use `is_feature_enabled()` to check if the user has access to the feature and feature is turned on.
-	 * - Use `has_access()` to check if the user has access to the feature.
-	 *
-	 * @param string $feature Feature to check.
-	 * @return bool
-	 */
-	public function is_enabled( string $feature ): bool {
-		$settings   = $this->get_settings();
-		$enable_key = 'enable_' . $feature;
-
-		// Check if feature is turned on.
-		$is_enabled = ( isset( $settings[ $enable_key ] ) && 1 === (int) $settings[ $enable_key ] );
-
-		/**
-		 * Filter to override a specific classifai feature enabled.
-		 *
-		 * @since 2.5.0
-		 * @hook classifai_is_{$feature}_enabled
-		 *
-		 * @param {bool}  $is_enabled Is the feature enabled?
-		 * @param {array} $settings   Current feature settings.
-		 *
-		 * @return {bool} Returns true if the feature is enabled, false otherwise.
-		 */
-		return apply_filters( "classifai_is_{$feature}_enabled", $is_enabled, $settings );
-	}
 }