Browse Source

style: fix flake8 styling issues

E121,E127,E128,E202,E203,E222,E225,E226,E231,E302,E303,W291,W293,W391
E711,F841
pull/293/head
Florian Best 3 years ago
parent
commit
c7a05c50c0
  1. 3
      docs/source/conf.py
  2. 1
      keycloak/exceptions.py
  3. 26
      keycloak/keycloak_admin.py
  4. 1
      keycloak/keycloak_openid.py
  5. 1
      keycloak/urls_patterns.py

3
docs/source/conf.py

@ -182,6 +182,3 @@ texinfo_documents = [
author, 'python-keycloak', 'One line description of project.', author, 'python-keycloak', 'One line description of project.',
'Miscellaneous'), 'Miscellaneous'),
] ]

1
keycloak/exceptions.py

@ -56,6 +56,7 @@ class KeycloakOperationError(KeycloakError):
class KeycloakDeprecationError(KeycloakError): class KeycloakDeprecationError(KeycloakError):
pass pass
class KeycloakGetError(KeycloakOperationError): class KeycloakGetError(KeycloakOperationError):
pass pass

26
keycloak/keycloak_admin.py

@ -224,7 +224,7 @@ class KeycloakAdmin:
# fetch until we can # fetch until we can
while True: while True:
query['first'] = page*self.PAGE_SIZE
query['first'] = page * self.PAGE_SIZE
partial_results = raise_error_from_response( partial_results = raise_error_from_response(
self.raw_get(url, **query), self.raw_get(url, **query),
KeycloakGetError) KeycloakGetError)
@ -271,7 +271,7 @@ class KeycloakAdmin:
:return: realm configurations JSON :return: realm configurations JSON
""" """
params_path = {"realm-name": self.realm_name, "export-clients": export_clients, "export-groups-and-roles": export_groups_and_role }
params_path = {"realm-name": self.realm_name, "export-clients": export_clients, "export-groups-and-roles": export_groups_and_role}
data_raw = self.raw_post(URL_ADMIN_REALM_EXPORT.format(**params_path), data="") data_raw = self.raw_post(URL_ADMIN_REALM_EXPORT.format(**params_path), data="")
return raise_error_from_response(data_raw, KeycloakGetError) return raise_error_from_response(data_raw, KeycloakGetError)
@ -606,7 +606,6 @@ class KeycloakAdmin:
return raise_error_from_response(data_raw, KeycloakGetError) return raise_error_from_response(data_raw, KeycloakGetError)
def add_user_social_login(self, user_id, provider_id, provider_userid, provider_username): def add_user_social_login(self, user_id, provider_id, provider_userid, provider_username):
""" """
Add a federated identity / social login provider to the user Add a federated identity / social login provider to the user
:param user_id: User id :param user_id: User id
@ -617,10 +616,9 @@ class KeycloakAdmin:
""" """
payload = {"identityProvider": provider_id, "userId": provider_userid, "userName": provider_username} payload = {"identityProvider": provider_id, "userId": provider_userid, "userName": provider_username}
params_path = {"realm-name": self.realm_name, "id": user_id, "provider": provider_id} params_path = {"realm-name": self.realm_name, "id": user_id, "provider": provider_id}
data_raw = self.raw_post(URL_ADMIN_USER_FEDERATED_IDENTITY.format(**params_path), data=json.dumps(payload))
self.raw_post(URL_ADMIN_USER_FEDERATED_IDENTITY.format(**params_path), data=json.dumps(payload))
def delete_user_social_login(self, user_id, provider_id): def delete_user_social_login(self, user_id, provider_id):
""" """
Delete a federated identity / social login provider from the user Delete a federated identity / social login provider from the user
:param user_id: User id :param user_id: User id
@ -794,7 +792,7 @@ class KeycloakAdmin:
if group['path'] == path: if group['path'] == path:
return group return group
res = self.get_subgroups(group, path) res = self.get_subgroups(group, path)
if res != None:
if res is not None:
return res return res
return None return None
@ -1182,7 +1180,7 @@ class KeycloakAdmin:
:param query: Additional Query parameters (see https://www.keycloak.org/docs-api/11.0/rest-api/index.html#_roles_resource) :param query: Additional Query parameters (see https://www.keycloak.org/docs-api/11.0/rest-api/index.html#_roles_resource)
:return: Keycloak Server Response (UserRepresentation) :return: Keycloak Server Response (UserRepresentation)
""" """
params_path = {"realm-name": self.realm_name, "role-name":role_name}
params_path = {"realm-name": self.realm_name, "role-name": role_name}
return self.__fetch_all(URL_ADMIN_REALM_ROLES_MEMBERS.format(**params_path), query) return self.__fetch_all(URL_ADMIN_REALM_ROLES_MEMBERS.format(**params_path), query)
def get_client_roles(self, client_id): def get_client_roles(self, client_id):
@ -1308,9 +1306,8 @@ class KeycloakAdmin:
:param query: Additional query parameters ( see https://www.keycloak.org/docs-api/11.0/rest-api/index.html#_clients_resource) :param query: Additional query parameters ( see https://www.keycloak.org/docs-api/11.0/rest-api/index.html#_clients_resource)
:return: Keycloak server response (UserRepresentation) :return: Keycloak server response (UserRepresentation)
""" """
params_path = {"realm-name": self.realm_name, "id":client_id, "role-name":role_name}
return self.__fetch_all(URL_ADMIN_CLIENT_ROLE_MEMBERS.format(**params_path) , query)
params_path = {"realm-name": self.realm_name, "id": client_id, "role-name": role_name}
return self.__fetch_all(URL_ADMIN_CLIENT_ROLE_MEMBERS.format(**params_path), query)
def create_realm_role(self, payload, skip_exists=False): def create_realm_role(self, payload, skip_exists=False):
""" """
@ -1951,7 +1948,6 @@ class KeycloakAdmin:
data_raw = self.raw_get(URL_ADMIN_DEFAULT_DEFAULT_CLIENT_SCOPES.format(**params_path)) data_raw = self.raw_get(URL_ADMIN_DEFAULT_DEFAULT_CLIENT_SCOPES.format(**params_path))
return raise_error_from_response(data_raw, KeycloakGetError) return raise_error_from_response(data_raw, KeycloakGetError)
def delete_default_default_client_scope(self, scope_id): def delete_default_default_client_scope(self, scope_id):
""" """
Delete default default client scope Delete default default client scope
@ -1963,7 +1959,6 @@ class KeycloakAdmin:
data_raw = self.raw_delete(URL_ADMIN_DEFAULT_DEFAULT_CLIENT_SCOPE.format(**params_path)) data_raw = self.raw_delete(URL_ADMIN_DEFAULT_DEFAULT_CLIENT_SCOPE.format(**params_path))
return raise_error_from_response(data_raw, KeycloakGetError, expected_codes=[204]) return raise_error_from_response(data_raw, KeycloakGetError, expected_codes=[204])
def add_default_default_client_scope(self, scope_id): def add_default_default_client_scope(self, scope_id):
""" """
Add default default client scope Add default default client scope
@ -1976,7 +1971,6 @@ class KeycloakAdmin:
data_raw = self.raw_put(URL_ADMIN_DEFAULT_DEFAULT_CLIENT_SCOPE.format(**params_path), data=json.dumps(payload)) data_raw = self.raw_put(URL_ADMIN_DEFAULT_DEFAULT_CLIENT_SCOPE.format(**params_path), data=json.dumps(payload))
return raise_error_from_response(data_raw, KeycloakGetError, expected_codes=[204]) return raise_error_from_response(data_raw, KeycloakGetError, expected_codes=[204])
def get_default_optional_client_scopes(self): def get_default_optional_client_scopes(self):
""" """
Return list of default optional client scopes Return list of default optional client scopes
@ -1987,7 +1981,6 @@ class KeycloakAdmin:
data_raw = self.raw_get(URL_ADMIN_DEFAULT_OPTIONAL_CLIENT_SCOPES.format(**params_path)) data_raw = self.raw_get(URL_ADMIN_DEFAULT_OPTIONAL_CLIENT_SCOPES.format(**params_path))
return raise_error_from_response(data_raw, KeycloakGetError) return raise_error_from_response(data_raw, KeycloakGetError)
def delete_default_optional_client_scope(self, scope_id): def delete_default_optional_client_scope(self, scope_id):
""" """
Delete default optional client scope Delete default optional client scope
@ -1999,7 +1992,6 @@ class KeycloakAdmin:
data_raw = self.raw_delete(URL_ADMIN_DEFAULT_OPTIONAL_CLIENT_SCOPE.format(**params_path)) data_raw = self.raw_delete(URL_ADMIN_DEFAULT_OPTIONAL_CLIENT_SCOPE.format(**params_path))
return raise_error_from_response(data_raw, KeycloakGetError, expected_codes=[204]) return raise_error_from_response(data_raw, KeycloakGetError, expected_codes=[204])
def add_default_optional_client_scope(self, scope_id): def add_default_optional_client_scope(self, scope_id):
""" """
Add default optional client scope Add default optional client scope
@ -2012,7 +2004,6 @@ class KeycloakAdmin:
data_raw = self.raw_put(URL_ADMIN_DEFAULT_OPTIONAL_CLIENT_SCOPE.format(**params_path), data=json.dumps(payload)) data_raw = self.raw_put(URL_ADMIN_DEFAULT_OPTIONAL_CLIENT_SCOPE.format(**params_path), data=json.dumps(payload))
return raise_error_from_response(data_raw, KeycloakGetError, expected_codes=[204]) return raise_error_from_response(data_raw, KeycloakGetError, expected_codes=[204])
def add_mapper_to_client(self, client_id, payload): def add_mapper_to_client(self, client_id, payload):
""" """
Add a mapper to a client Add a mapper to a client
@ -2346,7 +2337,7 @@ class KeycloakAdmin:
DELETE admin/realms/{realm-name}/users/{id}/role-mappings/realm DELETE admin/realms/{realm-name}/users/{id}/role-mappings/realm
""" """
params_path = {"realm-name": self.realm_name, "id": str(user_id) }
params_path = {"realm-name": self.realm_name, "id": str(user_id)}
data_raw = self.connection.raw_delete(URL_ADMIN_DELETE_USER_ROLE.format(**params_path), data_raw = self.connection.raw_delete(URL_ADMIN_DELETE_USER_ROLE.format(**params_path),
data=json.dumps(payload)) data=json.dumps(payload))
return raise_error_from_response(data_raw, KeycloakGetError, expected_codes=[204]) return raise_error_from_response(data_raw, KeycloakGetError, expected_codes=[204])
@ -2364,4 +2355,3 @@ class KeycloakAdmin:
self.URL_ADMIN_CLIENT_SESSION_STATS.format(**params_path) self.URL_ADMIN_CLIENT_SESSION_STATS.format(**params_path)
) )
return raise_error_from_response(data_raw, KeycloakGetError) return raise_error_from_response(data_raw, KeycloakGetError)

