libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

[KEYCLOAK-10018] Adding search logic for user partials, too

Browse source
This commit is contained in:
Martin Reinhardt 2019-06-21 18:09:58 +02:00 committed by Stan Silvert
parent c08d0a626f
commit 36c47e7491
3 changed files with 40 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
themes/src/main/resources/theme/base/admin/resources/js/controllers/groups.js
View file

@ -1,20 +1,4 @@
function sortGroups(prop, arr) {
// sort current elements
arr.sort(function (a, b) {
if (a[prop] < b[prop]) { return -1; }
if (a[prop] > b[prop]) { return 1; }
return 0;
});
// check sub groups
arr.forEach(function (item, index) {
if (!!item.subGroups) {
sortGroups(prop, item.subGroups);
}
});
return arr;
};
module.controller('GroupListCtrl', function($scope, $route, $q, realm, Groups, GroupsCount, Group, GroupChildren, Notifications, $location, Dialog) {
module.controller('GroupListCtrl', function($scope, $route, $q, realm, Groups, GroupsCount, Group, GroupChildren, Notifications, $location, Dialog, ComponentUtils) {
$scope.realm = realm;
$scope.groupList = [
{
@ -63,7 +47,7 @@ module.controller('GroupListCtrl', function($scope, $route, $q, realm, Groups, G
{
"id" : "realm",
"name": "Groups",
"subGroups": sortGroups('name', groups)
"subGroups": ComponentUtils.sortGroups('name', groups)
}
];
if (angular.isDefined(search) && search !== '') {

33
themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js
View file

@ -1,6 +1,6 @@
module.controller('UserRoleMappingCtrl', function($scope, $http, realm, user, clients, client, Notifications, RealmRoleMapping,
ClientRoleMapping, AvailableRealmRoleMapping, AvailableClientRoleMapping,
CompositeRealmRoleMapping, CompositeClientRoleMapping) {
CompositeRealmRoleMapping, CompositeClientRoleMapping, ComponentUtils) {
$scope.realm = realm;
$scope.user = user;
$scope.selectedRealmRoles = [];
@ -232,17 +232,17 @@ module.controller('UserOfflineSessionsCtrl', function($scope, $location, realm,
module.controller('UserListCtrl', function($scope, realm, User, UserSearchState, UserImpersonation, BruteForce, Notifications, $route, Dialog) {
$scope.init = function() {
$scope.realm = realm;
UserSearchState.query.realm = realm.realm;
$scope.query = UserSearchState.query;
$scope.query.briefRepresentation = 'true';
if (!UserSearchState.isFirstSearch) $scope.searchQuery();
};
$scope.impersonate = function(userId) {
UserImpersonation.save({realm : realm.realm, user: userId}, function (data) {
if (data.sameRealm) {
@ -296,11 +296,11 @@ module.controller('UserListCtrl', function($scope, realm, User, UserSearchState,
userId : user.id
}, function() {
$route.reload();
if ($scope.users.length === 1 && $scope.query.first > 0) {
$scope.previousPage();
}
}
Notifications.success("The user has been deleted.");
}, function() {
Notifications.error("User couldn't be deleted");
@ -536,7 +536,7 @@ module.controller('UserCredentialsCtrl', function($scope, realm, user, $route, R
$scope.resetPassword = function() {
// hit enter without entering both fields - ignore
if (!$scope.passwordAndConfirmPasswordEntered()) return;
if ($scope.pwdChange) {
if ($scope.password != $scope.confirmPassword) {
Notifications.error("Password and confirmation does not match.");
@ -563,7 +563,7 @@ module.controller('UserCredentialsCtrl', function($scope, realm, user, $route, R
$scope.passwordAndConfirmPasswordEntered = function() {
return $scope.password && $scope.confirmPassword;
}
$scope.disableCredentialTypes = function() {
Dialog.confirm('Disable credentials', 'Are you sure you want to disable these users credentials?', function() {
UserCredentials.disableCredentialTypes({ realm: realm.realm, userId: user.id }, $scope.disableableCredentialTypes, function() {
@ -635,7 +635,7 @@ module.controller('UserFederationCtrl', function($scope, $location, $route, real
$scope.instancesLoaded = false;
if (!$scope.providers) $scope.providers = [];
$scope.addProvider = function(provider) {
console.log('Add provider: ' + provider.id);
$location.url("/create/user-storage/" + realm.realm + "/providers/" + provider.id);
@ -788,7 +788,7 @@ module.controller('GenericUserStorageCtrl', function($scope, $location, Notifica
if (!instance.config['priority']) {
instance.config['priority'] = ['0'];
}
if (providerFactory.properties) {
for (var i = 0; i < providerFactory.properties.length; i++) {
var configProperty = providerFactory.properties[i];
@ -1057,7 +1057,7 @@ module.controller('UserGroupMembershipCtrl', function($scope, $q, realm, user, U
});
promiseGetGroups.promise.then(function(groups) {
$scope.groupList = groups;
$scope.groupList = ComponentUtils.sortGroups('name', groups);
}, function (failed) {
Notifications.error(failed);
});
@ -1485,7 +1485,7 @@ module.controller('LDAPUserStorageCtrl', function($scope, $location, Notificatio
console.log('GenericCtrl: triggerChangedUsersSync');
triggerSync('triggerChangedUsersSync');
}
function triggerSync(action) {
UserStorageOperations.sync.save({ action: action, realm: $scope.realm.realm, componentId: $scope.instance.id }, {}, function(syncResult) {
@ -1721,8 +1721,3 @@ module.controller('LDAPMapperCreateCtrl', function($scope, realm, provider, mapp
});

31
themes/src/main/resources/theme/base/admin/resources/js/services.js
View file

@ -194,8 +194,26 @@ module.factory('Notifications', function($rootScope, $timeout) {
module.factory('ComponentUtils', function() {
function sortGroups(prop, arr) {
// sort current elements
arr.sort(function (a, b) {
if (a[prop] < b[prop]) { return -1; }
if (a[prop] > b[prop]) { return 1; }
return 0;
});
// check sub groups
arr.forEach(function (item, index) {
if (!!item.subGroups) {
sortGroups(prop, item.subGroups);
}
});
return arr;
};
var utils = {};
utils.sortGroups = sortGroups;
utils.findIndexById = function(array, id) {
for (var i = 0; i < array.length; i++) {
if (array[i].id === id) return i;
@ -254,7 +272,7 @@ module.factory('ComponentUtils', function() {
}
utils.addLastEmptyValueToMultivaluedLists = function(properties, config) {
if (!properties) {
return;
@ -291,24 +309,24 @@ module.factory('ComponentUtils', function() {
}
}
}
// Allows you to use ui-select2 with <input> tag.
// In HTML you will then use property.mvOptions like this:
// <input ui-select2="prop.mvOptions" ng-model="...
utils.addMvOptionsToMultivaluedLists = function(properties) {
if (!properties) return;
for (var i=0 ; i<properties.length ; i++) {
var prop = properties[i];
if (prop.type !== 'MultivaluedList') continue;
prop.mvOptions = {
'multiple' : true,
'simple_tags' : true,
'tags' : angular.copy(prop.options)
}
}
}
return utils;
@ -908,7 +926,7 @@ function roleControl($scope, realm, role, roles, clients,
Notifications.success("Role added to composite.");
});
};
$scope.deleteRealmRole = function() {
$scope.compositeSwitchDisabled=true;
$scope.selectedRealmMappingsToRemove = JSON.parse('[' + $scope.selectedRealmMappings + ']');
@ -2026,4 +2044,3 @@ module.factory('UserGroupMembershipCount', function($resource) {
}
});
});