User invitation: Mail the newly added user with WPCom invite #35234
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| Significance: minor | ||
| Type: enhancement | ||
|
|
||
| SSO: When creating a new users, mail the users with an invitation to WPCom. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -55,6 +55,12 @@ private function __construct() { | |
| add_action( 'jetpack_site_before_disconnected', array( static::class, 'disconnect' ) ); | ||
| add_action( 'wp_login', array( 'Jetpack_SSO', 'clear_cookies_after_login' ) ); | ||
|
|
||
| // If the user has no errors on creation, send an invite to WordPress.com. | ||
| add_filter( 'user_profile_update_errors', array( $this, 'send_wpcom_mail_user_invite' ), 10, 3 ); | ||
| // Don't send core invitation email when adding a new user via the admin. | ||
| add_filter( 'wp_send_new_user_notification_to_user', '__return_false' ); | ||
| add_action( 'user_new_form', array( $this, 'render_invitation_email_message' ) ); | ||
|
|
||
| // Adding this action so that on login_init, the action won't be sanitized out of the $action global. | ||
| add_action( 'login_form_jetpack-sso', '__return_true' ); | ||
|
|
||
|
|
@@ -206,6 +212,68 @@ public function create_error_notice_and_redirect( $query_params ) { | |
| return wp_safe_redirect( $url ); | ||
| } | ||
|
|
||
| /** | ||
| * Render the invitation email message. | ||
| */ | ||
| public function render_invitation_email_message() { | ||
| // Enqueue the CSS for the admin create user page. | ||
| wp_enqueue_style( 'jetpack-sso-admin-create-user', plugins_url( 'modules/sso/jetpack-sso-admin-create-user.css', JETPACK__PLUGIN_FILE ), array(), time() ); | ||
|
|
||
| wp_admin_notice( | ||
| __( 'New users will receive an invite to join WordPress.com, so they can log in securely using [Secure Sign On].', 'jetpack' ), | ||
|
There was a problem hiding this comment. Secure Sign On should be a link to SSO. There was a problem hiding this comment. Ahh, I misunderstood that, added the link 👍 |
||
| array( | ||
| 'id' => 'invitation_message', | ||
| 'type' => 'info', | ||
| 'dismissible' => false, | ||
| 'additional_classes' => array( 'jetpack-sso-admin-create-user-invite-message' ), | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Send user invitation to WordPress.com if user has no errors. | ||
| * | ||
| * @param WP_Error $errors The WP_Error object. | ||
| * @param bool $update Whether the user is being updated or not. | ||
| * @param stdClass $user The User object about to be created. | ||
| * @return WP_Error The modified or not WP_Error object. | ||
| */ | ||
| public function send_wpcom_mail_user_invite( $errors, $update, $user ) { | ||
|
|
||
| if ( $errors->has_errors() ) { | ||
| return $errors; | ||
| } | ||
|
|
||
| $email = $user->user_email; | ||
| $role = $user->role; | ||
| $locale = get_user_locale( $user->ID ); | ||
| $blog_id = Jetpack_Options::get_option( 'id' ); | ||
| $url = '/sites/' . $blog_id . '/invites/new'; | ||
| $url = add_query_arg( 'locale', $locale, $url ); | ||
|
|
||
| $response = Client::wpcom_json_api_request_as_user( | ||
| $url, | ||
| '2', // Api version | ||
| array( | ||
| 'method' => 'POST', | ||
| ), | ||
| array( | ||
| 'invitees' => array( | ||
| array( | ||
| 'email_or_username' => $email, | ||
| 'role' => $role, | ||
| ), | ||
| ), | ||
| ) | ||
| ); | ||
|
|
||
| if ( 200 !== $response['response']['code'] ) { | ||
| $errors->add( 'invitation_not_sent', __( '<strong>Error</strong>: "The user invitation email could not be sent, the user account was not created.', 'jetpack' ) ); | ||
| } | ||
|
|
||
| return $errors; | ||
| } | ||
|
|
||
| /** | ||
| * Returns the single instance of the Jetpack_SSO object | ||
| * | ||
|
|
@@ -372,7 +440,7 @@ public function sso_reminder_logout_wpcom( $errors ) { | |
| if ( ! empty( $errors->errors['loggedout'] ) ) { | ||
| $logout_message = wp_kses( | ||
| sprintf( | ||
| /* translators: %1$s is a link to the WordPress.com account settings page. */ | ||
| __( 'If you are on a shared computer, remember to also <a href="%1$s">log out of WordPress.com</a>.', 'jetpack' ), | ||
| 'https://wordpress.com/me' | ||
| ), | ||
|
|
@@ -573,8 +641,8 @@ public function render_require_two_step() { | |
| <input | ||
| type="checkbox" | ||
| name="jetpack_sso_require_two_step" | ||
| <?php checked( Jetpack_SSO_Helpers::is_two_step_required() ); ?> | ||
| <?php disabled( Jetpack_SSO_Helpers::is_require_two_step_checkbox_disabled() ); ?> | ||
| > | ||
| <?php esc_html_e( 'Require Two-Step Authentication', 'jetpack' ); ?> | ||
| </label> | ||
|
|
@@ -605,10 +673,10 @@ public function render_match_by_email() { | |
| <input | ||
| type="checkbox" | ||
| name="jetpack_sso_match_by_email" | ||
| <?php checked( Jetpack_SSO_Helpers::match_by_email() ); ?> | ||
| <?php disabled( Jetpack_SSO_Helpers::is_match_by_email_checkbox_disabled() ); ?> | ||
| > | ||
| <?php esc_html_e( 'Match by Email', 'jetpack' ); ?> | ||
| </label> | ||
| <?php | ||
| } | ||
|
|
@@ -802,32 +870,32 @@ public function login_form() { | |
| ?> | ||
| <div id="jetpack-sso-wrap"> | ||
| <?php | ||
| /** | ||
| * Allow extension above Jetpack's SSO form. | ||
| * | ||
| * @module sso | ||
| * | ||
| * @since 8.6.0 | ||
| */ | ||
| do_action( 'jetpack_sso_login_form_above_wpcom' ); | ||
|
|
||
| if ( $display_name && $gravatar ) : | ||
| ?> | ||
| <div id="jetpack-sso-wrap__user"> | ||
| <img width="72" height="72" src="<?php echo esc_html( $gravatar ); ?>" /> | ||
|
|
||
| <h2> | ||
| <?php | ||
| echo wp_kses( | ||
| /* translators: %s a user display name. */ | ||
| sprintf( __( 'Log in as <span>%s</span>', 'jetpack' ), esc_html( $display_name ) ), | ||
| array( 'span' => true ) | ||
| ); | ||
| ?> | ||
| </h2> | ||
| </div> | ||
|
|
||
| <?php endif; ?> | ||
|
|
||
|
|
||
| <div id="jetpack-sso-wrap__action"> | ||
|
|
@@ -863,18 +931,18 @@ public function login_form() { | |
| <?php endif; ?> | ||
| </div> | ||
|
|
||
| <?php | ||
| /** | ||
| * Allow extension below Jetpack's SSO form. | ||
| * | ||
| * @module sso | ||
| * | ||
| * @since 8.6.0 | ||
| */ | ||
| do_action( 'jetpack_sso_login_form_below_wpcom' ); | ||
|
|
||
| if ( ! Jetpack_SSO_Helpers::should_hide_login_form() ) : | ||
| ?> | ||
| <div class="jetpack-sso-or"> | ||
| <span><?php esc_html_e( 'Or', 'jetpack' ); ?></span> | ||
| </div> | ||
|
|
@@ -890,9 +958,9 @@ public function login_form() { | |
| esc_html_e( 'Log in with WordPress.com', 'jetpack' ) | ||
| ?> | ||
| </a> | ||
| <?php endif; ?> | ||
| </div> | ||
| <?php | ||
| } | ||
|
|
||
| /** | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,9 @@ | ||||||||||||||||||
|
|
||||||||||||||||||
| .jetpack-sso-admin-create-user-invite-message { | ||||||||||||||||||
| width: 550px; | ||||||||||||||||||
| } | ||||||||||||||||||
| /* Select the second-to-last tr in the table */ | ||||||||||||||||||
| #createuser .form-table tr:nth-last-child(2) { | ||||||||||||||||||
| display: none; | ||||||||||||||||||
| } | ||||||||||||||||||
|
There was a problem hiding this comment. I would do this and change the code comment, currently the comment just compiles the code to the reader, it should explain the reasoning.
Suggested change
|
||||||||||||||||||
|
|
||||||||||||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.