From 96b25f6c902e21e12c6d53daf2f6ce77c16c0caa Mon Sep 17 00:00:00 2001 From: Gassan Gousseinov Date: Tue, 2 Jul 2019 16:33:15 +0200 Subject: [PATCH] added force_redirect parameter and login action --- includes/openid-connect-generic-client-wrapper.php | 4 +++- includes/openid-connect-generic-login-form.php | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/includes/openid-connect-generic-client-wrapper.php b/includes/openid-connect-generic-client-wrapper.php index 9c34cb3..b463164 100644 --- a/includes/openid-connect-generic-client-wrapper.php +++ b/includes/openid-connect-generic-client-wrapper.php @@ -378,7 +378,9 @@ class OpenID_Connect_Generic_Client_Wrapper { // login the found / created user $this->login_user( $user, $token_response, $id_token_claim, $user_claim, $subject_identity ); - + + do_action( 'openid-connect-generic-user-logged-in', $user ); + // log our success $this->logger->log( "Successful login for: {$user->user_login} ({$user->ID})", 'login-success' ); diff --git a/includes/openid-connect-generic-login-form.php b/includes/openid-connect-generic-login-form.php index 3de9a12..eb4b61b 100644 --- a/includes/openid-connect-generic-login-form.php +++ b/includes/openid-connect-generic-login-form.php @@ -39,7 +39,8 @@ class OpenID_Connect_Generic_Login_Form { */ function handle_redirect_login_type_auto() { - if ( $GLOBALS['pagenow'] == 'wp-login.php' && $this->settings->login_type == 'auto' + if ( $GLOBALS['pagenow'] == 'wp-login.php' + && ( $this->settings->login_type == 'auto' || ! empty( $_GET['force_redirect'] ) ) && ( ! isset( $_GET[ 'action' ] ) || $_GET[ 'action' ] !== 'logout' ) && ! isset( $_POST['wp-submit'] ) ) {