From e37985140f385d2581f34c7e42073ec2986192b3 Mon Sep 17 00:00:00 2001 From: chasegawa Date: Tue, 23 Jul 2024 15:08:48 -0700 Subject: [PATCH 1/3] SHIBUI-2637 Fixing access to the dynamic registration (OIDC) feature --- .../shibboleth/admin/ui/configuration/ShibUIConfiguration.java | 1 - gradle.properties | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/ShibUIConfiguration.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/ShibUIConfiguration.java index 541cded25..5c2b2303f 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/ShibUIConfiguration.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/ShibUIConfiguration.java @@ -69,7 +69,6 @@ public class ShibUIConfiguration { private RestTemplate restTemplate; - @Profile("very-dangerous") @Bean public RestTemplate dangerousRestTemplate() throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException { HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() { diff --git a/gradle.properties b/gradle.properties index 88235856c..b3ae433e3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ name=shibui group=edu.internet2.tier.shibboleth.admin.ui -version=2.0.0 +version=2.1.0-SNAPSHOT ### library versions ### ## As of 2-23-23 From fddf0bd8e3a45ef963b38d875ea981cb9a2c20ec Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Wed, 24 Jul 2024 09:24:42 -0700 Subject: [PATCH 2/3] SHIBUI-2639: UI Fix for context path --- ui/vite.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/vite.config.js b/ui/vite.config.js index 7ded27e96..1a5e01abb 100644 --- a/ui/vite.config.js +++ b/ui/vite.config.js @@ -37,7 +37,7 @@ export default defineConfig(({mode}) => { }; return ({ - base: `${context}/`, + base: `${context ? context : "."}/`, server:{ port, proxy From 759051bf9a5f9ef9697028c169bec9f657fd47a9 Mon Sep 17 00:00:00 2001 From: chasegawa Date: Wed, 24 Jul 2024 11:53:52 -0700 Subject: [PATCH 3/3] SHIBUI-2637 updated from code review --- .../shibboleth/admin/ui/configuration/ShibUIConfiguration.java | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/ShibUIConfiguration.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/ShibUIConfiguration.java index 5c2b2303f..7697a99a2 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/ShibUIConfiguration.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/ShibUIConfiguration.java @@ -70,7 +70,7 @@ public class ShibUIConfiguration { private RestTemplate restTemplate; @Bean - public RestTemplate dangerousRestTemplate() throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException { + public RestTemplate restTemplate() throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException { HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() { public boolean verify(String hostname, SSLSession session) { return true; diff --git a/gradle.properties b/gradle.properties index b3ae433e3..3cfbc03f3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ name=shibui group=edu.internet2.tier.shibboleth.admin.ui -version=2.1.0-SNAPSHOT +version=2.0.1-SNAPSHOT ### library versions ### ## As of 2-23-23