Changeset 12811

Timestamp:

08/07/2023 02:43:56 AM (18 months ago)

Author:

dd32

Message:

Login: When a user attempts to signup again using an email which has a pending account in a approval-required state, inform the user to email us.

This avoids a case where the user see's a "resend confirmation email" which never actually works.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-restapi.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-restapi.php

@@ -102 +102 @@
     }
 
-    if ( $pending && ! $pending['created'] ) {
+    if ( $pending && ! $pending['created'] && ! $pending['cleared'] ) {
+        // Account is in pending state, but requires manual human review, don't suggest sending a reset email.
+        $sso = WPOrg_SSO::get_instance();
+
+        return [
+            'available' => false,
+            'error' => sprintf(
+                __( 'That email address already has an account.', 'wporg' ) . '<br>' .
+                /* translators: %s Email address */
+                __( 'Your account is pending approval. You will receive an email at %s to set your password when approved.', 'wporg' ) . 
+                /* translators: %s Email address */
+                '<br>' . __( 'Please contact %s for more details.', 'wporg' ),
+                '<code>' . esc_html( $pending['user_email'] ) . '</code>',
+                '<a href="mailto:' . $sso::SUPPORT_EMAIL . '">' . $sso::SUPPORT_EMAIL . '</a>'
+            ),
+            'avatar' => get_avatar( $email, 64 ),
+        ];
+
+    } elseif ( $pending && ! $pending['created'] ) {
+        // Account is in pending state, just needs the user to click through on the email, offer to resend the email.
         return [
             'available' => false,