From 8deb28f8eb62a208c16db738e1325769b6a87c5c Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Wed, 24 Jan 2018 16:20:56 +0100 Subject: [PATCH] Add multiselect to enable mailboxes per user and domain --- webadmin/src/views/users.html | 24 +++++--- webadmin/src/views/users.js | 107 ++++++++++++++++++++++++++++------ 2 files changed, 106 insertions(+), 25 deletions(-) diff --git a/webadmin/src/views/users.html b/webadmin/src/views/users.html index 04aabf923..911d93842 100644 --- a/webadmin/src/views/users.html +++ b/webadmin/src/views/users.html @@ -91,13 +91,8 @@
-
- - -
- - +
An email is required This is not a valid email @@ -105,6 +100,15 @@
+
+ +
+ An email is required + This is not a valid email + {{ useredit.error.fallbackEmail }} +
+ +
@@ -114,7 +118,13 @@
No groups available.
-
+
+ +
+ +
+
+
diff --git a/webadmin/src/views/users.js b/webadmin/src/views/users.js index 264d9dfa1..94a2e3267 100644 --- a/webadmin/src/views/users.js +++ b/webadmin/src/views/users.js @@ -2,6 +2,22 @@ /* global Clipboard */ +// poor man's async +function asyncForEach(items, handler, callback) { + var cur = 0; + + if (items.length === 0) return callback(); + + (function iterator() { + handler(items[cur], function () { + if (cur >= items.length-1) return callback(); + ++cur; + + iterator(); + }); + })(); +} + angular.module('Application').controller('UsersController', ['$scope', '$location', '$timeout', 'Client', function ($scope, $location, $timeout, Client) { Client.onReady(function () { if (!Client.getUserInfo().admin) $location.path('/'); }); @@ -11,6 +27,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio $scope.groupsById = { }; $scope.config = Client.getConfig(); $scope.userInfo = Client.getUserInfo(); + $scope.emailDomains = []; // FIXME this needs a whole lot of rework as it is used for alias ui, which now needs to be multidomain aware $scope.mailConfig = { @@ -150,6 +167,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio email: '', fallbackEmail: '', aliases: '', + emailAddresses: [], + availableEmailAddresses: [], superuser: false, show: function (userInfo) { @@ -160,14 +179,29 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio $scope.useredit.groupIds = angular.copy(userInfo.groupIds); $scope.useredit.superuser = userInfo.groupIds.indexOf('admin') !== -1; + $scope.useredit.availableEmailAddresses = $scope.emailDomains.map(function (d) { return userInfo.username + '@' + d.domain; }); + $scope.useredit.emailAddresses = []; $scope.useredit.aliases = ''; Client.getAliases(userInfo.id, function (error, aliases) { if (error) console.error(error); - $scope.useredit.aliases = aliases.join(','); }); + var tmp = []; + asyncForEach($scope.emailDomains, function (domain, callback) { + Client.getUserMailbox(domain.domain, userInfo.id, function (error) { + if (error) return callback(); + + tmp.push(userInfo.username + '@' + domain.domain); + + callback(); + }); + }, function () { + // we need this copy as angular multiselect cannot deal with dynamic arrays! + $scope.useredit.emailAddresses = tmp; + }); + $scope.useredit_form.$setPristine(); $scope.useredit_form.$setUntouched(); @@ -195,7 +229,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio var data = { id: $scope.useredit.userInfo.id, - email: $scope.useredit.email + email: $scope.useredit.email, + fallbackEmail: $scope.useredit.fallbackEmail }; Client.updateUser(data, function (error) { @@ -222,30 +257,44 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio Client.setGroups(data.id, $scope.useredit.groupIds, function (error) { if (error) return console.error('Unable to update groups for user:', error); - var aliases = $scope.useredit.aliases ? $scope.useredit.aliases.split(',') : [ ]; - var setAliasesFunc = Client.setAliases.bind(null, $scope.useredit.userInfo.id, aliases); + // var aliases = $scope.useredit.aliases ? $scope.useredit.aliases.split(',') : [ ]; + // var setAliasesFunc = Client.setAliases.bind(null, $scope.useredit.userInfo.id, aliases); - // cannot set aliases without username - if (!$scope.useredit.userInfo.username) setAliasesFunc = function (next) { return next(); }; + // // cannot set aliases without username + // if (!$scope.useredit.userInfo.username) setAliasesFunc = function (next) { return next(); }; - setAliasesFunc(function (error) { + // setAliasesFunc(function (error) { + + // if (error) { + // if (error.statusCode === 400) { + // $scope.useredit.error.aliases = 'One or more aliases is invalid'; + // } else if (error.statusCode === 409) { + // $scope.useredit.error.aliases = 'One or more aliases already taken'; + // } else { + // console.error('Unable to update aliases for user:', error); + // } + // return; + // } + + asyncForEach($scope.useredit.availableEmailAddresses, function (address, callback) { + var isEnabled = !!$scope.useredit.emailAddresses.find(function (a) { return a === address; }); + + var domain = $scope.emailDomains.find(function (d) { return address.split('@')[1] === d.domain; }); + if (!domain) console.error('Domain not found. Internal error should not happen.'); + + // TODO we could be smarter and check if the selection has actually changed + if (isEnabled) Client.enableUserMailbox(domain.domain, $scope.useredit.userInfo.id, callback); + else Client.disableUserMailbox(domain.domain, $scope.useredit.userInfo.id, callback); + }, function (error) { $scope.useredit.busy = false; - if (error) { - if (error.statusCode === 400) { - $scope.useredit.error.aliases = 'One or more aliases is invalid'; - } else if (error.statusCode === 409) { - $scope.useredit.error.aliases = 'One or more aliases already taken'; - } else { - console.error('Unable to update aliases for user:', error); - } - return; - } + if (error) return console.error('unable to adjust email addresses.', error); $scope.useredit.userInfo = {}; $scope.useredit.email = ''; $scope.useredit.superuser = false; $scope.useredit.groupIds = []; + $scope.useredit.emailAddresses = []; $scope.useredit.aliases = ''; $scope.useredit_form.$setPristine(); @@ -408,7 +457,29 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio $scope.users = result; - $scope.ready = true; + Client.getDomains(function (error, result) { + if (error) return console.error('Unable to get domain listing.', error); + + // reset so we can push the fresh config + $scope.emailDomains = []; + + asyncForEach(result, function (domain, callback) { + Client.getMailConfigForDomain(domain.domain, function (error, mailConfig) { + if (error) return callback(error); + + domain.mailConfig = mailConfig; + + // only collect domains where email is enabled + if (mailConfig.enabled) $scope.emailDomains.push(domain); + + callback(); + }); + }, function (error) { + if (error) return console.error('Unable to get mail config for domains.', error); + + $scope.ready = true; + }); + }); }); }); }