[Treebase-guts] SF.net SVN: treebase:[1007] trunk/treebase-web/src/main/java/org/cipres/ treebase/web

[<hs...@us...>]

Revision: 1007
          http://treebase.svn.sourceforge.net/treebase/?rev=1007&view=rev
Author:   hshyket
Date:     2012-01-03 19:35:57 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Fixing issue where reviewer was not able to access in progress submission

Modified Paths:
--------------
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/ControllerUtil.java

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java	2011-12-16 02:33:42 UTC (rev 1006)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java	2012-01-03 19:35:57 UTC (rev 1007)
@@ -19,6 +19,7 @@
 import org.cipres.treebase.domain.study.Study;
 import org.cipres.treebase.domain.study.StudyService;
 import org.cipres.treebase.web.Constants;
+import org.cipres.treebase.web.util.ControllerUtil;
 
 /**
  * This class re-directs clients to one of a number of other controllers depending
@@ -115,7 +116,7 @@
 	            	// output format is something else, re-direct to download services
 	            	else {
 	                    url = createDownloadUrl(tbID.getId(),serializationFormat,req);
-	                    if (!redirectDownload) {
+	                    if (!redirectDownload && !ControllerUtil.isReviewerAccessGranted(req, tbID)) {
 	                    	url = "/treebase-web/accessviolation.html";
 	                    }
 	            	}

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/ControllerUtil.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/ControllerUtil.java	2011-12-16 02:33:42 UTC (rev 1006)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/ControllerUtil.java	2012-01-03 19:35:57 UTC (rev 1007)
@@ -322,6 +322,37 @@
 			}
 		}		
 		return passedHashedIDCheck;
-	}	
+	}
+	
+	/**
+	 * 
+	 * This method passes an ID into the function
+	 * 
+	 */
+	public static boolean isReviewerAccessGranted(HttpServletRequest req, TreebaseIDString tbidstr ) {
+		boolean passedHashedIDCheck = false;
+		HttpSession session = req.getSession();
+	
+		Object xAccesCodeObject = session.getAttribute(Constants.X_ACCESS_CODE);
+		if ( xAccesCodeObject != null ) {
+			String suppliedHashedID = xAccesCodeObject.toString();
+			//TreebaseIDString tbidstr = new TreebaseIDString(Study.class,Long.parseLong((String) id));
+			if ( suppliedHashedID.equals(tbidstr.getNamespacedGUID().getHashedIDString()) ) {
+				passedHashedIDCheck = true;
+				Object agreementAccepted = session.getAttribute(Constants.REVIEWER_AGREEMENT_ACCEPTED);
+				if ( agreementAccepted == null || ((Boolean)agreementAccepted).booleanValue() == false ) {
+					LOGGER.info("Going to display object/file: "+agreementAccepted);
+					session.setAttribute("displayAgreement",true);
+				}
+				else {
+					LOGGER.info("Not going to display object/file");					
+					session.setAttribute("displayAgreement",false);
+				}				
+			}
+		}		
+		return passedHashedIDCheck;
+	}
+	
+	
 
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.