Fix token decoding during wp-env startup. (#220)

* Handle `false` return in decrypt_option()

* Return array from decrypt_option(), condtionally show admin error

* Move block registration to `init` action

* Add explicit arity and priority to integration init actions

* Use init action in Salesforce integration

---------

Co-authored-by: Max Schmeling <[email protected]>

inc/Integrations/Airtable/AirtableIntegration.php

@@ -6,6 +6,10 @@
 
 class AirtableIntegration {
 	public static function init(): void {
+		add_action( 'init', [ __CLASS__, 'register_blocks' ], 10, 0 );
+	}
+
+	public static function register_blocks(): void {
 		$data_source_configs = DataSourceCrud::get_configs_by_service( REMOTE_DATA_BLOCKS_AIRTABLE_SERVICE );
 
 		foreach ( $data_source_configs as $config ) {

inc/Integrations/SalesforceB2C/SalesforceB2CIntegration.php

@@ -9,6 +9,10 @@
 
 class SalesforceB2CIntegration {
 	public static function init(): void {
+		add_action( 'init', [ __CLASS__, 'register_blocks' ], 10, 0 );
+	}
+
+	public static function register_blocks(): void {
 		$data_source_configs = DataSourceCrud::get_configs_by_service( REMOTE_DATA_BLOCKS_SALESFORCE_B2C_SERVICE );
 
 		foreach ( $data_source_configs as $config ) {

inc/Integrations/Shopify/ShopifyIntegration.php

@@ -9,6 +9,10 @@
 
 class ShopifyIntegration {
 	public static function init(): void {
+		add_action( 'init', [ __CLASS__, 'register_blocks' ], 10, 0 );
+	}
+
+	public static function register_blocks(): void {
 		$data_source_configs = DataSourceCrud::get_configs_by_service( REMOTE_DATA_BLOCKS_SHOPIFY_SERVICE );
 
 		foreach ( $data_source_configs as $config ) {

inc/PluginSettings/PluginSettings.php

@@ -7,6 +7,7 @@
 use RemoteDataBlocks\WpdbStorage\DataSourceCrud;
 use function wp_get_environment_type;
 use function wp_is_development_mode;
+use function add_settings_error;
 
 defined( 'ABSPATH' ) || exit();
 
@@ -154,19 +155,36 @@ public static function encrypt_option( array $new_value, string|array|bool $old_
 		}
 	}
 
-	public static function decrypt_option( string $value ): array|null {
+	public static function decrypt_option( string $value ): array {
 		$decryptor = new \RemoteDataBlocks\WpdbStorage\DataEncryption();
+		$is_error = false;
 
 		try {
 			$decrypted = $decryptor->decrypt( $value );
-			return json_decode( $decrypted, true );
+
+			if ( false === $decrypted ) {
+				$is_error = true;
+			}
 		} catch ( \Exception $e ) {
+			$is_error = true;
+		}
+
+		if ( $is_error ) {
+			self::show_decryption_error();
+			return [];
+		} else {
+			return json_decode( $decrypted, true );
+		}
+	}
+
+	private static function show_decryption_error(): void {
+		// Check that we have add_settings_error() available. This can be unavailable during wp-env startup.
+		if ( is_admin() ) {
 			add_settings_error(
 				'remote_data_blocks_settings',
 				'decryption_error',
 				__( 'Error decrypting remote-data-blocks settings.', 'remote-data-blocks' )
 			);
-			return null;
 		}
 	}
 }