Add organisation in info?type=me service response

geonetwork · May 20, 2015 · 108431f · 108431f
1 parent 1dcfea8
commit 108431f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/core/src/main/java/jeeves/server/UserSession.java b/core/src/main/java/jeeves/server/UserSession.java
@@ -169,14 +169,22 @@ public Profile getProfile() {
 			return userDetails.getProfile();
 		}
 	}
-	public String getEmailAddr() {
-		User userDetails = getPrincipal();
-		if (userDetails == null) {
-			return null;   
-		} else {
-			return userDetails.getEmail();
-		}
-	}
+    public String getEmailAddr() {
+        User userDetails = getPrincipal();
+        if (userDetails == null) {
+            return null;
+        } else {
+            return userDetails.getEmail();
+        }
+    }
+    public String getOrganisation() {
+        User userDetails = getPrincipal();
+        if (userDetails == null) {
+            return null;
+        } else {
+            return userDetails.getOrganisation();
+        }
+    }
 
 	public int getUserIdAsInt()  { 
 		String id = getUserId();

diff --git a/core/src/main/java/org/fao/geonet/constants/Geonet.java b/core/src/main/java/org/fao/geonet/constants/Geonet.java
@@ -110,7 +110,8 @@ public static final class Elem {
 		public static final String ID         = "id";
 		public static final String ON         = "on";
 		public static final String METADATA   = "metadata";
-		public static final String NAME       = "name";
+        public static final String NAME       = "name";
+        public static final String ORGANISATION   = "organisation";
         public static final String NOTIFICATIONS = "notifications";
 		public static final String SURNAME    = "surname";
 		public static final String PROFILE    = "profile";

diff --git a/core/src/main/java/org/fao/geonet/services/main/Info.java b/core/src/main/java/org/fao/geonet/services/main/Info.java
@@ -327,7 +327,8 @@ private Element getMyInfo(ServiceContext context) {
 				.addContent(new Element(Geonet.Elem.ID).setText(userSession.getUserId()))
 				.addContent(new Element(Geonet.Elem.NAME).setText(userSession.getName()))
 				.addContent(new Element(Geonet.Elem.SURNAME).setText(userSession.getSurname()))
-				.addContent(new Element(Geonet.Elem.EMAIL).setText(emailAddr));
+                .addContent(new Element(Geonet.Elem.EMAIL).setText(emailAddr))
+                .addContent(new Element(Geonet.Elem.ORGANISATION).setText(userSession.getOrganisation()));
 
             if (emailAddr != null) {
                 data.addContent(new Element(Geonet.Elem.HASH).setText(org.apache.commons.codec.digest.DigestUtils.md5Hex(emailAddr)));