fix bugs 747 757: fix user-update interface

[osm/osmclient.git] / osmclient / sol005 / user.py

diff --git a/osmclient/sol005/user.py b/osmclient/sol005/user.py
index ee572f1..2f635f0 100644 (file)
--- a/osmclient/sol005/user.py
+++ b/osmclient/sol005/user.py
@@ -23,7 +23,6 @@ from osmclient.common import utils
 from osmclient.common.exceptions import ClientException
 from osmclient.common.exceptions import NotFound
 import json
-import yaml
 
 
 class User(object):
@@ -39,8 +38,28 @@ class User(object):
     def create(self, name, user):
         """Creates a new OSM user
         """
-        if 'projects' in user and user['projects'] is not None:
-            user['projects'] = yaml.safe_load(user['projects'])
+        if not user["projects"] or (len(user["projects"]) == 1 and not user["projects"][0]):
+            del user["projects"]
+        elif len(user["projects"]) == 1:
+            user["projects"] = user["projects"][0].split(",")
+
+        if user["project_role_mappings"]:
+            project_role_mappings = []
+
+            for set_mapping in user["project_role_mappings"]:
+                set_mapping_clean = [m.strip() for m in set_mapping.split(",")]
+                project, roles = set_mapping_clean[0], set_mapping_clean[1:]
+
+                for role in roles:
+                    mapping = {"project": project, "role": role}
+
+                    if mapping not in project_role_mappings: 
+                        project_role_mappings.append(mapping)
+            
+            user["project_role_mappings"] = project_role_mappings
+        else:
+            del user["project_role_mappings"]
+
         http_code, resp = self._http.post_cmd(endpoint=self._apiBase,
                                        postfields_dict=user)
         #print('HTTP CODE: {}'.format(http_code))
@@ -64,18 +83,74 @@ class User(object):
     def update(self, name, user):
         """Updates an existing OSM user identified by name
         """
-        myuser  = self.get(name)
-        http_code, resp = self._http.put_cmd(endpoint='{}/{}'.format(self._apiBase,myuser['_id']),
-                                       postfields_dict=user)
-        #print('HTTP CODE: {}'.format(http_code))
-        #print('RESP: {}'.format(resp))
-        if http_code in (200, 201, 202, 204):
+        # print(user)
+        myuser = self.get(name)
+        update_user = {
+            "add_project_role_mappings": [],
+            "remove_project_role_mappings": [],
+        }
+
+        # if password is defined, update the password
+        if user["password"]:
+            update_user["password"] = user["password"]
+        if user["username"]:
+            update_user["username"] = user["username"]
+
+        if user["set-project"]:
+            # Remove project and insert project role mapping
+            for set_project in user["set-project"]:
+
+                set_project_clean = [m.strip() for m in set_project.split(",")]
+                project, roles = set_project_clean[0], set_project_clean[1:]
+
+                update_user["remove_project_role_mappings"].append({"project": project})
+
+                for role in roles:
+                    mapping = {"project": project, "role": role}
+                    update_user["add_project_role_mappings"].append(mapping)
+        
+        if user["remove-project"]:
+            for remove_project in user["remove-project"]:
+                update_user["remove_project_role_mappings"].append({"project": remove_project})
+
+        if user["add-project-role"]:
+            for add_project_role in user["add-project-role"]:
+                add_project_role_clean = [m.strip() for m in add_project_role.split(",")]
+                project, roles = add_project_role_clean[0], add_project_role_clean[1:]
+
+                for role in roles:
+                    mapping = {"project": project, "role": role}
+                    update_user["add_project_role_mappings"].append(mapping)
+
+        if user["remove-project-role"]:
+            for remove_project_role in user["remove-project-role"]:
+                remove_project_role_clean = [m.strip() for m in remove_project_role.split(",")]
+                project, roles = remove_project_role_clean[0], remove_project_role_clean[1:]
+
+                for role in roles:
+                    mapping = {"project": project, "role": role}
+                    update_user["remove_project_role_mappings"].append(mapping)
+
+        if not update_user["remove_project_role_mappings"]:
+            del update_user["remove_project_role_mappings"]
+        if not update_user["add_project_role_mappings"]:
+            del update_user["add_project_role_mappings"]
+        if not update_user:
+            raise ClientException("At least something should be changed.")
+
+        http_code, resp = self._http.put_cmd(endpoint='{}/{}'.format(self._apiBase, myuser['_id']),
+                                             postfields_dict=update_user)
+        # print('HTTP CODE: {}'.format(http_code))
+        # print('RESP: {}'.format(resp))
+        if http_code in (200, 201, 202):
             if resp:
                 resp = json.loads(resp)
             if not resp or 'id' not in resp:
                 raise ClientException('unexpected response from server - {}'.format(
                                       resp))
             print(resp['id'])
+        elif http_code == 204:
+            print('Updated')
         else:
             msg = ""
             if resp:
@@ -132,7 +207,7 @@ class User(object):
                     return user
         else:
             for user in self.list():
-                if name == user['name']:
+                if name == user['username']:
                     return user
         raise NotFound("User {} not found".format(name))