From 8ae2d384ed56e10ebb268391c1511a428ede3958 Mon Sep 17 00:00:00 2001
From: Brian Major <brian.major@nrc-cnrc.gc.ca>
Date: Wed, 24 Sep 2014 15:06:51 -0700
Subject: [PATCH] s1651 - Changed search parameter name from TYPE to IDTYPE to
avoid UWS collision.
---
.../ca/nrc/cadc/ac/server/RequestValidator.java | 14 ++++++++------
.../src/ca/nrc/cadc/ac/client/GMSClient.java | 4 ++--
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/RequestValidator.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/RequestValidator.java
index 34ac1751..aed7d709 100644
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/RequestValidator.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/RequestValidator.java
@@ -68,12 +68,14 @@
*/
package ca.nrc.cadc.ac.server;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+
import ca.nrc.cadc.ac.IdentityType;
import ca.nrc.cadc.ac.Role;
import ca.nrc.cadc.uws.Parameter;
import ca.nrc.cadc.uws.ParameterUtil;
-import java.util.List;
-import org.apache.log4j.Logger;
/**
* Request Validator. This class extracts and validates the ID, TYPE, ROLE
@@ -105,7 +107,7 @@ public class RequestValidator
if (paramList == null || paramList.isEmpty())
{
throw new IllegalArgumentException(
- "Missing required parameters: ID and TYPE");
+ "Missing required parameters: ID and IDTYPE");
}
// ID
@@ -118,12 +120,12 @@ public class RequestValidator
this.userID = param.trim();
log.debug("ID: " + userID);
- // TYPE
- param = ParameterUtil.findParameterValue("TYPE", paramList);
+ // IDTYPE
+ param = ParameterUtil.findParameterValue("IDTYPE", paramList);
if (param == null || param.trim().isEmpty())
{
throw new IllegalArgumentException(
- "TYPE parameter required but not found");
+ "IDTYPE parameter required but not found");
}
this.idType = IdentityType.toValue(param);
log.debug("TYPE: " + idType);
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java b/projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java
index 4494ff0a..11453110 100755
--- a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java
+++ b/projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java
@@ -688,7 +688,7 @@ public class GMSClient
searchGroupURL.append("/search?");
searchGroupURL.append("ID=" + URLEncoder.encode(id, "UTF-8"));
- searchGroupURL.append("&TYPE=" + URLEncoder.encode(idType, "UTF-8"));
+ searchGroupURL.append("&IDTYPE=" + URLEncoder.encode(idType, "UTF-8"));
searchGroupURL.append("&ROLE=" + URLEncoder.encode(roleString, "UTF-8"));
log.debug("getMemberships request to " + searchGroupURL.toString());
@@ -801,7 +801,7 @@ public class GMSClient
searchGroupURL.append("/search?");
searchGroupURL.append("ID=" + URLEncoder.encode(id, "UTF-8"));
- searchGroupURL.append("&TYPE=" + URLEncoder.encode(idType, "UTF-8"));
+ searchGroupURL.append("&IDTYPE=" + URLEncoder.encode(idType, "UTF-8"));
searchGroupURL.append("&ROLE=" + URLEncoder.encode(roleString, "UTF-8"));
searchGroupURL.append("&GROUPID=" + URLEncoder.encode(groupName, "UTF-8"));
--
GitLab