[#1312] fix public link access and use for data objecs

2 files changed, 10 insertions, 3 deletions

diff --git a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/HomeController.groovy b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/HomeController.groovy
index 5e41842..e5f0337 100755
--- a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/HomeController.groovy
+++ b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/HomeController.groovy
@@ -65,14 +65,19 @@ class HomeController {
 		log.info("irodsFilePath:${filePath}")
 		String zone = MiscIRODSUtils.getZoneInPath(filePath)
 		log.info("zone:${zone}")
-		IRODSAccount irodsAccount = anonymousIrodsAccountForURIString(mungedIRODSURI)
-		session["SPRING_SECURITY_CONTEXT"] = irodsAccount
+
+		irodsAccount = session["SPRING_SECURITY_CONTEXT"]
+		if (irodsAccount == null) {
+			log.info("no account set up, create an anonymous login")
+			irodsAccount = anonymousIrodsAccountForURIString(mungedIRODSURI)
+			session["SPRING_SECURITY_CONTEXT"] = irodsAccount
+		}
+
 		/*
 		 * Need to figure out how to signal interface to 'reset' to new account and path?  
 		 */
 
 		render(view:"link", model:[absPath:filePath])
-
 	}
 
 	def starredCollections() {
diff --git a/idrop-web/release_notes.txt b/idrop-web/release_notes.txt
index 101915f..e34921d 100644
--- a/idrop-web/release_notes.txt
+++ b/idrop-web/release_notes.txt
@@ -56,6 +56,8 @@ Note that the following bug and feature requests are logged in GForge with relat
 **Lots of cleanups of html and styles as a result of ie testing on win8

 **Fix of login screen rendering on ie

 

+*[#1312] fix public link access to not override account if alread logged in

+

 ==Features==

 

 *[#984] iDrop web '2.0' redesign effort