Skip to content

Candidate for fixing eprints/orcid_support_advance#85 #88

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

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

Candidate for fixing eprints/orcid_support_advance#85 #88

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
27 changes: 22 additions & 5 deletions cgi/orcid/authenticate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@ my $db = $repo->database;
#get current user record
my $current_user = $repo->current_user();

unless ( defined $current_user )
{
if ( $repo->param( 'redirected' ) )
{
EPrints::abort( "Cannot determine current user." );
}
my $url = $repo->config( 'orcid_support_advance', 'redirect_uri' ) . "?code=$authcode&state=$state&error=$error&error_description=$error_desc&redirected=1";
$repo->send_http_header( content_type=>"text/html" );
print '<html><head><meta http-equiv="refresh" content="0;url=' . $url . '"/></head><body></body></html>';
exit;
}

if( defined( $error ) && $error eq "access_denied" )
{
$db->save_user_message($current_user->get_value( "userid" ),
Expand All @@ -45,8 +57,7 @@ if( defined( $authcode ) && defined( $state ) )
$repo->html_phrase( "Plugin/Screen/AuthenticateOrcid:unexpected_state" )
);

$repo->redirect( $repo->config( 'userhome' ) );
exit;
metarefresh_redirect( $repo, $repo->config( 'userhome' ) );
}

# get the log object, get any local permissions we might need... and then remove the log object
Expand Down Expand Up @@ -131,7 +142,7 @@ if( defined( $authcode ) && defined( $state ) )
}

# we have an authorized orcid - now manage permissions
$repo->redirect( $repo->config( 'userhome' )."?screen=ManageOrcid" );
metarefresh_redirect( $repo, $repo->config( 'userhome' )."?screen=ManageOrcid" );
}
else
{
Expand All @@ -143,7 +154,13 @@ if( defined( $authcode ) && defined( $state ) )
);

# no orcid - go home
$repo->redirect( $repo->config( 'userhome' ) );
exit;
metarefresh_redirect( $repo, $repo->config( 'userhome' ) );
}
}

sub metarefresh_redirect {
my ( $repo, $url ) = @_;
$repo->send_http_header( content_type=>"text/html" );
print '<html><head><meta http-equiv="refresh" content="0;url=' . $url . '"/></head><body></body></html>';
exit;
}