Only hide key option if not in the env

Automattic · Aug 30, 2024 · 9d995d0 · 9d995d0
1 parent 5cb0799
commit 9d995d0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/plugin/admin/init.php b/plugin/admin/init.php
@@ -93,7 +93,7 @@ function wpcloud_settings_init(): void {
 	);
 
 	// Only show the API key field if it's not set in the environment.
-	if ( ! wpcloud_get_api_key() ) {
+	if ( ! wpcloud_get_api_key_from_env() ) {
 		add_settings_field(
 			'wpcloud_field_api_key',
 			__( 'API Key', 'wpcloud' ),

diff --git a/plugin/includes/class-wpcloud-cli.php b/plugin/includes/class-wpcloud-cli.php
@@ -712,7 +712,7 @@ public function set( $args ) {
 		$options = get_option( 'wpcloud_settings' );
 
 		// Only allow changing the API key if it's not set in the environment.
-		if ( ! wpcloud_get_api_key() ) {
+		if ( ! wpcloud_get_api_key_from_env() ) {
 			if ( 'api_key' === $key && isset( $options['wpcloud_api_key'] ) ) {
 				WP_CLI::confirm( 'Are you sure you want to change the API key?' );
 			}

diff --git a/plugin/includes/wpcloud-client.php b/plugin/includes/wpcloud-client.php
@@ -31,7 +31,12 @@ function wpcloud_get_client_name(): mixed {
  * @return string|null Client API Key on success. WP_Error on error.
  */
 function wpcloud_get_client_api_key(): mixed {
-	return wpcloud_get_api_key();
+	$api_key = wpcloud_get_api_key_from_env();
+	if ( $api_key ) {
+		return $api_key;
+	}
+	$settings = get_option( 'wpcloud_settings', array() );
+	return $settings['wpcloud_api_key'] ?? null;
 }
 
 /**

diff --git a/plugin/init.php b/plugin/init.php
@@ -37,24 +37,16 @@ function (): void {
 }
 
 /**
- * Get the api key.
+ * Get the api key from the environment.
  */
-function wpcloud_get_api_key(): string {
-
-	// Try to find the key in the ENV or config.
+function wpcloud_get_api_key_from_env(): string {
 	$api_key = getenv( 'WP_CLOUD_API_KEY' );
 	if ( defined( 'WP_CLOUD_API_KEY' ) ) {
 		$api_key = WP_CLOUD_API_KEY;
 	}
 
 	$api_key = apply_filters( 'wpcloud_api_key', $api_key );
-
-	if ( $api_key ) {
-		return $api_key;
-	}
-	// Else check the local options.
-	$settings = get_option( 'wpcloud_settings', array() );
-	return $settings['wpcloud_api_key'] ?? '';
+	return $api_key ? $api_key : '';
 }
 
 /**