1
keycloak/keycloak_openid.py

@ -279,7 +279,6 @@ class KeycloakOpenID:
data_raw = self.connection.raw_get(URL_REALM.format(**params_path)) data_raw = self.connection.raw_get(URL_REALM.format(**params_path))
return raise_error_from_response(data_raw, KeycloakGetError)['public_key'] return raise_error_from_response(data_raw, KeycloakGetError)['public_key']
def entitlement(self, token, resource_server_id): def entitlement(self, token, resource_server_id):
""" """
Client applications can use a specific endpoint to obtain a special security token Client applications can use a specific endpoint to obtain a special security token

1
keycloak/urls_patterns.py

@ -130,4 +130,3 @@ URL_ADMIN_EVENTS = 'admin/realms/{realm-name}/events'
URL_ADMIN_DELETE_USER_ROLE = "admin/realms/{realm-name}/users/{id}/role-mappings/realm" URL_ADMIN_DELETE_USER_ROLE = "admin/realms/{realm-name}/users/{id}/role-mappings/realm"
URL_ADMIN_CLIENT_SESSION_STATS = "admin/realms/{realm-name}/client-session-stats" URL_ADMIN_CLIENT_SESSION_STATS = "admin/realms/{realm-name}/client-session-stats"
Loading…
Cancel
Save