Skip to content
Merged
Show file tree
Hide file tree
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
10 changes: 6 additions & 4 deletions src/MGRAST/lib/resources/pipeline.pm
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ sub instance {
$self->return_data( {"ERROR" => "insufficient permissions to view this data"}, 401 );
}

my $data = $self->get_awe_query({'info.name' => $job->{job_id}}, $self->mgrast_token);
my $data = $self->get_awe_query({'info.name' => [$job->{job_id}]}, $self->mgrast_token);
$self->return_data($data);
}

Expand All @@ -119,7 +119,7 @@ sub query {
my $master = $self->connect_to_datasource();

# get paramaters
my %params = $self->cgi->Vars;
my %params = map { $_ => [$self->cgi->param($_)] } $self->cgi->param;
if (exists $params{auth}) {
delete $params{auth};
}
Expand All @@ -128,11 +128,11 @@ sub query {
}
# other users data if admin
if ($self->user->is_admin('MGRAST') && exists($params{'info.user'})) {
$params{'info.user'} = $self->user_id( $params{'info.user'} );
$params{'info.user'} = [ $self->user_id($params{'info.user'}) ];
}
# this users data
else {
$params{'info.user'} = $self->user_id();
$params{'info.user'} = [ $self->user_id() ];
}

my $data = $self->get_awe_query(\%params, $self->mgrast_token);
Expand All @@ -145,6 +145,8 @@ sub user_id {
my $uid = undef;
# validate and get user_id
if ($user) {
# all paramaters are arrays
$user = $user->[0];
# get database
my ($master, $error) = WebApplicationDBHandle->new();
if ($error) {
Expand Down
5 changes: 4 additions & 1 deletion src/MGRAST/lib/resources/resource.pm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use Auth;
use Conf;
use CGI;
use JSON;
use URI::Escape;
use MIME::Base64;
use LWP::UserAgent;
use HTTP::Request::Common;
Expand Down Expand Up @@ -862,7 +863,9 @@ sub get_awe_query {
my $response = undef;
my $query = '?query';
if ($params && (scalar(keys %$params) > 0)) {
map { $query .= '&'.$_.'='.$params->{$_} } keys %$params;
while (my ($key, $value) = each %$params) {
map { $query .= '&'.$key.'='.uri_escape($_) } @$value;
}
}
eval {
my @args = $auth ? ('Authorization', "OAuth $auth") : ();
Expand Down