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

[<rv...@us...>]

Revision: 473
          http://treebase.svn.sourceforge.net/treebase/?rev=473&view=rev
Author:   rvos
Date:     2010-01-19 17:59:08 +0000 (Tue, 19 Jan 2010)

Log Message:
-----------
Factored isReviewerAccessGranted out to ControllerUtil - this is necessary because not just form controllers but also download controllers and the phylowidget controller need to have access to it. Also, it can be a static anyway so it looks like a utility method.

Modified Paths:
--------------
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java	2010-01-19 17:54:19 UTC (rev 472)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java	2010-01-19 17:59:08 UTC (rev 473)
@@ -153,7 +153,7 @@
 	protected ModelAndView getConditionalModelAndView(
 		HttpServletRequest pRequest,
 		ModelAndView pModelAndView) {
-		if ( isReviewerAccessGranted(pRequest) || isAuthorizationChecked() ) {
+		if ( ControllerUtil.isReviewerAccessGranted(pRequest) || isAuthorizationChecked() ) {
 			return pModelAndView;
 		} else {
 			return new ModelAndView(AUTHORIZATION_VIOLATION_VIEW);
@@ -170,7 +170,7 @@
 			LOGGER.info("returning supplied ModelAndView because access was granted explicitly");
 			return super.showForm(pRequest, pResponse, pBindException, pMap);
 		}
-		if (isReviewerAccessGranted(pRequest)) {
+		if (ControllerUtil.isReviewerAccessGranted(pRequest)) {
 			LOGGER.info("returning supplied ModelAndView because reviewer access was granted");
 			return super.showForm(pRequest, pResponse, pBindException, pMap);
 		} else {
@@ -179,35 +179,6 @@
 		}
 	}
 
-	private boolean isReviewerAccessGranted(HttpServletRequest req) {
-		boolean passedHashedIDCheck = false;
-		HttpSession session = req.getSession();
-		if ( "cancel".equals(req.getParameter("agreement")) ) {
-			session.setAttribute(Constants.REVIEWER_AGREEMENT_ACCEPTED, false);
-		}	
-		if ( "ok".equals(req.getParameter("agreement")) ) {
-			session.setAttribute(Constants.REVIEWER_AGREEMENT_ACCEPTED, true);
-		}
-		Object xAccesCodeObject = session.getAttribute(Constants.X_ACCESS_CODE);
-		if ( xAccesCodeObject != null ) {
-			String suppliedHashedID = xAccesCodeObject.toString();
-			TreebaseIDString tbidstr = new TreebaseIDString(Study.class,Long.parseLong(req.getParameter("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 agreement - agreement acceptance: "+agreementAccepted);
-					session.setAttribute("displayAgreement",true);
-				}
-				else {
-					LOGGER.info("Not displaying agreement");					
-					session.setAttribute("displayAgreement",false);
-				}				
-			}
-		}		
-		return passedHashedIDCheck;
-	}
-
 	protected ModelAndView setAttributeAndShowForm(
 		HttpServletRequest request,
 		HttpServletResponse response,


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