Skip to content

Commit

Permalink
fix: jans-cli-tui working branch 6 (#3794)
Browse files Browse the repository at this point in the history 
* feat:jans-cli-tui path finder widget

* fix: jans-cli-tui SSA org_id, status and software_roles (#3765)

* fix: jans-cli-tui cli post params, mime-type and data types

* fix: jans-cli-tui fix saving scripts (ref: #3793)

* fix: jans-cli-tui adding scope to new client

* fix: jans-client-tui client deletion (ref: #3796)

* fix: jans-client-tui uncomment

* fix: jans-cli-tui display SSA base64 token (ref: #3797)

* fix: jans-cli-tui rename path finder for future use

* fix: jans-cli-tui display file save successfull message

---------

Co-authored-by: AbdelwahabAdam <abdelwahabosama.1@gmail.com>
  • Loading branch information
@devrimyatar @AbdelwahabAdam
devrimyatar and AbdelwahabAdam committed Feb 7, 2023
1 parent 7a6bcba commit afea59d
Show file tree
Hide file tree
Showing 8 changed files with 654 additions and 74 deletions.
129 changes: 85 additions & 44 deletions jans-cli-tui/cli_tui/cli/config_cli.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1060,27 +1060,31 @@ def get_scope_for_endpoint(self, endpoint):
return ' '.join(scope)


def get_requests(self, endpoint, params={}):
def get_requests(self, endpoint, params=None):
if not self.wrapped:
sys.stderr.write("Please wait while retrieving data ...\n")

security = self.get_scope_for_endpoint(endpoint)
self.get_access_token(security)

headers=self.get_request_header({'Accept': 'application/json'})
url_param_name = self.get_url_param(endpoint.path)

url = 'https://{}{}'.format(self.host, endpoint.path)

if params and url_param_name in params:
url = url.format(**{url_param_name: params.pop(url_param_name)})

response = requests.get(
url = url,
headers=self.get_request_header({'Accept': 'application/json'}),
params=params,
verify=self.verify_ssl,
cert=self.mtls_client_cert
)
get_params = {
'url': url,
'headers': headers,
'verify': self.verify_ssl,
'cert': self.mtls_client_cert,
}

if params:
get_params['params'] = params

response = requests.get(**get_params)
self.log_response(response)

if self.wrapped:
Expand Down Expand Up @@ -1108,22 +1112,29 @@ def get_mime_for_endpoint(self, endpoint, req='requestBody'):
return key


def post_requests(self, endpoint, data):
def post_requests(self, endpoint, data, params=None):
url = 'https://{}{}'.format(self.host, endpoint.path)
security = self.get_scope_for_endpoint(endpoint)
self.get_access_token(security)
mime_type = self.get_mime_for_endpoint(endpoint)

headers = self.get_request_header({'Accept': 'application/json', 'Content-Type': mime_type})
if mime_type:
headers['Content-Type'] = mime_type

response = requests.post(url,
headers=headers,
json=data,
verify=self.verify_ssl,
cert=self.mtls_client_cert
)
post_params = {
'url': url,
'headers': headers,
'verify': self.verify_ssl,
'cert': self.mtls_client_cert,
}

if params:
post_params['params'] = params

if mime_type.endswith(('json', 'text')):
post_params['json'] = data
else:
post_params['data'] = data

response = requests.post(**post_params)

self.log_response(response)

Expand All @@ -1144,7 +1155,8 @@ def delete_requests(self, endpoint, url_param_dict):
if url_params:
url_path = endpoint.path.format(**url_param_dict)
for param in url_params:
del url_param_dict[param]
if param in url_param_dict:
del url_param_dict[param]
else:
url_path = endpoint.path

Expand All @@ -1170,28 +1182,34 @@ def patch_requests(self, endpoint, url_param_dict, data):
url = 'https://{}{}'.format(self.host, endpoint.path.format(**url_param_dict))
security = self.get_scope_for_endpoint(endpoint)
self.get_access_token(security)
mime_type = self.get_mime_for_endpoint(endpoint)
headers = self.get_request_header({'Accept': 'application/json', 'Content-Type': mime_type})

content_key = 'application/json-patch+json'
for content_key in endpoint.info.get('requestBody', {}).get('content', {}):
break
patch_params = {
'url': url,
'headers': headers,
'verify': self.verify_ssl,
'cert': self.mtls_client_cert,
}

headers = self.get_request_header({'Accept': 'application/json', 'Content-Type': content_key})
data = data
response = requests.patch(
url=url,
headers=headers,
json=data,
verify=self.verify_ssl,
cert=self.mtls_client_cert
)
if url_param_dict:
patch_params['params'] = patch_params

if mime_type.endswith(('json', 'text')):
patch_params['json'] = data
else:
patch_params['data'] = data

response = requests.patch(**patch_params)
self.log_response(response)

try:
return response.json()
except:
self.print_exception(response.text)


def put_requests(self, endpoint, data, params={}):
def put_requests(self, endpoint, data, params=None):

security = self.get_scope_for_endpoint(endpoint)
self.get_access_token(security)
Expand All @@ -1204,13 +1222,25 @@ def put_requests(self, endpoint, data, params={}):
if params and url_param_name in params:
url = url.format(**{url_param_name: params.pop(url_param_name)})

response = requests.put(
url=url,
headers=self.get_request_header({'Accept': mime_type}),
json=data,
verify=self.verify_ssl,
cert=self.mtls_client_cert
)
headers = self.get_request_header({'Accept': 'application/json', 'Content-Type': mime_type})

put_params = {
'url': url,
'headers': headers,
'verify': self.verify_ssl,
'cert': self.mtls_client_cert,
}


if mime_type.endswith(('json', 'text')):
put_params['json'] = data
else:
put_params['data'] = data

if params:
put_params['params'] = params

response = requests.put(**put_params)

self.log_response(response)

Expand Down Expand Up @@ -1371,11 +1401,21 @@ def print_response(self, response):
sys.stderr.write("Server Response:\n")
self.pretty_print(response)


def read_binary_file(self, fn):
with open(fn, 'rb') as f:
return f.read()


def process_command_post(self, path, suffix_param, endpoint_params, data_fn, data):

# TODO: suffix_param, endpoint_params

endpoint = self.get_fake_endpoint(path)
mime_type = self.get_mime_for_endpoint(endpoint)
params = {}
params.update(suffix_param)
params.update(endpoint_params)

if not data and data_fn:

Expand All @@ -1385,15 +1425,16 @@ def process_command_post(self, path, suffix_param, endpoint_params, data_fn, dat
options={"verify_signature": False, "verify_exp": False, "verify_aud": False})
else:
try:
data = self.get_json_from_file(data_fn)
if mime_type.endswith(('json', 'text')):
data = self.get_json_from_file(data_fn)
else:
data = self.read_binary_file(data_fn)
except ValueError as ve:
self.exit_with_error(str(ve))

if path['__method__'] == 'post':
response = self.post_requests(endpoint, data)
response = self.post_requests(endpoint, data, params)
elif path['__method__'] == 'put':
params = endpoint_params.copy()
params.update(suffix_param)
response = self.put_requests(endpoint, data, params)

if self.wrapped:
Expand Down
Loading

0 comments on commit afea59d

Please sign in to comment.