Skip to content
Snippets Groups Projects
Commit 93091772 authored by William Enright's avatar William Enright
Browse files

restored user lookup on search page

Change-Id: I5787249fe339debfa8d371f392a8c37f53a1e0c7
parent b07a2f5a
No related branches found
No related tags found
No related merge requests found
......@@ -52,6 +52,10 @@ public class UserProfileService {
public UserProfile[] getUserProfile(String queryString, String field){
Endpoint endpoint = ADConnector.getConnection();
UserProfile[] profiles = null;
if (!queryString.startsWith("*"))
queryString = queryString.concat("*");
try{
QueryRequest queryRequest = buildRequest(endpoint);
Sentence sentence = null;
......
......@@ -92,18 +92,16 @@ $(document).ready(function() {
// search for Users on every keyup
$('#search').keyup(function(e) {
var input = e.currentTarget.value;
var inputLength = e.currentTarget.value.length;
// search for non empty input
if (input != '') {
// searchFunction(input);
var data = {
"username":input
"queryString":input
}
isSearch = true;
ajaxApiCall(api_path_get_user_extended_data, 'GET', data, null, searchFunction);
ajaxApiCall(api_path_get_user_directory_search, 'GET', data, null, searchFunction);
}
else
ajaxApiCall(api_path_get_user_extended_data, 'GET', null, null, listAllUsers);
ajaxApiCall(api_path_get_user_directory_search, 'GET', {"queryString":"*"}, null, listAllUsers);
// reset previous resultset
$('.user-data').remove();
......@@ -186,12 +184,12 @@ function addListenersForActions() {
userEdit = (e.currentTarget.getAttribute('user-id'));
var data = {
"username":userEdit
"queryString":userEdit
}
var URLSearchData = new URLSearchParams(data).toString();
// attempt auto-fill
ajaxApiCall(api_path_get_user_extended_data, 'GET', URLSearchData, null, handleUserAutofill);
ajaxApiCall(api_path_get_user_directory_search, 'GET', URLSearchData, null, handleUserAutofill);
......@@ -358,11 +356,11 @@ function handleUserCreation(data, statusCode, jqXHR) {
else
$('#user-pw-modal-body').text("New user successfully created. Here is the one time password: " + data.pw);
ajaxApiCall(api_path_get_user_directory_search, 'GET', null, null, listAllUsers);
ajaxApiCall(api_path_get_user_directory_search, 'GET', {"queryString":"*"}, null, listAllUsers);
}
function handleUserUpdate() {
ajaxApiCall(api_path_get_user_directory_search, 'GET', null, null, listAllUsers);
ajaxApiCall(api_path_get_user_directory_search, 'GET', {"queryString":"*"}, null, listAllUsers);
}
function handleUserExists(data) {
......@@ -421,7 +419,7 @@ function revokeUser(data, statusCode, jqXHR) {
isSearch = true;
}
ajaxApiCall(api_path_get_user_extended_data, 'GET', null, null, listAllUsers);
ajaxApiCall(api_path_get_user_directory_search, 'GET', {"queryString":"*"}, null, listAllUsers);
userRevoke = '';
}
......
......@@ -82,10 +82,14 @@ public class UserProfileService {
public static SearchRequest buildRequest(String queryString, String field) {
if (!queryString.startsWith("*"))
queryString = queryString.concat("*");
if(field.equals("LOGON_NAME")) {
return SearchRequest.builder()
.dn(LDAPConnector.settings.getBaseDN())
.filter("(&("+LDAPConnector.settings.getUsernameField()+"=" + queryString + "))")
.filter("(&(uid=" + queryString + "))")
.build();
}
if(field.equals("FULL_TEXT_NAME")){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment