simplified config

IQSS · Oct 3, 2024 · 1a5cc5d · 1a5cc5d
1 parent eea06bd
commit 1a5cc5d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -23,10 +23,7 @@ services:
       DATAVERSE_AUTH_OIDC_CLIENT_ID: test
       DATAVERSE_AUTH_OIDC_CLIENT_SECRET: 94XHrfNRwXsjqTqApRrwWmhDLDHpIYV8
       DATAVERSE_AUTH_OIDC_AUTH_SERVER_URL: http://keycloak.mydomain.com:8090/realms/test
-      DATAVERSE_AUTH_API_OIDC_CLIENT_ID: test
-      DATAVERSE_AUTH_API_OIDC_CLIENT_SECRET: 94XHrfNRwXsjqTqApRrwWmhDLDHpIYV8
-      DATAVERSE_AUTH_API_OIDC_PROVIDER_URI: http://keycloak.mydomain.com:8090/realms/test
-      DATAVERSE_AUTH_API_OIDC_REDIRECT_URI: http://localhost:8080/api/v1/callback/token
+      DATAVERSE_AUTH_OIDC_REDIRECT_URI: http://localhost:8080/api/v1/callback/token
       DATAVERSE_SPI_EXPORTERS_DIRECTORY: "/dv/exporters"
       # These two oai settings are here to get HarvestingServerIT to pass
       dataverse_oai_server_maxidentifiers: "2"

diff --git a/src/main/java/edu/harvard/iq/dataverse/api/OpenIDConfigBean.java b/src/main/java/edu/harvard/iq/dataverse/api/OpenIDConfigBean.java
@@ -8,18 +8,18 @@
 @Named("openIdConfigBean")
 public class OpenIDConfigBean implements java.io.Serializable {
     public String getProviderURI() {
-        return JvmSettings.API_OIDC_PROVIDER_URI.lookup();
+        return JvmSettings.OIDC_AUTH_SERVER_URL.lookupOptional().orElse(null);
     }
 
     public String getClientId() {
-        return JvmSettings.API_OIDC_CLIENT_ID.lookup();
+        return JvmSettings.OIDC_CLIENT_ID.lookupOptional().orElse(null);
     }
 
     public String getClientSecret() {
-        return JvmSettings.API_OIDC_CLIENT_SECRET.lookup();
+        return JvmSettings.OIDC_CLIENT_SECRET.lookupOptional().orElse(null);
     }
 
     public String getRedirectURI() {
-        return JvmSettings.API_OIDC_REDIRECT_URI.lookup();
+        return JvmSettings.OIDC_REDIRECT_URI.lookupOptional().orElse(null);
     }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java b/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java
@@ -230,18 +230,12 @@ public enum JvmSettings {
     OIDC_AUTH_SERVER_URL(SCOPE_OIDC, "auth-server-url"),
     OIDC_CLIENT_ID(SCOPE_OIDC, "client-id"),
     OIDC_CLIENT_SECRET(SCOPE_OIDC, "client-secret"),
+    OIDC_REDIRECT_URI(SCOPE_OIDC, "redirect-uri"),
     SCOPE_OIDC_PKCE(SCOPE_OIDC, "pkce"),
     OIDC_PKCE_ENABLED(SCOPE_OIDC_PKCE, "enabled"),
     OIDC_PKCE_METHOD(SCOPE_OIDC_PKCE, "method"),
     OIDC_PKCE_CACHE_MAXSIZE(SCOPE_OIDC_PKCE, "max-cache-size"),
     OIDC_PKCE_CACHE_MAXAGE(SCOPE_OIDC_PKCE, "max-cache-age"),
-    // AUTH: OPEN_ID SETTINGS
-    SCOPE_AUTH_API(SCOPE_AUTH, "api"),
-    SCOPE_OPEN_ID(SCOPE_AUTH_API, "oidc"),
-    API_OIDC_PROVIDER_URI(SCOPE_OPEN_ID, "provider-uri"),
-    API_OIDC_CLIENT_ID(SCOPE_OPEN_ID, "client-id"),
-    API_OIDC_CLIENT_SECRET(SCOPE_OPEN_ID, "client-secret"),
-    API_OIDC_REDIRECT_URI(SCOPE_OPEN_ID, "redirect-uri"),
 
     // UI SETTINGS
     SCOPE_UI(PREFIX, "ui"),