Merge branch 'develop' into test-jenkins-build

integratedmodelling · Jun 20, 2024 · a50b137 · a50b137
2 parents f9e43d6 + 888664e
commit a50b137
Show file tree

Hide file tree

Showing 10 changed files with 1,134 additions and 1,865 deletions.
diff --git a/adapters/klab.ogc/src/main/java/org/integratedmodelling/klab/openeo/OpenEO.java b/adapters/klab.ogc/src/main/java/org/integratedmodelling/klab/openeo/OpenEO.java
@@ -31,6 +31,7 @@
 import org.integratedmodelling.klab.api.runtime.monitoring.IMonitor;
 import org.integratedmodelling.klab.auth.Authorization;
 import org.integratedmodelling.klab.exceptions.KlabIOException;
+import org.integratedmodelling.klab.exceptions.KlabMissingCredentialsException;
 import org.integratedmodelling.klab.exceptions.KlabRemoteException;
 import org.integratedmodelling.klab.rest.ExternalAuthenticationCredentials;
 import org.integratedmodelling.klab.rest.Notification;
@@ -395,11 +396,12 @@ public void encodeSelf(String url) {
 	}
 
 	public OpenEO(String endpoint) {
-		this.endpoint = endpoint;
 		ExternalAuthenticationCredentials credentials = Authentication.INSTANCE.getCredentials(endpoint);
-		if (credentials != null) {
-			this.authorization = new Authorization(credentials);
+		if (credentials == null) {
+			throw new KlabMissingCredentialsException(endpoint);
 		}
+		this.endpoint = credentials.getURL();
+		this.authorization = new Authorization(credentials, endpoint);
 		this.executor.scheduleAtFixedRate(() -> {
 			Set<Job> finished = new HashSet<>();
 			for (Job job : jobs) {

diff --git a/...ing.klab.api/src/org/integratedmodelling/klab/rest/ExternalAuthenticationCredentials.java b/...ing.klab.api/src/org/integratedmodelling/klab/rest/ExternalAuthenticationCredentials.java
@@ -15,7 +15,7 @@ public class ExternalAuthenticationCredentials {
     static {
         parameterKeys = new HashMap<>();
         parameterKeys.put("basic", new String[]{"username", "password"});
-        parameterKeys.put("oidc", new String[]{"url", "grant_type", "client_id", "client_secrets", "scope", "provider_id"});
+        parameterKeys.put("oidc", new String[]{"grant_type", "client_id", "client_secrets", "provider_id"});
         parameterKeys.put("s3", new String[]{"accessKey", "secretKey"});
         parameterKeys.put("key", new String[]{"key"});
     }
@@ -24,7 +24,7 @@ public class ExternalAuthenticationCredentials {
      * Credentials, depending on scheme
      * 
      * for basic: username and password
-     * for oidc: Authentication URL, grant type, client ID, client secret, scope, provider
+     * for oidc: grant type, client ID, client secret, provider
      * for s3: endpoint URL, access key, secret key
      * for key: a single key
      */
@@ -35,6 +35,11 @@ public class ExternalAuthenticationCredentials {
      */
     private String scheme = "basic";
 
+    /**
+     * The URL of the authentication service
+     */
+    private String url = "";
+
     public List<String> getCredentials() {
         return credentials;
     }
@@ -51,4 +56,11 @@ public void setScheme(String scheme) {
         this.scheme = scheme;
     }
 
+    public String getURL() {
+        return url;
+    }
+
+    public void setURL(String url) {
+        this.url = url;
+    }
 }
diff --git a/docs/highlightjs/package-lock.json b/docs/highlightjs/package-lock.json