Browse Source

Fixed conflict.

hotfix/merge
Marcos Pereira 6 years ago
parent
commit
e8ef29da6a
  1. 2
      README.md
  2. 4
      docs/source/index.rst
  3. 16
      keycloak/keycloak_admin.py
  4. 1
      keycloak/urls_patterns.py

2
README.md

@ -47,7 +47,7 @@ The documentation for python-keycloak is available on [readthedocs](http://pytho
* [Shon T. Urbas](shon.urbas@gmail.com>) * [Shon T. Urbas](shon.urbas@gmail.com>)
* [Markus Spanier]() * [Markus Spanier]()
* [Remco Kranenburg]() * [Remco Kranenburg]()
* [Remco Kranenburg]()
* [Armin]()
## Usage ## Usage

4
docs/source/index.rst

@ -68,6 +68,10 @@ Contributors
* `Agriness Team <http://www.agriness.com/pt/>`_ * `Agriness Team <http://www.agriness.com/pt/>`_
* `Martin Devlin <martin.devlin@pearson.com>`_ * `Martin Devlin <martin.devlin@pearson.com>`_
* `Shon T. Urbas <shon.urbas@gmail.com>`_ * `Shon T. Urbas <shon.urbas@gmail.com>`_
* `Shon T. Urbas <shon.urbas@gmail.com>`_
* `Shon T. Urbas <shon.urbas@gmail.com>`_
* `Shon T. Urbas <shon.urbas@gmail.com>`_
* `Shon T. Urbas <shon.urbas@gmail.com>`_
Usage Usage
===== =====

16
keycloak/keycloak_admin.py

@ -17,12 +17,13 @@
# Unless otherwise stated in the comments, "id", in e.g. user_id, refers to the # Unless otherwise stated in the comments, "id", in e.g. user_id, refers to the
# internal Keycloak server ID, usually a uuid string # internal Keycloak server ID, usually a uuid string
from keycloak.urls_patterns import URL_ADMIN_CLIENT_ROLE from keycloak.urls_patterns import URL_ADMIN_CLIENT_ROLE
from .urls_patterns import \ from .urls_patterns import \
URL_ADMIN_USERS_COUNT, URL_ADMIN_USER, URL_ADMIN_USER_CONSENTS, \ URL_ADMIN_USERS_COUNT, URL_ADMIN_USER, URL_ADMIN_USER_CONSENTS, \
URL_ADMIN_SEND_UPDATE_ACCOUNT, URL_ADMIN_RESET_PASSWORD, URL_ADMIN_SEND_VERIFY_EMAIL, URL_ADMIN_GET_SESSIONS, \ URL_ADMIN_SEND_UPDATE_ACCOUNT, URL_ADMIN_RESET_PASSWORD, URL_ADMIN_SEND_VERIFY_EMAIL, URL_ADMIN_GET_SESSIONS, \
URL_ADMIN_SERVER_INFO, URL_ADMIN_CLIENTS, URL_ADMIN_CLIENT, URL_ADMIN_CLIENT_ROLES, URL_ADMIN_REALM_ROLES, \ URL_ADMIN_SERVER_INFO, URL_ADMIN_CLIENTS, URL_ADMIN_CLIENT, URL_ADMIN_CLIENT_ROLES, URL_ADMIN_REALM_ROLES, \
URL_ADMIN_GROUP, URL_ADMIN_GROUPS, URL_ADMIN_GROUP_CHILD, URL_ADMIN_USER_GROUP,\
URL_ADMIN_GROUP, URL_ADMIN_GROUPS, URL_ADMIN_GROUP_CHILD, URL_ADMIN_USER_GROUP, URL_ADMIN_GROUP_MEMBERS, \
URL_ADMIN_USER_GROUPS, URL_ADMIN_GROUP_PERMISSIONS, URL_ADMIN_USER_CLIENT_ROLES, URL_ADMIN_USER_STORAGE URL_ADMIN_USER_GROUPS, URL_ADMIN_GROUP_PERMISSIONS, URL_ADMIN_USER_CLIENT_ROLES, URL_ADMIN_USER_STORAGE
from .keycloak_openid import KeycloakOpenID from .keycloak_openid import KeycloakOpenID
@ -385,6 +386,19 @@ class KeycloakAdmin:
return self.get_subgroups(subgroup, path) return self.get_subgroups(subgroup, path)
return None return None
def get_group_members(self, group_id):
"""
Get members by group id. Returns group members
GroupRepresentation
http://www.keycloak.org/docs-api/3.2/rest-api/#_userrepresentation
:return: Keycloak server response (UserRepresentation)
"""
params_path = {"realm-name": self.realm_name, "id": group_id}
data_raw = self.connection.raw_get(URL_ADMIN_GROUP_MEMBERS.format(**params_path))
return raise_error_from_response(data_raw, KeycloakGetError)
def get_group_by_path(self, path, search_in_subgroups=False): def get_group_by_path(self, path, search_in_subgroups=False):
""" """
Get group id based on name or path. Get group id based on name or path.

1
keycloak/urls_patterns.py

@ -44,6 +44,7 @@ URL_ADMIN_GROUPS = "admin/realms/{realm-name}/groups"
URL_ADMIN_GROUP = "admin/realms/{realm-name}/groups/{id}" URL_ADMIN_GROUP = "admin/realms/{realm-name}/groups/{id}"
URL_ADMIN_GROUP_CHILD = "admin/realms/{realm-name}/groups/{id}/children" URL_ADMIN_GROUP_CHILD = "admin/realms/{realm-name}/groups/{id}/children"
URL_ADMIN_GROUP_PERMISSIONS = "admin/realms/{realm-name}/groups/{id}/management/permissions" URL_ADMIN_GROUP_PERMISSIONS = "admin/realms/{realm-name}/groups/{id}/management/permissions"
URL_ADMIN_GROUP_MEMBERS = "admin/realms/{realm-name}/groups/{id}/members"
URL_ADMIN_CLIENTS = "admin/realms/{realm-name}/clients" URL_ADMIN_CLIENTS = "admin/realms/{realm-name}/clients"
URL_ADMIN_CLIENT = "admin/realms/{realm-name}/clients/{id}" URL_ADMIN_CLIENT = "admin/realms/{realm-name}/clients/{id}"

Loading…
Cancel
Save