',
- 'after_section' => '
' . sprintf(
+ 'after_section' => $this->render_invalid_api_keys_message() . '
' . sprintf(
// Translators: %s is the link to the Internet account setup.
__( "To get your API key and secret, please visit the Internet Archive and create a new 'S3 access key' (this is a type of credential used by Archive.org).", 'wpcomsp_wayback_link_fixer' ),
esc_url( 'https://archive.org/account/s3.php' )
@@ -460,7 +461,10 @@ function () {
__( 'Archive.org Access Key', 'wpcomsp_wayback_link_fixer' ),
array( $this, 'render_archive_api_access_key' ),
self::PAGE_SLUG,
- self::GROUP_IA_SETTINGS
+ self::GROUP_IA_SETTINGS,
+ array(
+ 'class' => Settings::has_valid_archive_api_credentials() ? '' : 'wlf_toggle_setting__invalid_api_keys',
+ )
);
add_settings_field(
@@ -468,7 +472,10 @@ function () {
__( 'Archive.org Secret Key', 'wpcomsp_wayback_link_fixer' ),
array( $this, 'render_archive_api_secret_key' ),
self::PAGE_SLUG,
- self::GROUP_IA_SETTINGS
+ self::GROUP_IA_SETTINGS,
+ array(
+ 'class' => Settings::has_valid_archive_api_credentials() ? '' : 'wlf_toggle_setting__invalid_api_keys',
+ )
);
add_settings_field(
@@ -507,6 +514,46 @@ function () {
);
}
+ /**
+ * Renders the invalid API Keys message.
+ *
+ * @since 1.3.0
+ *
+ * @return string
+ */
+ public function render_invalid_api_keys_message(): string {
+ if ( ! Settings::has_valid_archive_api_credentials() ) {
+ return '
' . esc_html__( 'The Archive.org API keys are invalid. Please check your settings.', 'wpcomsp_wayback_link_fixer' ) . '
';
+ }
+
+ return '';
+ }
+
+ /**
+ * Validate the Archive.org keys.
+ *
+ * @since 1.3.0
+ *
+ * @return void
+ */
+ public function validate_archive_org_keys(): void {
+ // If we are on this page.
+ if ( ! isset( $_GET['page'] ) || self::PAGE_SLUG !== $_GET['page'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended, we are only reading, not using
+ return;
+ }
+
+ // If the settings were updated.
+ if ( isset( $_GET['settings-updated'] ) && 'true' === $_GET['settings-updated'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended, we are only reading, not using
+ $key = Settings::get_archive_secret_key();
+ $access_key = Settings::get_archive_access_key();
+
+ $system_client = wpcomsp_wayback_link_fixer_get_system_client();
+ $is_valid = $system_client->is_valid_user( $access_key, $key );
+
+ Settings::update_archive_api_credentials_validity( $is_valid );
+ }
+ }
+
/**
* Render the process links field.
*
diff --git a/src/Wayback_Machine/HTTP_Client/HTTP_Snapshot_Client.php b/src/Wayback_Machine/HTTP_Client/HTTP_Snapshot_Client.php
index 64ae52b1..130bed03 100644
--- a/src/Wayback_Machine/HTTP_Client/HTTP_Snapshot_Client.php
+++ b/src/Wayback_Machine/HTTP_Client/HTTP_Snapshot_Client.php
@@ -66,7 +66,7 @@ private function get_headers(): array {
$headers = array();
// Add the auth header if set.
- if ( Settings::is_archive_api_configured() ) {
+ if ( Settings::is_archive_api_configured() && Settings::has_valid_archive_api_credentials() ) {
$headers['Authorization'] = sprintf( 'LOW %s:%s', Settings::get_archive_access_key(), Settings::get_archive_secret_key() );
}
diff --git a/src/Wayback_Machine/HTTP_Client/HTTP_System_Client.php b/src/Wayback_Machine/HTTP_Client/HTTP_System_Client.php
new file mode 100644
index 00000000..228f0676
--- /dev/null
+++ b/src/Wayback_Machine/HTTP_Client/HTTP_System_Client.php
@@ -0,0 +1,121 @@
+get_user_stats( $access_key, $secret_key );
+ } catch ( Throwable $e ) {
+ return false;
+ }
+
+ return is_array( $stats );
+ }
+
+ /**
+ * Get a user's account stats.
+ *
+ * @since 1.3.0
+ *
+ * @param string $access_key The access key to check.
+ * @param string $secret_key The secret key to check.
+ *
+ * @return array{available:int, daily_captures:int, daily_captures_limit:int, processing:int}|null
+ * @throws Service_Offline_Exception If the service is offline.
+ * @throws Invalid_Response_Exception If the response is invalid.
+ */
+ public function get_user_stats( string $access_key, string $secret_key ): ?array {
+
+ // Compile the headers.
+ $headers = array();
+ $headers['Authorization'] = sprintf(
+ 'LOW %s:%s',
+ sanitize_text_field( $access_key ),
+ sanitize_text_field( $secret_key )
+ );
+ $headers['Accept'] = 'application/json';
+
+ $url = 'http://web.archive.org/save/status/user?_t=' . time();
+
+ try {
+ $response = wp_remote_get( $url, array( 'headers' => $headers ) );
+ } catch ( \Exception $e ) {
+ throw Invalid_Response_Exception::create( esc_html( $e->getMessage() ) );
+ }
+ if ( is_wp_error( $response ) ) {
+ throw Invalid_Response_Exception::create( esc_html( $response->get_error_message() ) );
+ }
+
+ // If we dont have a 200 response, return null.
+ if ( ! isset( $response['response']['code'] ) || 200 !== (int) $response['response']['code'] ) {
+ return null;
+ }
+
+ $body = wp_remote_retrieve_body( $response );
+
+ // If we dont have a valid body, return null.
+ if ( ! is_string( $body ) ) {
+ return null;
+ }
+ // Decode the body.
+ $body = json_decode( $body, true );
+
+ // If we dont have a valid body, return null.
+ if ( ! is_array( $body ) ) {
+ return null;
+ }
+
+ return array(
+ 'available' => isset( $body['available'] ) ? (int) $body['available'] : 0,
+ 'daily_captures' => isset( $body['daily_captures'] ) ? (int) $body['daily_captures'] : 0,
+ 'daily_captures_limit' => isset( $body['daily_captures_limit'] ) ? (int) $body['daily_captures_limit'] : 0,
+ 'processing' => isset( $body['processing'] ) ? (int) $body['processing'] : 0,
+ );
+ }
+}
diff --git a/src/Wayback_Machine/System_Client.php b/src/Wayback_Machine/System_Client.php
new file mode 100644
index 00000000..54590a29
--- /dev/null
+++ b/src/Wayback_Machine/System_Client.php
@@ -0,0 +1,55 @@
+snapshot_client = wpcomsp_wayback_link_fixer_get_snapshot_client();
$this->link_checker_client = wpcomsp_wayback_link_fixer_get_link_checker_client();
+ $this->system_client = wpcomsp_wayback_link_fixer_get_system_client();
}
/**
@@ -159,4 +169,40 @@ public function is_online(): array {
'link_checker' => $this->link_checker_client->is_online(),
);
}
+
+ /**
+ * Check a users account details.
+ *
+ * @since 1.3.0
+ *
+ * @param string $access_key The access key to check.
+ * @param string $secret_key The secret key to check.
+ *
+ * @return boolean
+ */
+ public function is_valid_user( string $access_key, string $secret_key ): bool {
+ try {
+ return $this->system_client->is_valid_user( $access_key, $secret_key );
+ } catch ( Throwable $e ) {
+ return false; // If the service is offline, we cannot validate the user.
+ }
+ }
+
+ /**
+ * Get a users account stats.
+ *
+ * @since 1.3.0
+ *
+ * @param string $access_key The access key to check.
+ * @param string $secret_key The secret key to check.
+ *
+ * @return array{available:int, daily_captures:int, daily_captures_limit:int, processing:int}|null
+ */
+ public function get_user_stats( string $access_key, string $secret_key ): ?array {
+ try {
+ return $this->system_client->get_user_stats( $access_key, $secret_key );
+ } catch ( Throwable $e ) {
+ return null; // If the service is offline or the response is invalid.
+ }
+ }
}
diff --git a/templates/admin/wizard/step-1.php b/templates/admin/wizard/step-1.php
index ed6d63f3..29a12e35 100644
--- a/templates/admin/wizard/step-1.php
+++ b/templates/admin/wizard/step-1.php
@@ -13,8 +13,17 @@
*/
// Sets the type for api keys based on the current environment.
-$wlf_access_type = '' === $settings->get_archive_access_key() ? 'text' : 'password';
-$wlf_secret_type = '' === $settings->get_archive_secret_key() ? 'text' : 'password';
+$wlf_invalid_keys = isset( $_POST['wlf_wizard_invalid_keys'] ); // phpcs:ignore
+$wlf_access_type = '' === $settings->get_archive_access_key() || $wlf_invalid_keys
+ ? 'text'
+ : 'password';
+$wlf_secret_type = '' === $settings->get_archive_secret_key() || $wlf_invalid_keys
+ ? 'text'
+ : 'password';
+
+// Get any temp values from the POST request.
+$wlf_existing_access_key = isset( $_POST['wlf_wizard_archive_access_key_temp'] ) ? sanitize_text_field( wp_unslash( $_POST['wlf_wizard_archive_access_key_temp'] ) ) : $settings->get_archive_access_key(); // phpcs:ignore
+$wlf_existing_secret_key = isset( $_POST['wlf_wizard_archive_secret_key_temp'] ) ? sanitize_text_field( wp_unslash( $_POST['wlf_wizard_archive_secret_key_temp'] ) ) : $settings->get_archive_secret_key(); // phpcs:ignore
?>
@@ -24,7 +33,7 @@