1 files changed, 37 insertions, 8 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/request/CertRequestResource.java b/base/common/src/com/netscape/cms/servlet/request/CertRequestResource.java
index 5dc97650d..7bb23dbd5 100644
--- a/base/common/src/com/netscape/cms/servlet/request/CertRequestResource.java
+++ b/base/common/src/com/netscape/cms/servlet/request/CertRequestResource.java
@@ -27,7 +27,9 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 
 import com.netscape.certsrv.request.RequestId;
+import com.netscape.cms.servlet.request.model.AgentEnrollmentRequestData;
 import com.netscape.cms.servlet.request.model.CertRequestInfo;
+import com.netscape.cms.servlet.request.model.CertRequestInfos;
 import com.netscape.cms.servlet.request.model.EnrollmentRequestData;
 
 @Path("/certrequest")
@@ -41,29 +43,56 @@ public interface CertRequestResource {
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML })
     public CertRequestInfo getRequestInfo(@PathParam("id") RequestId id);
 
+    @GET
+    @Path("{id}/agentView")
+    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML })
+    public AgentEnrollmentRequestData reviewRequest(@PathParam("id") RequestId id);
+
     // Enrollment - used to test integration with a browser
     @POST
     @Path("enroll")
     @Produces({ MediaType.TEXT_XML })
     @Consumes({ MediaType.APPLICATION_FORM_URLENCODED })
-    public CertRequestInfo enrollCert(MultivaluedMap<String, String> form);
+    public CertRequestInfos enrollCert(MultivaluedMap<String, String> form);
 
     @POST
     @Path("enroll")
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML })
     @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public CertRequestInfo enrollCert(EnrollmentRequestData data);
+    public CertRequestInfos enrollCert(EnrollmentRequestData data);
 
     @POST
-    @Path("approve/{id}")
-    public void approveRequest(@PathParam("id") RequestId id);
+    @Path("{id}/approve")
+    @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+    public void approveRequest(@PathParam("id") RequestId id, AgentEnrollmentRequestData data);
 
     @POST
-    @Path("reject/{id}")
-    public void rejectRequest(@PathParam("id") RequestId id);
+    @Path("{id}/reject")
+    @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+    public void rejectRequest(@PathParam("id") RequestId id, AgentEnrollmentRequestData data);
 
     @POST
-    @Path("cancel/{id}")
-    public void cancelRequest(@PathParam("id") RequestId id);
+    @Path("{id}/cancel")
+    @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+    public void cancelRequest(@PathParam("id") RequestId id, AgentEnrollmentRequestData data);
+
+    @POST
+    @Path("{id}/update")
+    @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+    public void updateRequest(@PathParam("id") RequestId id, AgentEnrollmentRequestData data);
 
+    @POST
+    @Path("{id}/validate")
+    @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+    public void validateRequest(@PathParam("id") RequestId id, AgentEnrollmentRequestData data);
+
+    @POST
+    @Path("{id}/unassign")
+    @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+    public void unassignRequest(@PathParam("id") RequestId id, AgentEnrollmentRequestData data);
+
+    @POST
+    @Path("{id}/assign")
+    @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+    public void assignRequest(@PathParam("id") RequestId id, AgentEnrollmentRequestData data);
 }