EDUCATIC
/
digitaldemocratic
mirror of https://gitlab.com/digitaldemocratic/digitaldemocratic
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix-remove-roles-on-edit-user' into 'develop' 

Remove roles on edit user if changed

See merge request isard/isard-sso!55
Josep Maria Viñolas Auquer 2021-09-15 08:12:38 +00:00
parent 285930b332 a9ac4fe81d
commit 06bd30e312
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/src/admin/lib/admin.py
View File

@ -1158,6 +1158,8 @@ class Admin():
return True return True
def update_keycloak_user(self,user_id,user,kdelete,kadd): def update_keycloak_user(self,user_id,user,kdelete,kadd):
# pprint(self.keycloak.get_user_realm_roles(user_id))
self.keycloak.remove_user_realm_roles(user_id,'student')
self.keycloak.assign_realm_roles(user_id,user['roles'][0]) self.keycloak.assign_realm_roles(user_id,user['roles'][0])
for group in kdelete: for group in kdelete:
group_id = self.keycloak.get_group_by_path(gid2kpath(group))['id'] group_id = self.keycloak.get_group_by_path(gid2kpath(group))['id']
@ -1166,7 +1168,7 @@ class Admin():
group_id = self.keycloak.get_group_by_path(gid2kpath(group))['id'] group_id = self.keycloak.get_group_by_path(gid2kpath(group))['id']
self.keycloak.group_user_add(user_id,group_id) self.keycloak.group_user_add(user_id,group_id)
self.keycloak.user_update(user_id,user['enabled'],user['email'],user['firstname'],user['lastname']) self.keycloak.user_update(user_id,user['enabled'],user['email'],user['firstname'],user['lastname'])
self.resync_data()
return True return True
def enable_users(self,data): def enable_users(self,data):

3
admin/src/admin/lib/keycloak_client.py
View File

@ -215,8 +215,9 @@ class KeycloakClient():
# self.connect() # self.connect()
# return self.keycloak_admin.assign_role(client_id=client_id, user_id=user_id, role_id=role_id, role_name="test") # return self.keycloak_admin.assign_role(client_id=client_id, user_id=user_id, role_id=role_id, role_name="test")
def remove_user_roles(self,user_id,roles): def remove_user_realm_roles(self,user_id,roles):
self.connect() self.connect()
roles = [r for r in self.get_user_realm_roles(user_id) if r['name'] in ['admin','manager','teacher','student']]
return self.keycloak_admin.delete_realm_roles_of_user(user_id,roles) return self.keycloak_admin.delete_realm_roles_of_user(user_id,roles)
def delete_user(self,userid): def delete_user(self,userid):

2
admin/src/admin/static/js/users.js
View File

@ -239,6 +239,7 @@ $(document).ready(function() {
"url": "/api/user/"+formdata['id'], "url": "/api/user/"+formdata['id'],
data: JSON.stringify(formdata), data: JSON.stringify(formdata),
complete: function(jqXHR, textStatus) { complete: function(jqXHR, textStatus) {
table.ajax.reload();
switch (jqXHR.status) { switch (jqXHR.status) {
case 200: case 200:
$("#modalEditUser").modal('hide'); $("#modalEditUser").modal('hide');
@ -282,7 +283,6 @@ $(document).ready(function() {
} }
}); });
} }
table.ajax.reload();
}); });
//DataTable Main renderer //DataTable Main renderer
var table = $('#users').DataTable({ var table = $('#users').DataTable({