Changeset 49998

Timestamp:

01/21/2021 12:34:25 PM (4 years ago)

Author:

SergeyBiryukov

Message:

App Passwords: Correct authorize app action names and signatures.

When App Passwords was introduced, the wp_authorize_application_password_form and wp_application_passwords_approve_app_request_success hooks were mistakenly duplicated and incorrectly documented. This commit corrects the hook names and ensures the correct parameters are passed.

Props johnbillion, engahmeds3ed.
Merges [49920] to the 5.6 branch.
Fixes #52013.

Location:

branches/5.6

Files:

• . (modified) (1 prop)
• src/js/_enqueues/admin/auth-app.js (modified) (3 diffs)
• src/wp-admin/authorize-application.php (modified) (2 diffs)

branches/5.6/src/js/_enqueues/admin/auth-app.js

@@ -62 +62 @@
             /**
              * Fires when an Authorize Application Password request has been successfully approved.
+             *
+             * In most cases, this should be used in combination with the {@see 'wp_authorize_application_password_form_approved_no_js'}
+             * action to ensure that both the JS and no-JS variants are handled.
              *
              * @since 5.6.0
@@ -127 +130 @@
              *
              * @since 5.6.0
+             * @since 5.6.1 Corrected action name and signature.
              *
              * @param {Object|null} error       The error from the REST API. May be null if the server did not send proper JSON.
@@ -133 +137 @@
              * @param {jqXHR}       jqXHR       The underlying jqXHR object that made the request.
              */
-            wp.hooks.doAction( 'wp_application_passwords_approve_app_request_success', error, textStatus, jqXHR );
+            wp.hooks.doAction( 'wp_application_passwords_approve_app_request_error', error, textStatus, errorThrown, jqXHR );
         } );
     } );

branches/5.6/src/wp-admin/authorize-application.php

@@ -201 +201 @@
             <?php
             /**
-             * Fires in the Authorize Application Password new password section.
+             * Fires in the Authorize Application Password new password section in the no-JS version.
+             *
+             * In most cases, this should be used in combination with the {@see 'wp_application_passwords_approve_app_request_success'}
+             * action to ensure that both the JS and no-JS variants are handled.
              *
              * @since 5.6.0
+             * @since 5.6.1 Corrected action name and signature.
              *
              * @param string  $new_password The newly generated application password.
@@ -209 +213 @@
              * @param WP_User $user         The user authorizing the application.
              */
-            do_action( 'wp_authorize_application_password_form', $request, $user );
+            do_action( 'wp_authorize_application_password_form_approved_no_js', $new_password, $request, $user );
             ?>
         <?php else : ?>