fix: sync role caps via activation and migration

Author: Fellan-91

classes/class-blocks.php

@@ -79,9 +79,6 @@ public function __construct() {
 		// https://github.com/nk-crew/lazy-blocks/issues/247 .
 		add_filter( 'allowed_block_types_all', array( $this, 'allowed_block_types_all' ), 100, 2 );
 
-		// Custom post roles.
-		add_action( 'admin_init', array( $this, 'add_role_caps' ) );
-
 		// Additional elements in blocks list table.
 		add_filter( 'display_post_states', array( $this, 'display_post_states' ), 10, 2 );
 		add_filter( 'disable_months_dropdown', array( $this, 'disable_months_dropdown' ), 10, 2 );
@@ -296,32 +293,67 @@ public function allowed_block_types_all( $allowed_block_types, $editor_context )
 	}
 
 	/**
-	 * Add Roles
+	 * Get the Lazy Blocks role capability matrix.
+	 *
+	 * @return array
 	 */
-	public function add_role_caps() {
-		global $wp_roles;
-
-		if ( isset( $wp_roles ) ) {
-			$wp_roles->add_cap( 'administrator', 'edit_lazyblock' );
-			$wp_roles->add_cap( 'administrator', 'edit_lazyblocks' );
-			$wp_roles->add_cap( 'administrator', 'edit_other_lazyblocks' );
-			$wp_roles->add_cap( 'administrator', 'publish_lazyblocks' );
-			$wp_roles->add_cap( 'administrator', 'read_lazyblock' );
-			$wp_roles->add_cap( 'administrator', 'read_private_lazyblocks' );
-			$wp_roles->add_cap( 'administrator', 'delete_lazyblocks' );
-			$wp_roles->add_cap( 'administrator', 'delete_lazyblock' );
+	public function get_role_caps_matrix() {
+		return array(
+			'administrator' => array(
+				'edit_lazyblock',
+				'edit_lazyblocks',
+				'edit_other_lazyblocks',
+				'publish_lazyblocks',
+				'read_lazyblock',
+				'read_private_lazyblocks',
+				'delete_lazyblocks',
+				'delete_lazyblock',
+			),
+			'editor'        => array(
+				'read_lazyblock',
+				'read_private_lazyblocks',
+			),
+			'author'        => array(
+				'read_lazyblock',
+				'read_private_lazyblocks',
+			),
+			'contributor'   => array(
+				'read_lazyblock',
+				'read_private_lazyblocks',
+			),
+		);
+	}
 
-			$wp_roles->add_cap( 'editor', 'read_lazyblock' );
-			$wp_roles->add_cap( 'editor', 'read_private_lazyblocks' );
+	/**
+	 * Synchronize Lazy Blocks capabilities for built-in roles.
+	 *
+	 * @return void
+	 */
+	public function sync_role_caps() {
+		foreach ( $this->get_role_caps_matrix() as $role_name => $caps ) {
+			$role = get_role( $role_name );
 
-			$wp_roles->add_cap( 'author', 'read_lazyblock' );
-			$wp_roles->add_cap( 'author', 'read_private_lazyblocks' );
+			if ( ! $role ) {
+				continue;
+			}
 
-			$wp_roles->add_cap( 'contributor', 'read_lazyblock' );
-			$wp_roles->add_cap( 'contributor', 'read_private_lazyblocks' );
+			foreach ( $caps as $capability ) {
+				$role->add_cap( $capability );
+			}
 		}
 	}
 
+	/**
+	 * Add Roles
+	 *
+	 * @deprecated Use sync_role_caps().
+	 *
+	 * @return void
+	 */
+	public function add_role_caps() {
+		$this->sync_role_caps();
+	}
+
 	/**
 	 * Disable month dropdown.
 	 *

classes/class-migration.php

@@ -57,6 +57,10 @@ public function init() {
 	 */
 	public function get_migrations() {
 		return array(
+			array(
+				'version' => '4.3.0',
+				'cb'      => array( $this, 'v_4_3_0_sync_role_caps' ),
+			),
 			array(
 				'version' => '2.5.0',
 				'cb'      => array( $this, 'v_2_5_0' ),
@@ -68,6 +72,17 @@ public function get_migrations() {
 		);
 	}
 
+	/**
+	 * Synchronize Lazy Blocks capabilities during the 4.3.0 upgrade path.
+	 *
+	 * @return void
+	 */
+	public function v_4_3_0_sync_role_caps() {
+		if ( function_exists( 'lazyblocks' ) && lazyblocks()->blocks() ) {
+			lazyblocks()->blocks()->sync_role_caps();
+		}
+	}
+
 	/**
 	 * Convert old templates to new one.
 	 */

lazy-blocks.php

@@ -119,6 +119,10 @@ public function __construct() {
 		 * Activation Hook
 		 */
 		public function activation_hook() {
+			if ( $this->blocks ) {
+				$this->blocks->sync_role_caps();
+			}
+
 			LazyBlocks_Dummy::add();
 		}
 

tests/phpunit/CapabilitySyncTest.php

@@ -195,4 +195,15 @@ public function test_migration_syncs_role_caps_for_fresh_installs() {
 		$this->assert_lazyblocks_capability_matrix_applied();
 		$this->assertSame( LAZY_BLOCKS_VERSION, get_option( 'lzb_db_version' ) );
 	}
+
+	/**
+	 * Fresh installs should receive capabilities during plugin activation.
+	 */
+	public function test_activation_hook_syncs_role_caps_for_fresh_installs() {
+		$this->remove_lazyblocks_capabilities();
+
+		lazyblocks()->activation_hook();
+
+		$this->assert_lazyblocks_capability_matrix_applied();
+	}
 }