class UserTopicAuth(UserTopic):
# topic = "users"
# topic_msg = "users"
- # schema_new = user_new_schema
- # schema_edit = user_edit_schema
+ schema_new = user_new_schema
+ schema_edit = user_edit_schema
def __init__(self, db, fs, msg, auth):
UserTopic.__init__(self, db, fs, msg)
else:
final_content["project_role_mappings"] = edit_content["project_role_mappings"]
+ @staticmethod
+ def format_on_show(content):
+ """
+ Modifies the content of the role information to separate the role
+ metadata from the role definition.
+ """
+ project_role_mappings = []
+
+ for project in content["projects"]:
+ for role in project["roles"]:
+ project_role_mappings.append([project, role])
+
+ del content["projects"]
+ content["project_role_mappings"] = project_role_mappings
+
def new(self, rollback, session, indata=None, kwargs=None, headers=None):
"""
Creates a new entry into the authentication backend.
users = [user for user in self.auth.get_user_list() if user["_id"] == _id]
if len(users) == 1:
- return users[0]
+ return self.format_on_show(users[0])
elif len(users) > 1:
raise EngineException("Too many users found", HTTPStatus.CONFLICT)
else:
if "password" in content:
self.auth.change_password(content["name"], content["password"])
else:
- users = self.auth.get_user_list()
- user = [user for user in users if user["_id"] == content["_id"]][0]
- original_mapping = []
+ user = self.show(session, _id)
+ original_mapping = user["project_role_mappings"]
edit_mapping = content["project_role_mappings"]
-
- for project in user["projects"]:
- for role in project["roles"]:
- original_mapping += {
- "project": project["name"],
- "role": role["name"]
- }
mappings_to_remove = [mapping for mapping in original_mapping
if mapping not in edit_mapping]
for mapping in mappings_to_remove:
self.auth.remove_role_from_user(
user["name"],
- mapping["project"],
- mapping["role"]
+ mapping[0],
+ mapping[1]
)
for mapping in mappings_to_add:
self.auth.assign_role_to_user(
user["name"],
- mapping["project"],
- mapping["role"]
+ mapping[0],
+ mapping[1]
)
return content["_id"]
if not filter_q:
filter_q = {}
- return self.auth.get_user_list(filter_q)
+ users = [self.format_on_show(user) for user in self.auth.get_user_list(filter_q)]
+
+ return users
def delete(self, session, _id, dry_run=False):
"""
:param role_definitions: role definition to test
:return: None if ok, raises ValidationError exception on error
"""
- ignore_fields = ["_id", "name"]
+ ignore_fields = ["_id", "_admin", "name"]
for role_def in role_definitions.keys():
if role_def in ignore_fields:
continue
content[":"] = False
ignore_fields = ["_id", "_admin", "name"]
- for role_def, value in content.items():
+ content_keys = content.keys()
+ for role_def in content_keys:
if role_def in ignore_fields:
continue
- content[role_def.replace(".", ":")] = value
+ content[role_def.replace(".", ":")] = content[role_def]
del content[role_def]
@staticmethod
:param _id: server internal id
:return: dictionary, raise exception if not found.
"""
- filter_db = self._get_project_filter(session, write=False, show_all=True)
+ filter_db = self._get_project_filter(session)
filter_db["_id"] = _id
role = self.db.get_one(self.topic, filter_db)
if not filter_q:
filter_q = {}
+ if "root" in filter_q:
+ filter_q[":"] = filter_q["root"]
+ del filter_q["root"]
+
+ if len(filter_q) > 0:
+ keys = [key for key in filter_q.keys() if "." in key]
+
+ for key in keys:
+ filter_q[key.replace(".", ":")] = filter_q[key]
+ del filter_q[key]
+
roles = self.db.get_list(self.topic, filter_q)
new_roles = []