Skip to content
Merged
Changes from all commits
Commits
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
24 changes: 18 additions & 6 deletions src/MGRAST/lib/Auth.pm
Original file line number Diff line number Diff line change
Expand Up @@ -137,19 +137,31 @@ sub authenticate {
if (! scalar(@$pref)) {

# there is no connection, create a fake user and hook them up
$result = `curl -s -X GET "$userdata_url$sig"`;
$result = `curl -s -H "Authorization: Globus-Goauthtoken $key" -X GET "$userdata_url$user"`;
my $globus_udata;
eval {
$globus_udata = $json->decode($result);
};
if ($@) {
return (undef, "could not reach globus online auth server");
}
#
#
#
#
return (undef, "valid kbase user");
my $existing = $master->User->get_objects({email => $globus_udata->{email}});
if (scalar(@$existing)) {
my $found_user = $existing->[0];
$master->Preferences->create( { name => 'kbase_user', user => $found_user, value => $user } );
return ($found_user);
} else {
my $firstname = "unknown";
my $lastname = "";
if ($globus_udata->{fullname} =~ /\s/) {
($firstname, $lastname) = $globus_udata->{fullname} =~ /^(.+)\s(.+)$/;
} else {
$lastname = $globus_udata->{username};
}
my $kbauto_user = $master->User->create({ firstname => $firstname, lastname => $lastname, email => $globus_udata->{email}, login => "KBaseAutoGeneratedUser:".$globus_udata->{username}, comment => "auto-generated KBase user" });
$master->Preferences->create( { name => 'kbase_user', user => $kbauto_user, value => $user } );
return ($kbauto_user);
}
}
}
} else {
Expand Down