Add configurable uid and organization attributes to the AppModel. Turn

off the profile settings for the default theme since it is not using tokens anymore.
NCEAS · May 31, 2017 · c77c817 · c77c817
1 parent 24a5ba1
commit c77c817
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git a/metacatui/src/main/webapp/js/models/AppModel.js b/metacatui/src/main/webapp/js/models/AppModel.js
@@ -30,6 +30,8 @@ define(['jquery', 'underscore', 'backbone'],
 			userProfiles: true,
 			profileUsername: null,
 
+			ldapUidAttribute: "uid",
+			ldapOrgAttribute: "o",
 			ldapDNSuffix: "dc=ecoinformatics,dc=org",
 
 			useJsonp: true,

diff --git a/metacatui/src/main/webapp/js/models/UserModel.js b/metacatui/src/main/webapp/js/models/UserModel.js
@@ -351,8 +351,10 @@ define(['jquery', 'underscore', 'backbone', 'jws', 'models/Search', "collections
 
 			if(!username) return;
 
-			if((username.indexOf("uid=") > -1) && (username.indexOf(",") > -1))
-				fullName = username.substring(username.indexOf("uid=") + 4, username.indexOf(","));
+			var ldapUidAttribute = appModel.get("ldapUidAttribute") || "uid" || "";
+
+			if((username.indexOf(ldapUidAttribute + "=") > -1) && (username.indexOf(",") > -1))
+				fullName = username.substring(username.indexOf(ldapUidAttribute + "=") + 4, username.indexOf(","));
 			else if((username.indexOf("CN=") > -1) && (username.indexOf(",") > -1))
 				fullName = username.substring(username.indexOf("CN=") + 3, username.indexOf(","));
 

diff --git a/metacatui/src/main/webapp/js/themes/default/config.js b/metacatui/src/main/webapp/js/themes/default/config.js
@@ -6,5 +6,6 @@ var themeMap =
 		// example overrides are provided here
 		//'views/AboutView' : 'themes/' + theme + '/views/AboutView.js',
 		//'templates/navbar.html' : 'themes/' + theme + '/templates/navbar.html'
+		"templates/userProfileMenu.html" : "themes/" + theme + "/templates/userProfileMenu.html"
 		}
 };
diff --git a/metacatui/src/main/webapp/js/themes/default/templates/userProfileMenu.html b/metacatui/src/main/webapp/js/themes/default/templates/userProfileMenu.html
diff --git a/metacatui/src/main/webapp/js/themes/knb/models/AppModel.js b/metacatui/src/main/webapp/js/themes/knb/models/AppModel.js
@@ -29,6 +29,10 @@ define(['jquery', 'underscore', 'backbone'],
 
 			userProfiles: true,
 			profileUsername: null,
+
+			ldapUidAttribute: "uid",
+			ldapOrgAttribute: "o",
+			ldapDNSuffix: "dc=ecoinformatics,dc=org",
 
 			useJsonp: true,
 

diff --git a/metacatui/src/main/webapp/js/views/RegistryView.js b/metacatui/src/main/webapp/js/views/RegistryView.js
@@ -604,9 +604,9 @@ define(['jquery', 'underscore', 'backbone', 'bootstrap', 'jqueryform', 'views/Si
 				return false;
 			}	
 
-			formObj.username.value = "uid=" + formObj.elements["uid"].value + ",o="
-					+ formObj.elements["organization"].value
-					+ "," + appModel.get("ldapDNSuffix");
+			formObj.username.value = appModel.get("ldapUidAttribute") + "=" + formObj.elements["uid"].value + 
+					"," + appModel.get("ldapOrgAttribute") + "=" + formObj.elements["organization"].value +
+					"," + appModel.get("ldapDNSuffix");
 
 			// get the form data before replacing everything with the loading icon!
 			var formData = $("#loginForm").serialize();