Changeset 11817 for sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/profiles.php

Timestamp:

05/04/2022 11:06:00 PM (3 years ago)

Author:

iandunn

Message:

Learn: Sync with git WordPress/learn@288a94e455e02062ee4d0e37fff0f2a8ccbfb079

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/profiles.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/profiles.php

@@ -5 +5 @@
 
 namespace WPOrg_Learn\Profiles;
-use WP_Error;
+use WordPressdotorg\Profiles as Profiles_API;
 
 defined( 'WPINC' ) || die();
@@ -18 +18 @@
 }
 
-const PROFILES_HANDLER_URL = 'https://profiles.wordpress.org/wp-admin/admin-ajax.php';
-
 add_action( 'sensei_course_status_updated', __NAMESPACE__ . '\add_course_completed_activity', 9, 3 ); // Before `redirect_to_course_completed_page()`.
-add_filter( 'pre_http_request', __NAMESPACE__ . '\redirect_sandbox_requests', 10, 3 );
 
 /**
  * Add an activity to a user's profile when they complete a course.
- *
- * @param string $status
- * @param int    $user_id
- * @param int    $course_id
  */
-function add_course_completed_activity( $status, $user_id, $course_id ) {
+function add_course_completed_activity( string $status, int $user_id, int $course_id ) : void {
     if ( 'complete' !== $status ) {
         return;
@@ -45 +38 @@
     );
 
-    request_profile_update( PROFILES_HANDLER_URL, $request_body );
+    Profiles_API\api( $request_body );
 }
-
-/**
- * Send Profiles request and handle errors.
- *
- * @param string $request_url
- * @param array  $body The value intended to be passed to `wp_remote_post()` as `$args['body']`.
- *
- * @return array|WP_Error The response from `wp_remote_post()`.
- */
-function request_profile_update( $request_url, $body ) {
-    $response = wp_remote_post( $request_url, array( 'body' => $body ) );
-
-    if ( is_wp_error( $response ) ) {
-        $error = $response->get_error_message();
-
-    } elseif ( 200 != wp_remote_retrieve_response_code( $response ) || 1 != (int) wp_remote_retrieve_body( $response ) ) {
-        $error = sprintf(
-            'Error %s %s',
-            $response['response']['code'],
-            $response['body']
-        );
-    }
-
-    if ( isset( $error ) ) {
-        trigger_error( wp_kses_post( $error ), E_USER_WARNING );
-    }
-
-    return $response;
-}
-
-/**
- * Send test requests to the current sandbox, instead of production.
- *
- * When making changes to code in this file, the request should go to the dev's sandbox so it can be debugged, and
- * so that changes to the Profiles code can be tested.
- *
- * @param false|array|WP_Error $preempt
- * @param array                $request_args
- * @param string               $request_url
- *
- * @return array|mixed|WP_Error
- */
-function redirect_sandbox_requests( $preempt, $request_args, $request_url ) {
-    if ( ! defined( 'WPORG_SANDBOXED' ) || ! WPORG_SANDBOXED ) {
-        return $preempt;
-    }
-
-    if ( PROFILES_HANDLER_URL !== $request_url ) {
-        return $preempt;
-    }
-
-    $path                            = wp_parse_url( $request_url, PHP_URL_PATH );
-    $request_args['headers']['Host'] = 'profiles.wordpress.org';
-
-    /*
-     * It's expected that the sandbox certificate won't be valid. This is safe because we're only connecting
-     * to `127.0.0.1`.
-     */
-    $request_args['sslverify'] = false;
-
-    return wp_remote_post( "https://127.0.0.1$path", $request_args );
-}