Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed iframe session issue #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed iframe session issue #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions inc/js/currinda.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@

function auth() {
if(jQuery('#currinda_iframe').length) {
var urlpath = new URL(jQuery('#currinda_iframe').attr('src')).pathname;
var iframe = jQuery('#currinda_iframe');
if(urlpath == '/logout') {
iframe.attr('src', iframe.data('authurl'));
} else {
iframe.css('display', 'block');
}
}
}

function currinda_login() {
var child = window.open(WPURLS.siteurl+'/?option=currinda_user_login');
}

function currinda_child() {
window.opener.location.reload();
window.close();
function currinda_reload_page() {
window.parent.location.reload();
}


33 changes: 19 additions & 14 deletions login.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,13 @@ function __construct() {
add_action( 'wp_enqueue_scripts', array($this, 'currinda_scripts') );

$this->update_variables();
}
}

function currinda_scripts() {
wp_register_script('jquery', 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js', array(), '', true);
wp_register_script( 'currinda', plugins_url( '/inc/js/currinda.js', __FILE__ ), array(), CURRINDA_VERSION, true);
wp_enqueue_script( 'currinda' );
wp_enqueue_script( 'currinda' );
wp_enqueue_script( 'jquery' );
wp_localize_script('currinda', 'WPURLS', array( 'siteurl' => get_option('siteurl') ));
}

Expand Down Expand Up @@ -253,19 +255,19 @@ function help_support(){ ?>
var $error;

function login_validate() {
// if true, means redirected by authorization with the code
if(isset($_GET['option']) and $_GET['option'] == "currinda_user_login") {

// CurrindaProvider instance
$provider = $this->provider();
if ( ! isset($_GET['code'])) {
if(isset($_GET["error"])) {

if ( !isset($_GET['code']) ) {
if( isset($_GET["error"]) ) {
$this->error = new WP_Error($_GET["error"], htmlspecialchars($_GET["error_description"]));
return $this->error;
} else {
// If we don't have an authorization code then get one
header('Location: '.$provider->getAuthorizationUrl());
exit;
}

}
} else {

// Try to get an access token (using the authorization code grant)
$token = $provider->getAccessToken('authorization_code', [
'code' => $_GET['code']
Expand Down Expand Up @@ -407,10 +409,13 @@ function setup_user_or_login($details) {
wp_set_auth_cookie( $user_id, true );
do_action( 'wp_login', $user->user_login );

//wp_redirect( site_url() );

// Close the current window
echo "<HTML><BODY><SCRIPT src='" . plugins_url( '/inc/js/currinda.js', __FILE__ ) . "'></SCRIPT><SCRIPT>currinda_child();</SCRIPT></BODY></HTML>";
echo "
<HTML>
<BODY>
<SCRIPT src='" . plugins_url( '/inc/js/currinda.js', __FILE__ ) . "'></SCRIPT>
<SCRIPT>currinda_reload_page();</SCRIPT>
</BODY>
</HTML>";

exit(0);
}
Expand Down
31 changes: 14 additions & 17 deletions login_afo_widget.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ class CurrindaLoginWidget extends WP_Widget {
public function __construct() {
$this->app_id = get_option('currinda_app_id');
$this->app_secret = get_option('currinda_app_secret');
$this->domain = get_option("currinda_app_domain");
$this->scope = get_option("currinda_app_scope");
$this->domain = get_option("currinda_app_domain");
$this->scope = get_option("currinda_app_scope");

add_action( 'wp_enqueue_scripts', array( $this, 'register_plugin_styles' ) );
parent::__construct(
Expand Down Expand Up @@ -44,22 +44,19 @@ public function form( $instance ) {

public function loginForm($title = ""){
global $post;
$this->error_message();
if(!is_user_logged_in()){
//<?php echo $this->url; ?option=currinda_user_login
$this->error_message();
?>
<a href='javascript:currinda_login()'><?php echo $title ? $title : "Login with Currinda" ?></a>
<?php
} else {
global $current_user;
get_currentuserinfo();
$link_with_username = __('Howdy,','clw')." ".$current_user->display_name;
?>
<ul class="login_wid">
<li><?php echo $link_with_username;?> | <a href="<?php echo wp_logout_url(site_url()); ?>" title="<?php _e('Logout','clw');?>"><?php _e('Logout','clw');?></a></li>
</ul>
<?php
}

<?php if ( !is_user_logged_in() ) { ?>
<iframe
onload="auth()"
scrolling="no"
style="width:100%; height: 205px; border: none; scroll: auto; display: none;"
id="currinda_iframe"
src="https://<?php echo get_option('currinda_client_domain'); ?>/logout"
data-authurl="https://<?php echo get_option('currinda_client_domain'); ?>/api/v2/organisation/<?php echo get_option('currinda_client_scope'); ?>/authorize?client_id=<?php echo get_option('currinda_client_id'); ?>&redirect_uri=<?php echo get_site_url(); ?>%3Foption%3Dcurrinda_user_login&scope=user&response_type=code&approval_prompt=auto&version=2">
</iframe>
<?php }
}

public function error_message(){
Expand Down