Merge branch 'release2.0.1'

TIER · Aug 1, 2024 · 5d89870 · 5d89870
2 parents 870ecfd + a6def3d
commit 5d89870
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...c/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/ShibUIConfiguration.java b/...c/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/ShibUIConfiguration.java
@@ -69,9 +69,8 @@ public class ShibUIConfiguration {
 
     private RestTemplate restTemplate;
 
-    @Profile("very-dangerous")
     @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/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