Minor changes

tushar-97 · Aug 12, 2019 · a045ec2 · a045ec2
1 parent 46a0d93
commit a045ec2
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/...ient/src/main/java/edu/emory/cci/bindaas/trusted_app_client/util/SpreadsheetImporter.java b/...ient/src/main/java/edu/emory/cci/bindaas/trusted_app_client/util/SpreadsheetImporter.java
@@ -119,7 +119,7 @@ public void start() throws Exception {
 							"{ 'username' : '%s' , 'role' : '%s' }", username,
 							role);
 					Date dateExpires = dateFormat.parse(expires);
-					// FIXME fix protocol
+					// The utility only works with api keys for the time being
 					try {
 						JsonObject serverResponse = trustedAppClient.authorizeNewUser("api_key",
 								email, dateExpires.getTime(), comments);

diff --git a/...src/main/java/edu/emory/cci/bindaas/datasource/provider/mongodb/MongoDBSubmitHandler.java b/...src/main/java/edu/emory/cci/bindaas/datasource/provider/mongodb/MongoDBSubmitHandler.java
@@ -156,7 +156,7 @@ else if(configuration.getUsername().isEmpty() && configuration.getPassword().isE
 
 				if(role != null & authorization) {
 					if (!getAuthorizationRulesCache().getIfPresent(role.toString()).
-							contains(object.get("Project").toString())) {
+							contains(object.get("project").toString())) {
 						throw new Exception("Not authorized to execute this query.");
 					}
 				}
@@ -180,7 +180,7 @@ else if(submitEndpointProperties.getInputType()!=null && submitEndpointPropertie
 				if(role != null & authorization) {
 					for (DBObject o : object) {
 						if(!getAuthorizationRulesCache().getIfPresent(role.toString()).
-								contains(o.get("Project").toString())){
+								contains(o.get("project").toString())){
 							throw new ProviderException(MongoDBProvider.class.getName() , MongoDBProvider.VERSION, "Not authorized to execute this query.");
 						}
 					}

diff --git a/...va/edu/emory/cci/bindaas/datasource/provider/mongodb/operation/CountOperationHandler.java b/...va/edu/emory/cci/bindaas/datasource/provider/mongodb/operation/CountOperationHandler.java
@@ -40,7 +40,7 @@ public QueryResult handleOperation(DBCollection collection,
 				if(authorization) {
 					for(DBObject o : cursor) {
 						if(!getAuthorizationRulesCache().getIfPresent(role).
-								contains(o.get("Project").toString())){
+								contains(o.get("project").toString())){
 							throw new ProviderException(MongoDBProvider.class.getName() , MongoDBProvider.VERSION, "Not authorized to execute this query.");
 						}
 					}

diff --git a/...a/edu/emory/cci/bindaas/datasource/provider/mongodb/operation/DeleteOperationHandler.java b/...a/edu/emory/cci/bindaas/datasource/provider/mongodb/operation/DeleteOperationHandler.java
@@ -39,7 +39,7 @@ public QueryResult handleOperation(DBCollection collection,
 		if(authorization) {
 			for(DBObject o : cursor) {
 				if(!getAuthorizationRulesCache().getIfPresent(role).
-						contains(o.get("Project").toString())){
+						contains(o.get("project").toString())){
 					throw new ProviderException(MongoDBProvider.class.getName() , MongoDBProvider.VERSION, "Not authorized to execute this query.");
 				}
 			}

diff --git a/...edu/emory/cci/bindaas/datasource/provider/mongodb/operation/DistinctOperationHandler.java b/...edu/emory/cci/bindaas/datasource/provider/mongodb/operation/DistinctOperationHandler.java
@@ -29,7 +29,7 @@ public class DistinctOperationHandler implements IOperationHandler {
 
 	@Override
 	public QueryResult handleOperation(DBCollection collection,
-									   OutputFormatProps outputFormatProps, JsonObject operationArguments , OutputFormatRegistry registry)
+									   OutputFormatProps outputFormatProps, JsonObject operationArguments , OutputFormatRegistry registry, String role, boolean authorization)
 			throws ProviderException {
 		DistinctOperationDescriptor operationDescriptor = GSONUtil.getGSONInstance().fromJson(operationArguments, DistinctOperationDescriptor.class);
 		validateArguments(operationDescriptor);

diff --git a/...ava/edu/emory/cci/bindaas/datasource/provider/mongodb/operation/FindOperationHandler.java b/...ava/edu/emory/cci/bindaas/datasource/provider/mongodb/operation/FindOperationHandler.java
@@ -58,7 +58,7 @@ public QueryResult handleOperation(DBCollection collection,
 				if(authorization) {
 					for(DBObject o : cursor) {
 						if(!getAuthorizationRulesCache().getIfPresent(role).
-								contains(o.get("Project").toString())){
+								contains(o.get("project").toString())){
 							throw new ProviderException(MongoDBProvider.class.getName() , MongoDBProvider.VERSION, "Not authorized to execute this query.");
 						}
 					}

diff --git a/...va/edu/emory/cci/bindaas/datasource/provider/mongodb/operation/GroupOperationHandler.java b/...va/edu/emory/cci/bindaas/datasource/provider/mongodb/operation/GroupOperationHandler.java
@@ -23,7 +23,7 @@ public class GroupOperationHandler implements IOperationHandler {
 	private Log log = LogFactory.getLog(getClass());
 	@Override
 	public QueryResult handleOperation(DBCollection collection,
-			OutputFormatProps outputFormatProps, JsonObject operationArguments , OutputFormatRegistry registry)
+			OutputFormatProps outputFormatProps, JsonObject operationArguments , OutputFormatRegistry registry, String role, boolean authorization)
 			throws ProviderException {
 		GroupOperationDescriptor operationDescriptor = GSONUtil.getGSONInstance().fromJson(operationArguments, GroupOperationDescriptor.class);
 		validateArguments(operationDescriptor);

diff --git a/...du/emory/cci/bindaas/datasource/provider/mongodb/operation/MapReduceOperationHandler.java b/...du/emory/cci/bindaas/datasource/provider/mongodb/operation/MapReduceOperationHandler.java
@@ -25,7 +25,7 @@ public class MapReduceOperationHandler implements IOperationHandler {
 	private Log log = LogFactory.getLog(getClass());
 	@Override
 	public QueryResult handleOperation(DBCollection collection,
-			OutputFormatProps outputFormatProps, JsonObject operationArguments , OutputFormatRegistry registry)
+			OutputFormatProps outputFormatProps, JsonObject operationArguments , OutputFormatRegistry registry, String role, boolean authorization)
 			throws ProviderException {
 		MapReduceOperationDescriptor operationDescriptor = GSONUtil.getGSONInstance().fromJson(operationArguments, MapReduceOperationDescriptor.class);
 		validateArguments(operationDescriptor);

diff --git a/...a/edu/emory/cci/bindaas/datasource/provider/mongodb/operation/UpdateOperationHandler.java b/...a/edu/emory/cci/bindaas/datasource/provider/mongodb/operation/UpdateOperationHandler.java
@@ -39,7 +39,7 @@ public QueryResult handleOperation(DBCollection collection,
 		if(authorization) {
 			for(DBObject o : cursor) {
 				if(!getAuthorizationRulesCache().getIfPresent(role).
-						contains(o.get("Project").toString())){
+						contains(o.get("project").toString())){
 					throw new ProviderException(MongoDBProvider.class.getName() , MongoDBProvider.VERSION, "Not authorized to execute this query.");
 				}
 			}