Changeset 49291

Timestamp:

10/24/2020 12:05:15 AM (4 years ago)

Author:

TimothyBlynJacobs

Message:

App Passwords: Include site_url in the success redirect payload.

Props georgestephanis.
Fixes #51602.

Location:

trunk/src

Files:

• js/_enqueues/admin/auth-app.js (modified) (1 diff)
• wp-admin/authorize-application.php (modified) (4 diffs)

trunk/src/js/_enqueues/admin/auth-app.js

@@ -74 +74 @@
             if ( raw ) {
                 url = raw + ( -1 === raw.indexOf( '?' ) ? '?' : '&' ) +
-                    'user_login=' + encodeURIComponent( authApp.user_login ) +
+                    'site_url=' + encodeURIComponent( authApp.site_url ) +
+                    '&user_login=' + encodeURIComponent( authApp.user_login ) +
                     '&password=' + encodeURIComponent( response.password );
 

trunk/src/wp-admin/authorize-application.php

@@ -13 +13 @@
 $new_password = '';
 
+// This is the no-js fallback script.  Generally this will all be handled by `auth-app.js`
 if ( isset( $_POST['action'] ) && 'authorize_application_password' === $_POST['action'] ) {
     check_admin_referer( 'authorize_application_password' );
@@ -45 +46 @@
                 $redirect = add_query_arg(
                     array(
-                        'username' => urlencode( wp_get_current_user()->user_login ),
-                        'password' => urlencode( $new_password ),
+                        'site_url'   => urlencode( site_url() ),
+                        'user_login' => urlencode( wp_get_current_user()->user_login ),
+                        'password'   => urlencode( $new_password ),
                     ),
                     $success_url
@@ -109 +111 @@
     'authApp',
     array(
+        'site_url'   => site_url(),
         'user_login' => $user->user_login,
         'success'    => $success_url,
@@ -231 +234 @@
                                 add_query_arg(
                                     array(
-                                        'username' => $user->user_login,
-                                        'password' => '[------]',
+                                        'site_url'   => site_url(),
+                                        'user_login' => $user->user_login,
+                                        'password'   => '[------]',
                                     ),
                                     $success_url