Isekai-Project
/
isekai-openid-connect-generic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #20 from rwasef1830/fix_redirect_to_origin_for_error_redirect

Browse Source 
Working to fix "redirect to origin" for error redirect
isekai
Jonathan Daggerhart 8 years ago committed by GitHub
parent 954b72848f 2ff33dba41
commit 2655668089
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File

1
includes/openid-connect-generic-client-wrapper.php
Unescape Escape View File

@ -303,6 +303,7 @@ class OpenID_Connect_Generic_Client_Wrapper {
// redirect back to the origin page if enabled
if( $this->settings->redirect_user_back && !empty( $redirect_url = esc_url( $_COOKIE[ $this->cookie_redirect_key ] ) ) ) {
do_action( 'openid-connect-generic-redirect-user-back', $redirect_url, $user );
setcookie( $this->cookie_redirect_key, $redirect_url, 1, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
wp_redirect( $redirect_url );
}
// otherwise, go home!

30
includes/openid-connect-generic-login-form.php
Unescape Escape View File

@ -41,6 +41,22 @@ class OpenID_Connect_Generic_Login_Form {
function handle_login_page( $message ) {
$settings = $this->settings;
// record the URL of this page if set to redirect back to origin page
if ( $this->settings->redirect_user_back ) {
$redirect_expiry = time() + DAY_IN_SECONDS;
if ( $GLOBALS['pagenow'] == 'wp-login.php' ) {
if ( isset( $_REQUEST['redirect_to'] ) ) {
$redirect_url = esc_url( $_REQUEST[ 'redirect_to' ] );
}
else {
$redirect_url = admin_url();
}
} else {
$redirect_url = home_url( esc_url( add_query_arg( NULL, NULL ) ) );
}
setcookie( $this->client_wrapper->cookie_redirect_key, $redirect_url, $redirect_expiry, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
}
// errors and auto login can't happen at the same time
if ( isset( $_GET['login-error'] ) ) {
$message = $this->make_error_output( $_GET['login-error'], $_GET['message'] );
@ -85,20 +101,6 @@ class OpenID_Connect_Generic_Login_Form {
function make_login_button() {
$text = apply_filters( 'openid-connect-generic-login-button-text', __( 'Login with OpenID Connect' ) );
$href = $this->client_wrapper->get_authentication_url();
// record the URL of this page if set to redirect back to origin page
if( $this->settings->redirect_user_back ) {
$redirect_expiry = time() + DAY_IN_SECONDS;
if ( $GLOBALS['pagenow'] == 'wp-login.php' ) {
if( isset( $_REQUEST['redirect_to'] ) )
$redirect_url = esc_url( $_REQUEST['redirect_to'] );
else
$redirect_url = admin_url();
} else {
$redirect_url = home_url( esc_url( add_query_arg( NULL, NULL ) ) );
}
setcookie( $this->client_wrapper->cookie_redirect_key, $redirect_url, $redirect_expiry, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
}
ob_start();
?>

Write Preview
Loading…
Cancel
Save