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-linux-setup): python requests-toolbelt library for tui #7052

Merged
merged 3 commits into from Dec 11, 2023
Merged

fix(jans-linux-setup): python requests-toolbelt library for tui #7052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3ba0d2
fix(jans-linux-setup): python requests-toolbelt library for tui
devrimyatar Dec 11, 2023
7d848da
fix(jans-cli-tui): kc-saml swagger doc
devrimyatar Dec 11, 2023
b29a164
Merge branch 'main' into jans-cli-tui-requests-toolbelt
moabu Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions jans-cli-tui/cli_tui/jans_cli_tui.py
View file
Open in desktop
Expand Up @@ -682,6 +682,9 @@ def getTitledText(
next_widget = None
) -> AnyContainer:

if value is None:
value = ''

ta = TextArea(
text=str(value),
multiline=height > 1,
Expand Down
1 change: 1 addition & 0 deletions jans-cli-tui/setup.py
View file
Open in desktop
Expand Up @@ -90,6 +90,7 @@ def find_version(*file_paths):
"requests",
"urllib3",
"pyDes",
"requests-toolbelt"
],
classifiers=[
"Intended Audience :: Developers",
Expand Down
1 change: 1 addition & 0 deletions jans-linux-setup/jans_setup/app_info.json
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@
"PROMPT_TOOLKIT": "https://github.com/prompt-toolkit/python-prompt-toolkit/archive/refs/tags/3.0.33.zip",
"WCWIDTH": "https://github.com/jquast/wcwidth/archive/refs/tags/0.2.5.zip",
"PYGMENTS": "https://github.com/pygments/pygments/archive/refs/tags/2.13.0.zip",
"REQUESTS_TOOLBELT": "https://github.com/requests/toolbelt/archive/refs/tags/1.0.0.zip",
"CRYPTOGRAPHY": "https://files.pythonhosted.org/packages/20/8b/66600f5851ec7893ace9b74445d7eaf3499571b347e339d18c76c876b0f9/cryptography-37.0.4-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl",
"TWILIO_MAVEN": "https://repo1.maven.org/maven2/com/twilio/sdk/twilio/",
"TWILIO_VERSION": "7.17.0",
Expand Down
4 changes: 3 additions & 1 deletion jans-linux-setup/jans_setup/setup_app/installers/jans_cli.py
View file
Open in desktop
Expand Up @@ -22,6 +22,7 @@ class JansCliInstaller(BaseInstaller, SetupUtils):
(os.path.join(Config.dist_app_dir, 'prompt_toolkit.zip'), base.current_app.app_info['PROMPT_TOOLKIT']),
(os.path.join(Config.dist_app_dir, 'wcwidth.zip'), base.current_app.app_info['WCWIDTH']),
(os.path.join(Config.dist_app_dir, 'pygments.zip'), base.current_app.app_info['PYGMENTS']),
(os.path.join(Config.dist_app_dir, 'requests_toolbelt.zip'), base.current_app.app_info['REQUESTS_TOOLBELT']),
]

def __init__(self):
Expand Down Expand Up @@ -79,10 +80,11 @@ def install(self):
base.extract_from_zip(self.source_files[1][0], 'src/prompt_toolkit', os.path.join(self.pylib_dir, 'prompt_toolkit'))
base.extract_from_zip(self.source_files[2][0], 'wcwidth', os.path.join(self.pylib_dir, 'wcwidth'))
base.extract_from_zip(self.source_files[3][0], 'pygments', os.path.join(self.pylib_dir, 'pygments'))
base.extract_from_zip(self.source_files[4][0], 'requests_toolbelt', os.path.join(self.pylib_dir, 'requests_toolbelt'))

# extract yaml files
base.extract_file(base.current_app.jans_zip, 'jans-config-api/docs/jans-config-api-swagger.yaml', os.path.join(ops_dir, 'jca', 'jans-config-api-swagger.yaml'), ren=True)
plugin_yamls = ['fido2-plugin-swagger.yaml', 'jans-admin-ui-plugin-swagger.yaml', 'scim-plugin-swagger.yaml', 'user-mgt-plugin-swagger.yaml']
plugin_yamls = ['fido2-plugin-swagger.yaml', 'jans-admin-ui-plugin-swagger.yaml', 'scim-plugin-swagger.yaml', 'user-mgt-plugin-swagger.yaml', 'kc-saml-plugin-swagger.yaml']

if Config.install_jans_link:
plugin_yamls.append('jans-link-plugin-swagger.yaml')
Expand Down