From 4dfa7dc5996b7288e9f9a86fe37548139ae0026b Mon Sep 17 00:00:00 2001
From: Zolfa <zolfa@lilik.it>
Date: Wed, 11 Nov 2020 11:58:21 +0100
Subject: [PATCH] Add support for multiple users in frontend and backend.

---
 lilik_users.py  |  3 +++
 static/add.html |  4 ++--
 static/add.js   | 29 ++++++++++++++++++++++++++---
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/lilik_users.py b/lilik_users.py
index 0aa01fe..8032620 100755
--- a/lilik_users.py
+++ b/lilik_users.py
@@ -136,6 +136,9 @@ def new_user(group_cn, new_uid):
         else:
             ldapmanager_create_uid(new_uid, group_cn, request.json['newEntry'])
             g.add_member(group_cn, new_uid)
+            if 'memberOf' in request.json['newEntry']:
+                for extra_group in request.json['newEntry']['memberOf']:
+                    g.add_member(extra_group, new_uid)
             new_passwd = g.reset_password(new_uid)
             result = { "failed": False,
                        "newPasswd": new_passwd }
diff --git a/static/add.html b/static/add.html
index fb50a74..01cc760 100644
--- a/static/add.html
+++ b/static/add.html
@@ -36,7 +36,7 @@
 	    <div class="form-group">
 	         <label for="newExtraGroups">Gruppi aggiuntivi</label>
 		 <select multiple class="form-control" id="newExtraGroups" ng-model="newExtraGroups" ng-readonly="startConfirm">
-		     <option ng-repeat="(key,value) in groups | filter notPrincipal" value="{{key}}">{{value}}</option> 
+		     <option ng-repeat="(key,value) in groups | excludeKey: newGroup" value="{{key}}">{{value}}</option>
 		 </select>
             <div class="form-group">
                 <label for="newUid">Username</label>
@@ -63,7 +63,7 @@
             <button ng-disabled="creationPending" ng-show="startConfirm && !newPasswd && !createError" class="btn btn-lg btn-primary btn-block" type="submit" ng-click="confirmNewUser()">Conferma</button>
             <div ng-show="newPasswd" class="alert alert-success" role="alert">
                 <h4>Utente creato!</h4>
-                <p>Quella che segue è la password temporanea. Comunicala all'utente attraverso un canale sicuro e invitalo a modificarla prima di ogni altra cosa, 
+                <p>Quella che segue è la password temporanea. Comunicala all'utente attraverso un canale sicuro e invitalo a modificarla prima di ogni altra cosa,
                 accedendo a <u>https://login.lilik.it</u>. Copiala e inviala ora, non verrà mostrata in un secondo momento!</p>
                 <hr>
                 <h2 class="text-monospace text-center">{{newPasswd}}</h2>
diff --git a/static/add.js b/static/add.js
index cd2262e..c3156b0 100644
--- a/static/add.js
+++ b/static/add.js
@@ -12,6 +12,22 @@
 
         var lilikAddUserApp = angular.module('lilikAddUserApp', []);
 
+        lilikAddUserApp.filter('excludeKey', function() {
+            return function(input, search) {
+		if (!input) return input;
+		if (!search) return input;
+		var excluded_key = ('' + search);
+		var result = {};
+		angular.forEach(input, function(value, key) {
+		    var actual_key = ('' + key);
+		    if (actual_key != excluded_key) {
+			result[key] = value;
+		    }
+		});
+		return result;
+	    }
+	});
+
         lilikAddUserApp.controller('AddUserController', function AddUserController($scope, $http) {
             // Initialize scope variable
             $scope.showLoginForm = true;
@@ -19,11 +35,16 @@
             $scope.showConfirmForm = false;
             $scope.startConfirm = false;
 	    $scope.creationPending = false;
+	    $scope.newExtraGroups = [];
 
             $scope.typingUser = function () {
                 $scope.newUid = $scope.newUid.toLowerCase().replace(' ', '-');
                 $scope.newCn = $scope.newUid.replace('-',' ').replace(/(^\w|\s\w)/g, m => m.toUpperCase());
-            }; 
+            };
+
+	    $scope.notPrincipal = function (group) {
+		return group.key !== $scope.newGroup;
+	    }
 
             // Try to login and download groups
             $scope.getGroups = function () {
@@ -52,7 +73,8 @@
             $scope.confirmNewUser = function () {
                 newEntry = {
                              "cn": $scope.newCn,
-                             "sn": $scope.newSn
+                             "sn": $scope.newSn,
+		             "memberOf": $scope.newExtraGroups
                            };
                 $http.post('../user_backend/group/'+$scope.newGroup+'/create/'+$scope.newUid,
                            {
@@ -67,7 +89,7 @@
                     } else {
                         $scope.createError = result.reason;
                     }
-                });   
+                });
             };
 
             // Clear old user scope variable and start creating another
@@ -77,6 +99,7 @@
                 delete $scope.newUid;
                 delete $scope.newCn;
                 delete $scope.newSn;
+		$scope.newExtraGroups = [];
                 $scope.startConfirm = false;
             };