Fixes #360.

eprints · Jan 8, 2019 · ee0c653 · ee0c653
1 parent abb291e
commit ee0c653
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/perl_lib/EPrints/Apache/CRUD.pm b/perl_lib/EPrints/Apache/CRUD.pm
@@ -1001,7 +1001,7 @@ sub handler
 
 	my $user = $repo->current_user;
 
-	my( $rc, $owner ) = on_behalf_of( $repo, $r, $user );
+	my( $rc, $owner ) = $self->on_behalf_of( $user );
 	return $rc if $rc != OK;
 
 	# Subject URI's redirect to the top of that particular subject tree
@@ -1738,12 +1738,15 @@ sub servicedocument
 
 	my $user = $repo->current_user;
 	EPrints->abort( "unprotected" ) if !defined $user; # Rewrite foobar
-	my $on_behalf_of = on_behalf_of( $repo, $r, $user );
-	if( $on_behalf_of->{status} != OK )
+	my ( $status, $on_behalf_of ) = $self->on_behalf_of( $user );
+	if( $status != OK )
 	{
-		return sword_error( $repo, $r, %$on_behalf_of );
-	}
-	$on_behalf_of = $on_behalf_of->{on_behalf_of};
+		return $self->sword_error(
+                	status => HTTP_FORBIDDEN,
+	                href => "http://purl.org/net/sword/error/TargetOwnerUnknown",
+        	        summary => "Target user unknown or no permission to act on-behalf-of",
+		);
+        }
 
 # SERVICE and WORKSPACE DEFINITION
 
@@ -1837,13 +1840,10 @@ sub servicedocument
 
 sub on_behalf_of
 {
-	my( $repo, $r, $user ) = @_;
-
-	my $err = {
-		status => HTTP_FORBIDDEN,
-		href => "http://purl.org/net/sword/error/TargetOwnerUnknown",
-		summary => "Target user unknown or no permission to act on-behalf-of",
-	};
+	my( $self, $user ) = @_;
+
+	my $repo = $self->repository;
+	my $r = $self->request; 
 
 	my $on_behalf_of =
 		$r->headers_in->{'On-Behalf-Of'} || # SWORD 2.0
@@ -1853,9 +1853,9 @@ sub on_behalf_of
 
 	my $owner = $repo->user_by_username( $on_behalf_of );
 
-	return sword_error($repo, $r, %$err )
+	return ( HTTP_FORBIDDEN, undef )
 		if !defined $owner;
-	return sword_error($repo, $r, %$err ) 
+	return ( HTTP_FORBIDDEN, undef )
 		if !$user->allow( "user/mediate", $owner );
 
 	return( OK, $owner );