Remove "Enable user-based access" option.

Author: iamdharmesh

includes/Classifai/Admin/UserProfile.php

@@ -147,7 +147,6 @@ public function get_allowed_features( int $user_id ): array {
 					continue;
 				}
 
-				$user_based_access_enabled  = isset( $settings['user_based_access'] ) && 1 === (int) $settings['user_based_access'];
 				$user_based_opt_out_enabled = isset( $settings['user_based_opt_out'] ) && 1 === (int) $settings['user_based_opt_out'];
 
 				// Bail if user opt-out is not enabled.
@@ -173,7 +172,6 @@ public function get_allowed_features( int $user_id ): array {
 				// Check if user has access to the feature.
 				$allowed_users = $settings['users'] ?? [];
 				if (
-					$user_based_access_enabled &&
 					! empty( $allowed_users ) &&
 					in_array( $user_id, $allowed_users, true )
 				) {

includes/Classifai/Features/Feature.php

@@ -179,7 +179,6 @@ protected function get_default_settings(): array {
 		$shared_defaults   = [
 			'status'             => '0',
 			'roles'              => array_combine( array_keys( $this->roles ), array_keys( $this->roles ) ),
-			'user_based_access'  => 'no',
 			'users'              => [],
 			'user_based_opt_out' => 'no',
 		];
@@ -228,12 +227,6 @@ public function sanitize_settings( array $settings ): array {
 			$new_settings['roles'] = $current_settings['roles'];
 		}
 
-		if ( empty( $settings['user_based_access'] ) || 1 !== (int) $settings['user_based_access'] ) {
-			$new_settings['user_based_access'] = 'no';
-		} else {
-			$new_settings['user_based_access'] = '1';
-		}
-
 		// Allowed users.
 		if ( isset( $settings['users'] ) && ! empty( $settings['users'] ) ) {
 			if ( is_array( $settings['users'] ) ) {
@@ -456,27 +449,6 @@ protected function add_access_control_fields() {
 			]
 		);
 
-		add_settings_field(
-			'user_based_access',
-			esc_html__( 'Enable user-based access', 'classifai' ),
-			[ $this, 'render_input' ],
-			$this->get_option_name(),
-			$this->get_option_name() . '_section',
-			[
-				'label_for'     => 'user_based_access',
-				'input_type'    => 'checkbox',
-				'default_value' => $settings['user_based_access'],
-				'description'   => __( 'Enables ability to select which users can access this feature.', 'classifai' ),
-				'class'         => 'classifai-user-based-access',
-			]
-		);
-
-		// Add hidden class if user-based access is disabled.
-		$users_class = 'allowed_users_row';
-		if ( ! isset( $settings['user_based_access'] ) || '1' !== $settings['user_based_access'] ) {
-			$users_class .= ' hidden';
-		}
-
 		add_settings_field(
 			'users',
 			esc_html__( 'Allowed users', 'classifai' ),
@@ -487,7 +459,7 @@ protected function add_access_control_fields() {
 				'label_for'     => 'users',
 				'default_value' => $settings['users'],
 				'description'   => __( 'Users who have access to this feature.', 'classifai' ),
-				'class'         => $users_class,
+				'class'         => 'allowed_users_row',
 			]
 		);
 
@@ -902,7 +874,6 @@ public function has_access(): bool {
 		$feature_roles = $settings['roles'] ?? [];
 		$feature_users = array_map( 'absint', $settings['users'] ?? [] );
 
-		$user_based_access_enabled  = isset( $settings['user_based_access'] ) && 1 === (int) $settings['user_based_access'];
 		$user_based_opt_out_enabled = isset( $settings['user_based_opt_out'] ) && 1 === (int) $settings['user_based_opt_out'];
 
 		/*
@@ -916,9 +887,9 @@ public function has_access(): bool {
 		$access = ( ! empty( $feature_roles ) && ! empty( array_intersect( $user_roles, $feature_roles ) ) );
 
 		/*
-		 * Checks if User-based access is enabled and user has access to the feature.
+		 * Checks if has access to the feature.
 		 */
-		if ( ! $access && $user_based_access_enabled ) {
+		if ( ! $access ) {
 			$access = ( ! empty( $feature_users ) && ! empty( in_array( $user_id, $feature_users, true ) ) );
 		}
 
@@ -1130,7 +1101,6 @@ function ( $role ) {
 			__( 'Authenticated', 'classifai' )          => self::get_debug_value_text( $this->is_configured() ),
 			__( 'Status', 'classifai' )                 => self::get_debug_value_text( $feature_settings['status'], 1 ),
 			__( 'Allowed roles (titles)', 'classifai' ) => implode( ', ', $roles ?? [] ),
-			__( 'User-based access', 'classifai' )      => self::get_debug_value_text( $feature_settings['user_based_access'], 1 ),
 			__( 'Allowed users (titles)', 'classifai' ) => implode( ', ', $feature_settings['users'] ?? [] ),
 			__( 'User based opt-out', 'classifai' )     => self::get_debug_value_text( $feature_settings['user_based_opt_out'], 1 ),
 			__( 'Provider', 'classifai' )               => $feature_settings['provider'],

src/js/admin.js

@@ -78,60 +78,6 @@ document.addEventListener( 'DOMContentLoaded', function () {
 	} );
 } )();
 
-// Role and user based access.
-document.addEventListener( 'DOMContentLoaded', function () {
-	function toogleAllowedRolesRow( e ) {
-		const checkbox = e.target;
-		const parentTr = checkbox.closest( 'tr.classifai-role-based-access' );
-		const allowedRoles = parentTr.nextElementSibling.classList.contains(
-			'allowed_roles_row'
-		)
-			? parentTr.nextElementSibling
-			: null;
-		if ( checkbox.checked ) {
-			allowedRoles.classList.remove( 'hidden' );
-		} else {
-			allowedRoles.classList.add( 'hidden' );
-		}
-	}
-
-	function toogleAllowedUsersRow( e ) {
-		const checkbox = e.target;
-		const parentTr = checkbox.closest( 'tr.classifai-user-based-access' );
-		const allowedUsers = parentTr.nextElementSibling.classList.contains(
-			'allowed_users_row'
-		)
-			? parentTr.nextElementSibling
-			: null;
-		if ( checkbox.checked ) {
-			allowedUsers.classList.remove( 'hidden' );
-		} else {
-			allowedUsers.classList.add( 'hidden' );
-		}
-	}
-
-	const roleBasedAccessCheckBoxes = document.querySelectorAll(
-		'tr.classifai-role-based-access input[type="checkbox"]'
-	);
-	const userBasedAccessCheckBoxes = document.querySelectorAll(
-		'tr.classifai-user-based-access input[type="checkbox"]'
-	);
-
-	if ( roleBasedAccessCheckBoxes ) {
-		roleBasedAccessCheckBoxes.forEach( function ( e ) {
-			e.addEventListener( 'change', toogleAllowedRolesRow );
-			e.dispatchEvent( new Event( 'change' ) );
-		} );
-	}
-
-	if ( userBasedAccessCheckBoxes ) {
-		userBasedAccessCheckBoxes.forEach( function ( e ) {
-			e.addEventListener( 'change', toogleAllowedUsersRow );
-			e.dispatchEvent( new Event( 'change' ) );
-		} );
-	}
-} );
-
 // User Selector.
 ( () => {
 	const userSearches = document.querySelectorAll(

tests/Classifai/Providers/Azure/ComputerVisionTest.php

@@ -73,7 +73,6 @@ public function test_no_computer_vision_option_set() {
 			[
 				'status' => '0',
 				'roles' => [],
-				'user_based_access' => 'no',
 				'users' => [],
 				'user_based_opt_out' => 'no',
 				'descriptive_text_fields' => [