diff --git a/dashboard/src/views/users.html b/dashboard/src/views/users.html index ab878435b..383d575cc 100644 --- a/dashboard/src/views/users.html +++ b/dashboard/src/views/users.html @@ -626,61 +626,6 @@ -
-

{{ 'users.exposedLdap.title' | tr }}

-
- -
-
-
-
{{ 'users.exposedLdap.description' | tr }}
- -
- -
-
-
- -
-
- -
- - - - -
-
-
- -

- -
{{ userDirectoryConfig.error.secret }}
-
-
- -

{{ 'users.exposedLdap.ipRestriction.description' | tr }}

- -
{{ userDirectoryConfig.error.allowlist }}
-
-
-
- -
- -
- {{ userDirectoryConfig.error.generic }} - - -
-
-
-
-

{{ 'oidc.title' | tr }}

diff --git a/dashboard/src/views/users.js b/dashboard/src/views/users.js index 968efa0ec..82774ee8a 100644 --- a/dashboard/src/views/users.js +++ b/dashboard/src/views/users.js @@ -9,16 +9,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$location', '$translate', '$timeout', 'Client', function ($scope, $location, $translate, $timeout, Client) { Client.onReady(function () { if (!Client.getUserInfo().isAtLeastUserManager) $location.path('/'); }); - $scope.ldapProvider = [ - { name: 'Active Directory', value: 'ad' }, - { name: 'Cloudron', value: 'cloudron' }, - { name: 'Jumpcloud', value: 'jumpcloud' }, - { name: 'Okta', value: 'okta' }, - { name: 'Univention Corporate Server (UCS)', value: 'univention' }, - { name: 'Other', value: 'other' }, - { name: 'Disabled', value: 'noop' } - ]; - $scope.ready = false; $scope.users = []; // users of current page $scope.allUsersById = []; @@ -28,10 +18,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio $scope.userInfo = Client.getUserInfo(); $scope.domains = []; - $scope.openSubscriptionSetup = function () { - Client.openSubscriptionSetup($scope.$parent.subscription); - }; - $scope.roles = []; $scope.allUsers = []; // all the users and not just current page, have to load this for group assignment @@ -847,7 +833,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio refresh: function () { Client.getProfileConfig(function (error, result) { - if (error) return console.error('Unable to get directory config.', error); + if (error) return console.error('Unable to get profile config.', error); $scope.profileConfig.editableUserProfiles = !result.lockUserProfiles; $scope.profileConfig.mandatory2FA = !!result.mandatory2FA; @@ -884,50 +870,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio } }; - $scope.userDirectoryConfig = { - enabled: false, - secret: '', - allowlist: '', - error: null, - - refresh: function () { - Client.getUserDirectoryConfig(function (error, result) { - if (error) return console.error('Unable to get exposed ldap config.', error); - - $scope.userDirectoryConfig.enabled = !!result.enabled; - $scope.userDirectoryConfig.allowlist = result.allowlist; - $scope.userDirectoryConfig.secret = result.secret; - }); - }, - - submit: function () { - $scope.userDirectoryConfig.error = null; - $scope.userDirectoryConfig.busy = true; - $scope.userDirectoryConfig.success = false; - - var data = { - enabled: $scope.userDirectoryConfig.enabled, - secret: $scope.userDirectoryConfig.secret, - allowlist: $scope.userDirectoryConfig.allowlist - }; - - Client.setUserDirectoryConfig(data, function (error) { - $scope.userDirectoryConfig.busy = false; - - if (error && error.statusCode === 400) { - if (error.message.indexOf('secret') !== -1) return $scope.userDirectoryConfig.error = { secret: error.message }; - else return $scope.userDirectoryConfig.error = { allowlist: error.message }; - } - if (error) return $scope.userDirectoryConfig.error = { generic: error.message }; - - $scope.userDirectoryConfigForm.$setUntouched(); - $scope.userDirectoryConfigForm.$setPristine(); - - $scope.userDirectoryConfig.success = true; - }); - } - }; - function getUsers(callback) { var users = []; @@ -1024,7 +966,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio Client.onReady(function () { refresh(); if ($scope.user.isAtLeastAdmin) $scope.profileConfig.refresh(); - if ($scope.user.isAtLeastAdmin) $scope.userDirectoryConfig.refresh(); if ($scope.user.isAtLeastAdmin) getAllDomains(); refreshAllUsers(); @@ -1102,23 +1043,5 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio $timeout(function () { $('#setGhostClipboardButton').tooltip('hide'); }, 2000); }); - new Clipboard('#userDirectoryUrlClipboardButton').on('success', function(e) { - $('#userDirectoryUrlClipboardButton').tooltip({ - title: 'Copied!', - trigger: 'manual' - }).tooltip('show'); - - $timeout(function () { $('#userDirectoryUrlClipboardButton').tooltip('hide'); }, 2000); - - e.clearSelection(); - }).on('error', function(/*e*/) { - $('#userDirectoryUrlClipboardButton').tooltip({ - title: 'Press Ctrl+C to copy', - trigger: 'manual' - }).tooltip('show'); - - $timeout(function () { $('#userDirectoryUrlClipboardButton').tooltip('hide'); }, 2000); - }); - $('.modal-backdrop').remove(); }]);