Changeset 15346

Timestamp:

10/15/2026 06:11:48 PM (9 days ago)

Author:

obenland

Message:

FreeScout: Ask administrators to disable users rather than delete them, and link usernames to WordPress.org

Closes ​https://github.com/WordPress/wordpress.org/pull/1045.

Location:

sites/trunk

Files:

• api.wordpress.org/public_html/dotorg/freescout/account.php (modified) (1 diff)
• api.wordpress.org/public_html/dotorg/freescout/common.php (modified) (1 diff)
• freescout.wordpress.net/Modules/WPOrgSSO/Http/Middleware/RequireWordPressOrgLogin.php (modified) (2 diffs)
• freescout.wordpress.net/Modules/WPOrgSSO/Public/js/users.js (modified) (2 diffs)
• freescout.wordpress.net/Modules/WPOrgSSO/README.md (modified) (1 diff)
• freescout.wordpress.net/Modules/WPOrgSSO/Resources/views/edit_user.blade.php (modified) (1 diff)
• freescout.wordpress.net/Modules/WPOrgSSO/module.json (modified) (1 diff)
• freescout.wordpress.net/Modules/WPOrgSSO/tests/UsersTest.php (modified) (1 diff)

sites/trunk/api.wordpress.org/public_html/dotorg/freescout/account.php

@@ -39 +39 @@
  * Whether an account has been blocked from logging in.
  *
- * Reports true when that can't be determined, so FreeScout refuses the login.
- *
  * @param \WP_User $user Account.
  * @return bool
  */
 function is_blocked( \WP_User $user ): bool {
-        global $nologin_accounts;
-
         if ( str_starts_with( $user->user_pass, 'BLOCKED' ) ) {
-                return true;
-        }
-
-        // Accounts wporg-sso refuses a login.
-        if ( ! empty( $nologin_accounts ) && in_array( $user->user_login, (array) $nologin_accounts, true ) ) {
                 return true;
         }

sites/trunk/api.wordpress.org/public_html/dotorg/freescout/common.php

@@ -19 +19 @@
  */
 function load_wordpress( string $wp_init_host = '' ): void {
-        // Set by the config this loads, and read by account.php; without this it would stay local to this function.
-        global $nologin_accounts;
-
         if ( ! $wp_init_host ) {
                 $wp_init_host = 'https://api.wordpress.org/';

sites/trunk/freescout.wordpress.net/Modules/WPOrgSSO/Http/Middleware/RequireWordPressOrgLogin.php

@@ -28 +28 @@
  * - Keeps what comes from WordPress.org, and passwords, out of the profile form.
  * - Deletes a mailbox only when its name was typed in to confirm, since users don't know a FreeScout password.
+ * - Refuses to delete users; they're disabled instead.
  */
 final class RequireWordPressOrgLogin {
@@ -169 +170 @@
                 }
 
+                if ( 'App\Http\Controllers\UsersController@ajax' === $action && 'delete_user' === $request->input( 'action' ) ) {
+                        // A 200, like core's own errors: the dialog only shows the message of those.
+                        return response()->json(
+                                array(
+                                        'status' => 'error',
+                                        'msg'    => __( 'Users can’t be deleted. Please disable them instead and remove their mailbox permissions.' ),
+                                )
+                        );
+                }
+
                 if ( 'App\Http\Controllers\MailboxesController@ajax' === $action && 'delete_mailbox' === $request->input( 'action' ) ) {
                         $error = self::check_mailbox_name( $request, $user );

sites/trunk/freescout.wordpress.net/Modules/WPOrgSSO/Public/js/users.js

@@ -3 +3 @@
  *
  * - "Create a New User" asks for a WordPress.org username; name and email come from the account.
- * - The profile doesn't offer to change what WordPress.org keeps up to date, or passwords.
+ * - The profile doesn't offer to change what WordPress.org keeps up to date, or passwords, or to delete the user.
  *
  * The server enforces all of this; these only keep the forms from offering it.
@@ -47 +47 @@
                         ).remove();
                 }
+
+                $( '#delete-user-trigger, #delete_user_modal' ).remove();
         } );
 

sites/trunk/freescout.wordpress.net/Modules/WPOrgSSO/README.md

