Changeset 11610

Timestamp:

06/23/2017 05:10:48 PM (8 years ago)

Author:

r-a-y

Message:

Core: Redirect login links to their rightful spot if already authenticated.

Previously, if a logged-in user clicked on a login link with the
'redirect_to' parameter, the user would need to re-authenticate in order
to get redirected to the given URL.

This commit bypasses the re-authentication process for logged-in users,
which improves the user experience for those clicking on login links via
email. wp_safe_redirect() is used to avoid redirecting to external
links that are not whitelisted by WordPress.

See #7349.

File:

• trunk/src/bp-core/bp-core-catchuri.php (modified) (2 diffs)

trunk/src/bp-core/bp-core-catchuri.php

@@ -671 +671 @@
         case 2 :
             if ( !empty( $redirect ) ) {
-                bp_core_redirect( add_query_arg( array( 'action' => 'bpnoaccess' ), wp_login_url( $redirect ) ) );
+                bp_core_redirect( add_query_arg( array(
+                    'bp-auth' => 1,
+                    'action'  => 'bpnoaccess'
+                ), wp_login_url( $redirect ) ) );
             } else {
                 bp_core_redirect( $root );
@@ -697 +700 @@
     }
 }
+
+/**
+ * Login redirector.
+ *
+ * If a link is not publicly available, we can send members from external
+ * locations, like following links in an email, through the login screen.
+ *
+ * If a user clicks on this link and is already logged in, we should attempt
+ * to redirect the user to the authorized content instead of forcing the user
+ * to re-authenticate.
+ *
+ * @since 2.9.0
+ */
+function bp_login_redirector() {
+    // Redirect links must include the `redirect_to` and `bp-auth` parameters.
+    if ( empty( $_GET['redirect_to'] ) || empty( $_GET['bp-auth'] ) ) {
+        return;
+    }
+
+    /*
+     * If the user is already logged in,
+     * skip the login form and redirect them to the content.
+     */
+    if ( bp_loggedin_user_id() ) {
+        wp_safe_redirect( esc_url_raw( $_GET['redirect_to'] ) );
+        exit;
+    }
+}
+add_action( 'login_init', 'bp_login_redirector', 1 );
 
 /**