Changeset 9365

Timestamp:

12/19/2019 08:21:26 AM (7 years ago)

Author:

dd32

Message:

Trac: Github PRs: Properly craft the Github API request when a POST request is used, and ensure that we set the headers correctly.

See #4903.

File:

• sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/functions.php (modified) (4 diffs)

sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/functions.php

@@ -39 +39 @@
 
 /**
+ * Find a WordPress.org user by a Github login.
+ */
+function find_wporg_user_by_github( $github_user ) {
+        global $wpdb;
+
+        return $wpdb->get_var( $wpdb->prepare(
+                "SELECT u.user_login
+                        FROM {$wpdb->base_prefix}github_users g
+                                JOIN {$wpdb->users} u ON g.user_id = u.ID
+                        WHERE g.github_user = %s",
+                $github_user
+        ) );
+}
+
+/**
  * A simple wrapper to make a Github API request..
  */
@@ -47 +62 @@
         }
 
-        $context = stream_context_create( $c = [ 'http' => [
+        $context = stream_context_create( [ 'http' => [
                 'method'        => $method ?: ( is_null( $args ) ? 'GET' : 'POST' ),
                 'user_agent'    => 'WordPress.org Trac; trac.WordPress.org',
@@ -53 +68 @@
                 'timeout'       => 5,
                 'ignore_errors' => true,
-                'headers'       => array_merge(
+                'header'        => array_merge(
                         [
-                                'Accept'        => 'application/json',
-                                'Authorization' => get_authorization_token(),
+                                'Accept: application/json',
+                                'Authorization: ' . get_authorization_token(),
                         ],
                         $headers
                 ),
-                'body'          => $args ?: null,
+                'content'       => $args ?: null,
         ] ] );
 
@@ -75 +90 @@
 function get_authorization_token() {
         global $wpdb;
-        
+
         // TODO: This needs to be switched to a Github App token.
         // This works temporarily to avoid the low unauthenticated limits.