@@ -6 +6 @@
 
 - **Logging in:** "Log in with WordPress.org" replaces the password form. The account needs two-factor authentication, and blocked accounts can't log in. Accounts are checked again every hour, so a blocked account loses its session too; if WordPress.org can't be reached, the session goes on until the next check.
-- **Users:** every FreeScout user is connected to a WordPress.org account. Administrators add users by WordPress.org username, and the name, email, and avatar come from that account. They're updated at every login, and can't be changed in FreeScout. If the WordPress.org email already belongs to another user or a mailbox, the old email stays and a warning is logged.
+- **Users:** every FreeScout user is connected to a WordPress.org account. Administrators add users by WordPress.org username, and the name, email, and avatar come from that account. They're updated at every login, and can't be changed in FreeScout. On their profile, the username links to their WordPress.org profile. If the WordPress.org email already belongs to another user or a mailbox, the old email stays and a warning is logged.
+- **Users who leave:** disable them; deleting users is refused. Disabling keeps their mailbox permissions, so remove those by hand.
 - **Existing users:** administrators connect them on their profile, or with `php artisan wporgsso:connect <email> <wporg-username>`.
 - **Passwords:** password logins (except break-glass), resets, and invites are closed. Users have no FreeScout password: new users get none, and logging in with WordPress.org clears the one they had. Only break-glass passwords stay.

sites/trunk/freescout.wordpress.net/Modules/WPOrgSSO/Resources/views/edit_user.blade.php

@@ -4 +4 @@
         <div class="col-sm-6">
                 @if ( $username )
-                        <p class="form-control-static">{{ $username }}</p>
+                        <p class="form-control-static"><a href="https://profiles.wordpress.org/{{ rawurlencode( $username ) }}/" target="_blank" rel="noopener">{{ $username }}</a></p>
                 @elseif ( $can_connect )
                         <input id="wporgsso-username" type="text" class="form-control input-sized" name="wporg_username" value="{{ old( 'wporg_username', '' ) }}" maxlength="60" autocomplete="off">

sites/trunk/freescout.wordpress.net/Modules/WPOrgSSO/module.json

@@ -4 +4 @@
     "img": "/modules/wporgsso/img/icon.svg",
     "description": "Signs agents in with their WordPress.org account, and connects every FreeScout user to one.",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "detailsUrl": "https://github.com/WordPress/wordpress.org/tree/trunk/freescout.wordpress.net/Modules/WPOrgSSO",
     "author": "WordPress.org",

sites/trunk/freescout.wordpress.net/Modules/WPOrgSSO/tests/UsersTest.php

@@ -366 +366 @@
 
                 $this->create( 'rita' )->assertStatus( 403 );
+        }
+
+        /**
+         * The profile links the username to the WordPress.org profile.
+         *
+         * @return void
+         */
+        public function test_profile_links_username_to_wordpress_org_profile(): void {
+                $user = $this->create_user( User::ROLE_USER );
+                Account::connect( (int) $user->id, 'rita' );
+
+                // The page escapes this, and PHP 8 deprecates escaping null, which tests turn into an exception.
+                $user->emails = '';
+                $user->save();
+
+                $this->assertStringContainsString(
+                        '<a href="https://profiles.wordpress.org/rita/" target="_blank" rel="noopener">rita</a>',
+                        (string) $this->get( route( 'users.profile', array( 'id' => $user->id ) ) )->assertStatus( 200 )->getContent()
+                );
+        }
+
+        /**
+         * Users can't be deleted, even by administrators; they're disabled instead.
+         *
+         * @return void
+         */
+        public function test_users_cannot_be_deleted(): void {
+                $user = $this->create_user( User::ROLE_USER );
+
+                $response = $this->post(
+                        route( 'users.ajax' ),
+                        array(
+                                '_token'  => csrf_token(),
+                                'action'  => 'delete_user',
+                                'user_id' => $user->id,
+                        )
+                )->assertStatus( 200 );
+
+                $this->assertSame( 'error', json_decode( (string) $response->getContent(), true )['status'] );
+                $this->assertSame( User::STATUS_ACTIVE, (int) $user->refresh()->status );
         }