Changeset 12678

Timestamp:

06/28/2023 02:11:16 AM (15 months ago)

Author:

dd32

Message:

Make: GitHub Invite Tool: Allow specifying a GitHub user URL, and if the user is a member of the org already, just add them to the team(s).

See #7082.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-github-invite

Files:

• admin-post.php (modified) (2 diffs)
• admin.php (modified) (1 diff)
• api.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-github-invite/admin-post.php

@@ -21 +21 @@
     $team_ids = array_map( 'intval', $team_ids );
 
-    $updated = 'success';
-    $message = null;
-    $invite  = false;
+    $updated         = 'success';
+    $message         = null;
+    $invite          = false;
+    $github_username = false;
 
     if ( ! $team_ids ) {
         $updated = 'error';
         $message = 'No teams selected';
-    } elseif (
-        preg_match( '!^https://profiles.wordpress.org/(?<slug>[^/]+)!i', $input, $m ) ||
-        ! is_email( $input )
-    ) {
+    } elseif ( is_email( $input ) ) {
+        $invite = $input;
+    } elseif ( preg_match( '!^https://github.com/(?<slug>[^/]+)!i', $input, $m ) ) {
+        $gh_user         = api( '/users/' . $m['slug'] );
+        $github_username = $gh_user->login ?? false;
+        $invite          = $gh_user->id ?? 0;
+    } else {
+        preg_match( '!^https://profiles.wordpress.org/(?<slug>[^/]+)!i', $input, $m );
+
         $user           = get_user_by( 'slug', $m['slug'] ?? $input );
-        $github_details = json_decode( $wpdb->get_var( $wpdb->prepare(
-            'SELECT user_details FROM wporg_github_users WHERE user_id = %d',
+        $github_details = $wpdb->get_row( $wpdb->prepare(
+            'SELECT github_user, user_details FROM wporg_github_users WHERE user_id = %d',
             $user->ID
-        ) ) );
+        ) );
+        if ( $github_details ) {
+            $github_details->user_details = json_decode( $github_details->user_details );
+        }
 
-        if ( ! $user || ! $github_details ) {
+        if ( ! $user || ! $github_details || ! $github_details->user_details ) {
             $updated = 'no-github';
         } else {
-            $invite = $github_details->id;
+            $invite          = $github_details->user_details->id;
+            $github_username = $github_details->github_user;
         }
-    } elseif ( is_email( $input ) ) {
-        $invite = $input;
-    } else {
-        $updated = 'error';
     }
 
@@ -52 +58 @@
         $result = invite_member( $invite, $team_ids );
 
-        if ( $result->id ) {
-            // Note that it was invited via this site..
-            $invited_gh_users = get_option( 'invited_gh_users', [] );
-            $invited_gh_users[] = $result->id;
-            update_option( 'invited_gh_users', $invited_gh_users );
+        if (
+            is_wp_error( $result ) &&
+            $github_username &&
+            'Invitee is already a part of this org' === $result->get_error_data( 'api_error' )->errors[0]->message ?? ''
+        ) {
+            // Already a GitHub member, just add them to the team.
+            $result  = add_to_team( $github_username, $team_ids );
+            $message = 'User already a GitHub member, Added to team(s).';
+        }
 
-            delete_site_transient( 'gh_invites' );
+        if ( ! is_wp_error( $result ) ) {
+            if ( ! empty( $result->id ) ) {
+                // Note that it was invited via this site..
+                $invited_gh_users = get_option( 'invited_gh_users', [] );
+                $invited_gh_users[] = $result->id;
+                update_option( 'invited_gh_users', $invited_gh_users );
+
+                delete_site_transient( 'gh_invites' );
+            }
 
             // Log it to Slack.

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-github-invite/admin.php

@@ -80 +80 @@
         <table class="form-table">
             <tr>
-                <th scope="row"><label for="invite">GitHub Email, WordPress.org user slug, or WordPress.org Profile URL</label></th>
+                <th scope="row"><label for="invite">GitHub Email, GitHub URL, WordPress.org user slug, or WordPress.org Profile URL</label></th>
                 <td><input type="text" name="invite" id="invite" class="regular-text" placeholder="https://profiles.wordpress.org/<?php echo wp_get_current_user()->user_nicename; ?>/"></td>
             </tr>

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-github-invite/api.php

@@ -83 +83 @@
 
 /**
+ * Add an organisation member to a team.
+ *
+ * @param int|string $who      The GitHub user login.
+ * @param array      $team_ids The team IDs to add the user to.
+ */
+function add_to_team( $who, array $team_ids ) {
+    $error = new WP_Error;
+
+    foreach ( $team_ids as $team_id ) {
+        $response = api(
+            "/orgs/{ORG}/team/{$team_id}/memberships/{$who}",
+            false,
+            'PUT'
+        );
+
+        if ( is_wp_error( $response ) ) {
+            $error->merge_from( $response );
+        }
+    }
+
+    if ( $error->get_error_code() ) {
+        return $error;
+    }
+
+    return $response;
+}
+
+/**
  * Cancel an invitation by ID
  */
@@ -92 +120 @@
     );
 }
-
 
 /**