Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: jans-cli user patch #2334

Merged
merged 1 commit into from
Sep 8, 2022
Merged

fix: jans-cli user patch #2334

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 23 additions & 10 deletions jans-cli/cli/config_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1299,7 +1299,7 @@ def get_swagger_types(self, model, name):
def get_attrib_list(self):
for parent in self.menu:
for children in parent:
if children.info['operationId'] == 'get-attributes':
if children.info.get('operationId') == 'get-attributes':
attributes = self.process_get(children, return_value=True, parameters={'limit': 1000} )
attrib_names = []
for a in attributes:
Expand Down Expand Up @@ -1408,6 +1408,9 @@ def get_input_for_schema_(self, schema, model, spacing=0, initialised=False, get
if item['type'] == 'object' and not default:
default = {}

if not values_:
values_ = []

val = self.get_input(
values=values_,
text=prop,
Expand Down Expand Up @@ -1550,7 +1553,11 @@ def process_delete(self, endpoint):

def process_patch(self, endpoint):

if 'PatchOperation' in self.cfg_yml['components']['schemas']:
if endpoint.info['operationId'] == 'patch-user-by-inum':
schema = self.cfg_yml['components']['schemas']['CustomAttribute'].copy()
schema['__schema_name__'] = 'CustomAttribute'
model = getattr(swagger_client.models, 'CustomAttribute')
elif 'PatchOperation' in self.cfg_yml['components']['schemas']:
schema = self.cfg_yml['components']['schemas']['PatchOperation'].copy()
model = getattr(swagger_client.models, 'PatchOperation')
for item in schema['properties']:
Expand All @@ -1568,16 +1575,20 @@ def process_patch(self, endpoint):
url_param_val = self.get_input(text=url_param['name'], help_text='Entry to be patched')
body = []

if endpoint.info['operationId'] == 'patch-user-by-inum':
patch_op = self.get_input(text="Patch operation", values=['add', 'remove', 'replace'], help_text='The operation to be performed')

while True:
data = self.get_input_for_schema_(schema, model)
guessed_val = self.guess_bool(data.value)
if not guessed_val is None:
data.value = guessed_val
if my_op_mode != 'scim' and not data.path.startswith('/'):
data.path = '/' + data.path
if endpoint.info['operationId'] != 'patch-user-by-inum':
guessed_val = self.guess_bool(data.value)
if not guessed_val is None:
data.value = guessed_val
if my_op_mode != 'scim' and not data.path.startswith('/'):
data.path = '/' + data.path

if my_op_mode == 'scim':
data.path = data.path.replace('/', '.')
if my_op_mode == 'scim':
data.path = data.path.replace('/', '.')

body.append(data)
selection = self.get_input(text='Another patch operation?', values=['y', 'n'])
Expand All @@ -1600,7 +1611,9 @@ def process_patch(self, endpoint):

if my_op_mode == 'scim':
body = {'schemas': ['urn:ietf:params:scim:api:messages:2.0:PatchOp'], 'Operations': body}

elif endpoint.info['operationId'] == 'patch-user-by-inum':
patch_data = {'jsonPatchString': json.dumps([{'op': patch_op, 'path': '/dn', 'value': 'inum={},ou=people,o=jans'.format(url_param_val)}]), 'customAttributes':unmapped_body}
body = patch_data
try:
if url_param_val:
param_mapping = self.guess_param_mapping(url_param['name'])
Expand Down