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

fix(jans-linux-setup): Jans KC install option #7521

Merged
merged 4 commits into from
Jan 24, 2024
Merged

fix(jans-linux-setup): Jans KC install option #7521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed27a2d
fix(jans-linux-setup): change Jans SAML to Jans KC
devrimyatar Jan 24, 2024
fc1c083
fix(jans-linux-setup): prompt Jans KC without pre-released option
devrimyatar Jan 24, 2024
3524ac4
fix(jans-linux-setup): change Jans Keyclock Link to Jans KC Link
devrimyatar Jan 24, 2024
9c26f1f
Merge branch 'main' into jans-linux-setup-saml-changes-2
moabu Jan 24, 2024
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
2 changes: 1 addition & 1 deletion jans-linux-setup/jans_setup/setup_app/installers/jans.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def get_install_string(prefix, install_var):
('Install Jans KC Link Server', 'install_jans_keycloak_link'),
('Install Jans Casa Server', 'install_casa'),
('Install Jans Lock', 'install_jans_lock'),
('Install Jans SAML', 'install_jans_saml')):
('Install Jans KC', 'install_jans_saml')):
txt += get_install_string(prompt_str, install_var)


Expand Down
1 change: 0 additions & 1 deletion jans-linux-setup/jans_setup/setup_app/installers/jans_saml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
class JansSamlInstaller(JettyInstaller):

install_var = 'install_jans_saml'
setattr(Config, install_var + '_pre_released', True)

source_files = [
(os.path.join(Config.dist_jans_dir, 'kc-jans-storage-plugin.jar'), os.path.join(base.current_app.app_info['JANS_MAVEN'], 'maven/io/jans/kc-jans-storage-plugin/{0}/kc-jans-storage-plugin-{0}.jar').format(base.current_app.app_info['jans_version'])),
Expand Down
2 changes: 1 addition & 1 deletion jans-linux-setup/jans_setup/setup_app/utils/arg_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
parser.add_argument('--install-jans-keycloak-link', help="Install Keycloak Link Server", action='store_true')

parser.add_argument('--with-casa', help="Install Jans Casa Server", action='store_true')
parser.add_argument('--install-jans-saml', help="Install Jans SAML", action='store_true')
parser.add_argument('--install-jans-saml', help="Install Jans KC", action='store_true')
parser.add_argument('--install-jans-lock', help="Install Jans Lock", action='store_true')
parser.add_argument('--install-opa', help="Install OPA", action='store_true')

Expand Down
4 changes: 2 additions & 2 deletions jans-linux-setup/jans_setup/setup_app/utils/properties_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ def prompt_for_jans_keycloak_link(self):
if Config.installed_instance and Config.install_jans_keycloak_link:
return

prompt_to_install = self.getPrompt("Install Jans Keycloak Link Server?",
prompt_to_install = self.getPrompt("Install Jans KC Link Server?",
self.getDefaultOption(Config.install_jans_keycloak_link)
)[0].lower()

Expand Down Expand Up @@ -673,7 +673,7 @@ def prompt_for_jans_saml(self):
if not self.prompt_to_install('install_jans_saml'):
return

prompt = self.getPrompt("Install Jans SAML?",
prompt = self.getPrompt("Install Jans KC?",
self.getDefaultOption(Config.install_jans_saml)
)[0].lower()

Expand Down