WordPress
diff --git a/‎backport-changelog/7.0/11080.md‎
Lines changed: 3 additions & 0 deletions b/‎backport-changelog/7.0/11080.md‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎lib/experimental/connectors/default-connectors.php‎
Lines changed: 197 additions & 47 deletions b/‎lib/experimental/connectors/default-connectors.php‎
Lines changed: 197 additions & 47 deletions
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/11080
+
+* https://github.com/WordPress/gutenberg/pull/76014
@@ -30,7 +30,7 @@ function _gutenberg_mask_api_key( string $key ): string {
  * @param string $provider_id The WP AI client provider ID.
  * @return bool|null True if valid, false if invalid, null if unable to determine.
  */
-function _gutenberg_is_api_key_valid( string $key, string $provider_id ): ?bool {
+function _gutenberg_is_ai_api_key_valid( string $key, string $provider_id ): ?bool {
 	try {
 		$registry = \WordPress\AiClient\AiClient::defaultRegistry();
 
@@ -78,55 +78,126 @@ function _gutenberg_get_real_api_key( string $option_name, callable $mask_callba
 }
 
 /**
- * Gets the registered connector provider settings.
+ * Gets the registered connector settings.
  *
  * @access private
  *
- * @return array<string, array{provider: string, label: string, description: string, mask: callable, sanitize: callable}> Provider settings keyed by setting name.
+ * @return array {
+ *     Connector settings keyed by connector ID.
+ *
+ *     @type array ...$0 {
+ *         Data for a single connector.
+ *
+ *         @type string $name           The connector's display name.
+ *         @type string $description    The connector's description.
+ *         @type string $type           The connector type. Currently, only 'ai_provider' is supported.
+ *         @type array  $plugin         Optional. Plugin data for install/activate UI.
+ *             @type string $slug       The WordPress.org plugin slug.
+ *         }
+ *         @type array  $authentication {
+ *             Authentication configuration. When method is 'api_key', includes
+ *             credentials_url and setting_name. When 'none', only method is present.
+ *
+ *             @type string      $method          The authentication method: 'api_key' or 'none'.
+ *             @type string|null $credentials_url Optional. URL where users can obtain API credentials.
+ *             @type string      $setting_name    Optional. The setting name for the API key.
+ *         }
+ *     }
+ * }
  */
-function _gutenberg_get_provider_settings(): array {
-	$providers = array(
+function _gutenberg_get_connector_settings(): array {
+	$connectors = array(
 		'google'    => array(
-			'name' => 'Google',
+			'name'           => 'Google',
+			'description'    => __( 'Text and image generation with Gemini and Imagen.', 'gutenberg' ),
+			'type'           => 'ai_provider',
+			'plugin'         => array(
+				'slug' => 'ai-provider-for-google',
+			),
+			'authentication' => array(
+				'method'          => 'api_key',
+				'credentials_url' => 'https://aistudio.google.com/api-keys',
+			),
 		),
 		'openai'    => array(
-			'name' => 'OpenAI',
+			'name'           => 'OpenAI',
+			'description'    => __( 'Text and image generation with GPT and Dall-E.', 'gutenberg' ),
+			'type'           => 'ai_provider',
+			'plugin'         => array(
+				'slug' => 'ai-provider-for-openai',
+			),
+			'authentication' => array(
+				'method'          => 'api_key',
+				'credentials_url' => 'https://platform.openai.com/api-keys',
+			),
 		),
 		'anthropic' => array(
-			'name' => 'Anthropic',
+			'name'           => 'Anthropic',
+			'description'    => __( 'Text generation with Claude.', 'gutenberg' ),
+			'type'           => 'ai_provider',
+			'plugin'         => array(
+				'slug' => 'ai-provider-for-anthropic',
+			),
+			'authentication' => array(
+				'method'          => 'api_key',
+				'credentials_url' => 'https://platform.claude.com/settings/keys',
+			),
 		),
 	);
 
-	$provider_settings = array();
-	foreach ( $providers as $provider => $data ) {
-		$setting_name = "connectors_ai_{$provider}_api_key";
+	$registry = \WordPress\AiClient\AiClient::defaultRegistry();
 
-		$provider_settings[ $setting_name ] = array(
-			'provider'    => $provider,
-			'label'       => sprintf(
-				/* translators: %s: AI provider name. */
-				__( '%s API Key', 'gutenberg' ),
-				$data['name']
-			),
-			'description' => sprintf(
-				/* translators: %s: AI provider name. */
-				__( 'API key for the %s AI provider.', 'gutenberg' ),
-				$data['name']
-			),
-			'mask'        => '_gutenberg_mask_api_key',
-			'sanitize'    => static function ( string $value ) use ( $provider ): string {
-				$value = sanitize_text_field( $value );
-				if ( '' === $value ) {
-					return $value;
-				}
-
-				$valid = _gutenberg_is_api_key_valid( $value, $provider );
-				return true === $valid ? $value : '';
-			},
-		);
+	foreach ( $registry->getRegisteredProviderIds() as $connector_id ) {
+		$provider_class = $registry->getProviderClassName( $connector_id );
+		$metadata       = $provider_class::metadata();
+
+		$auth_method = $metadata->getAuthenticationMethod();
+		$is_api_key  = null !== $auth_method && $auth_method->isApiKey();
+
+		if ( $is_api_key ) {
+			$credentials_url = $metadata->getCredentialsUrl();
+			$authentication  = array(
+				'method'          => 'api_key',
+				'credentials_url' => $credentials_url ? $credentials_url : null,
+			);
+		} else {
+			$authentication = array( 'method' => 'none' );
+		}
+
+		$name        = $metadata->getName();
+		$description = method_exists( $metadata, 'getDescription' ) ? $metadata->getDescription() : null;
+
+		if ( isset( $connectors[ $connector_id ] ) ) {
+			// Override fields with non-empty registry values.
+			if ( $name ) {
+				$connectors[ $connector_id ]['name'] = $name;
+			}
+			if ( $description ) {
+				$connectors[ $connector_id ]['description'] = $description;
+			}
+			// Always update auth method; keep existing credentials_url as fallback.
+			$connectors[ $connector_id ]['authentication']['method'] = $authentication['method'];
+			if ( ! empty( $authentication['credentials_url'] ) ) {
+				$connectors[ $connector_id ]['authentication']['credentials_url'] = $authentication['credentials_url'];
+			}
+		} else {
+			$connectors[ $connector_id ] = array(
+				'name'           => $name ? $name : ucwords( $connector_id ),
+				'description'    => $description ? $description : '',
+				'type'           => 'ai_provider',
+				'authentication' => $authentication,
+			);
+		}
 	}
 
-	return $provider_settings;
+	// Add setting_name for connectors that use API key authentication.
+	foreach ( $connectors as $connector_id => $connector ) {
+		if ( 'api_key' === $connector['authentication']['method'] ) {
+			$connectors[ $connector_id ]['authentication']['setting_name'] = "connectors_ai_{$connector_id}_api_key";
+		}
+	}
+
+	return $connectors;
 }
 
 /**
@@ -169,17 +240,23 @@ function _gutenberg_validate_connector_keys_in_rest( WP_REST_Response $response,
 		return $response;
 	}
 
-	foreach ( _gutenberg_get_provider_settings() as $setting_name => $config ) {
+	foreach ( _gutenberg_get_connector_settings() as $connector_id => $connector_data ) {
+		$auth = $connector_data['authentication'];
+		if ( 'ai_provider' !== $connector_data['type'] || 'api_key' !== $auth['method'] || empty( $auth['setting_name'] ) ) {
+			continue;
+		}
+
+		$setting_name = $auth['setting_name'];
 		if ( ! in_array( $setting_name, $requested, true ) ) {
 			continue;
 		}
 
-		$real_key = _gutenberg_get_real_api_key( $setting_name, $config['mask'] );
+		$real_key = _gutenberg_get_real_api_key( $setting_name, '_gutenberg_mask_api_key' );
 		if ( '' === $real_key ) {
 			continue;
 		}
 
-		if ( true !== _gutenberg_is_api_key_valid( $real_key, $config['provider'] ) ) {
+		if ( true !== _gutenberg_is_ai_api_key_valid( $real_key, $connector_id ) ) {
 			$data[ $setting_name ] = 'invalid_key';
 		}
 	}
@@ -200,20 +277,42 @@ function _gutenberg_register_default_connector_settings(): void {
 		return;
 	}
 
-	foreach ( _gutenberg_get_provider_settings() as $setting_name => $config ) {
+	foreach ( _gutenberg_get_connector_settings() as $connector_id => $connector_data ) {
+		$auth = $connector_data['authentication'];
+		if ( 'api_key' !== $auth['method'] || empty( $auth['setting_name'] ) ) {
+			continue;
+		}
+
+		$setting_name = $auth['setting_name'];
 		register_setting(
 			'connectors',
 			$setting_name,
 			array(
 				'type'              => 'string',
-				'label'             => $config['label'],
-				'description'       => $config['description'],
+				'label'             => sprintf(
+					/* translators: %s: AI provider name. */
+					__( '%s API Key', 'gutenberg' ),
+					$connector_data['name']
+				),
+				'description'       => sprintf(
+					/* translators: %s: AI provider name. */
+					__( 'API key for the %s AI provider.', 'gutenberg' ),
+					$connector_data['name']
+				),
 				'default'           => '',
 				'show_in_rest'      => true,
-				'sanitize_callback' => $config['sanitize'],
+				'sanitize_callback' => static function ( string $value ) use ( $connector_id ): string {
+					$value = sanitize_text_field( $value );
+					if ( '' === $value ) {
+						return $value;
+					}
+
+					$valid = _gutenberg_is_ai_api_key_valid( $value, $connector_id );
+					return true === $valid ? $value : '';
+				},
 			)
 		);
-		add_filter( "option_{$setting_name}", $config['mask'] );
+		add_filter( "option_{$setting_name}", '_gutenberg_mask_api_key' );
 	}
 }
 remove_action( 'init', '_wp_register_default_connector_settings' );
@@ -231,14 +330,23 @@ function _gutenberg_pass_default_connector_keys_to_ai_client(): void {
 
 	try {
 		$registry = \WordPress\AiClient\AiClient::defaultRegistry();
-		foreach ( _gutenberg_get_provider_settings() as $setting_name => $config ) {
-			$api_key = _gutenberg_get_real_api_key( $setting_name, $config['mask'] );
-			if ( '' === $api_key || ! $registry->hasProvider( $config['provider'] ) ) {
+		foreach ( _gutenberg_get_connector_settings() as $connector_id => $connector_data ) {
+			if ( 'ai_provider' !== $connector_data['type'] ) {
+				continue;
+			}
+
+			$auth = $connector_data['authentication'];
+			if ( 'api_key' !== $auth['method'] || empty( $auth['setting_name'] ) ) {
+				continue;
+			}
+
+			$api_key = _gutenberg_get_real_api_key( $auth['setting_name'], '_gutenberg_mask_api_key' );
+			if ( '' === $api_key || ! $registry->hasProvider( $connector_id ) ) {
 				continue;
 			}
 
 			$registry->setProviderRequestAuthentication(
-				$config['provider'],
+				$connector_id,
 				new \WordPress\AiClient\Providers\Http\DTO\ApiKeyRequestAuthentication( $api_key )
 			);
 		}
@@ -248,3 +356,45 @@ function _gutenberg_pass_default_connector_keys_to_ai_client(): void {
 }
 remove_action( 'init', '_wp_connectors_pass_default_keys_to_ai_client' );
 add_action( 'init', '_gutenberg_pass_default_connector_keys_to_ai_client' );
+
+/**
+ * Exposes connector settings to the connectors-wp-admin script module.
+ *
+ * @access private
+ *
+ * @param array $data Existing script module data.
+ * @return array Script module data with connectors added.
+ */
+function _gutenberg_get_connector_script_module_data( array $data ): array {
+	if ( ! class_exists( '\WordPress\AiClient\AiClient' ) ) {
+		return $data;
+	}
+
+	$connectors = array();
+	foreach ( _gutenberg_get_connector_settings() as $connector_id => $connector_data ) {
+		$auth     = $connector_data['authentication'];
+		$auth_out = array( 'method' => $auth['method'] );
+
+		if ( 'api_key' === $auth['method'] ) {
+			$auth_out['settingName']    = $auth['setting_name'] ?? '';
+			$auth_out['credentialsUrl'] = $auth['credentials_url'] ?? null;
+		}
+
+		$connector_out = array(
+			'name'           => $connector_data['name'],
+			'description'    => $connector_data['description'],
+			'type'           => $connector_data['type'],
+			'authentication' => $auth_out,
+		);
+
+		if ( ! empty( $connector_data['plugin'] ) ) {
+			$connector_out['plugin'] = $connector_data['plugin'];
+		}
+
+		$connectors[ $connector_id ] = $connector_out;
+	}
+	$data['connectors'] = $connectors;
+	return $data;
+}
+remove_filter( 'script_module_data_connectors-wp-admin', '_wp_connectors_get_connector_script_module_data' );
+add_filter( 'script_module_data_connectors-wp-admin', '_gutenberg_get_connector_script_module_data' );
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+https://github.com/WordPress/wordpress-develop/pull/11080`
	`2`	`+`
	`3`	`+* https://github.com/WordPress/gutenberg/pull/76014`