diff --git a/api/src/main/java/de/fitko/fitconnect/api/config/ApplicationConfig.java b/api/src/main/java/de/fitko/fitconnect/api/config/ApplicationConfig.java index df7fb5c7bc41b43f56ee3b979b05d1da79b10e43..e5ba97d3cc5cc8fcd9ab5b83200b46fc84151e3e 100644 --- a/api/src/main/java/de/fitko/fitconnect/api/config/ApplicationConfig.java +++ b/api/src/main/java/de/fitko/fitconnect/api/config/ApplicationConfig.java @@ -9,6 +9,7 @@ public class ApplicationConfig { private Integer httpProxyPort = 0; private Integer requestTimeoutInSeconds; private String metadataSchemaPath; + private String privateSigningKeyPath; private Sender sender; private Subscriber subscriber; diff --git a/api/src/main/java/de/fitko/fitconnect/api/config/Subscriber.java b/api/src/main/java/de/fitko/fitconnect/api/config/Subscriber.java index dd3eef1b96b204aa1210369e089bc30609a6df1f..6d68a97183b1d6f15f6328dc8583ba9ace5325a5 100644 --- a/api/src/main/java/de/fitko/fitconnect/api/config/Subscriber.java +++ b/api/src/main/java/de/fitko/fitconnect/api/config/Subscriber.java @@ -8,6 +8,5 @@ public class Subscriber { private String clientId; private String clientSecret; private String privateDecryptionKeyPath; - private String privateSigningKeyPath; private String securityEventTokenSchemaPath; } diff --git a/client/src/main/java/de/fitko/fitconnect/client/factory/ClientFactory.java b/client/src/main/java/de/fitko/fitconnect/client/factory/ClientFactory.java index e7c9f895b19e2c4347106d71431e777451ca1a4a..c157b39840089f42978d0786e2f5f5385aaee821 100644 --- a/client/src/main/java/de/fitko/fitconnect/client/factory/ClientFactory.java +++ b/client/src/main/java/de/fitko/fitconnect/client/factory/ClientFactory.java @@ -179,8 +179,8 @@ public class ClientFactory { } private static SecurityEventTokenService getSecurityEventTokenService(final ApplicationConfig config) { - logger.info("Reading private signing key from {} ", config.getSubscriber().getPrivateSigningKeyPath()); - final String signingKey = readPath(config.getSubscriber().getPrivateSigningKeyPath()); + logger.info("Reading private signing key from {} ", config.getPrivateSigningKeyPath()); + final String signingKey = readPath(config.getPrivateSigningKeyPath()); return new SecurityEventTokenService(signingKey); } diff --git a/client/src/test/java/de/fitko/fitconnect/client/ClientIntegrationTest.java b/client/src/test/java/de/fitko/fitconnect/client/ClientIntegrationTest.java index 51e20556671505774cbb90fa5e95aa4a5e8a7aa0..049909a1ec781588a4b61d63a81385395400081d 100644 --- a/client/src/test/java/de/fitko/fitconnect/client/ClientIntegrationTest.java +++ b/client/src/test/java/de/fitko/fitconnect/client/ClientIntegrationTest.java @@ -112,7 +112,6 @@ public class ClientIntegrationTest { subscriber.setClientId(System.getenv("SUBSCRIBER_CLIENT_ID")); subscriber.setClientSecret(System.getenv("SUBSCRIBER_CLIENT_SECRET")); subscriber.setPrivateDecryptionKeyPath("src/test/resources/private_decryption_test_key.json"); - subscriber.setPrivateSigningKeyPath("src/test/resources/private_test_signing_key.json"); final var resourcePaths = new ResourcePaths(); resourcePaths.setAuthTokenPath("/token"); @@ -130,6 +129,7 @@ public class ClientIntegrationTest { config.setUsedEnvironment(TEST); config.setResourcePaths(resourcePaths); config.setMetadataSchemaPath("src/test/resources/metadata_schema.json"); + config.setPrivateSigningKeyPath("src/test/resources/private_test_signing_key.json"); return config; } diff --git a/client/src/test/java/de/fitko/fitconnect/client/factory/ClientFactoryTest.java b/client/src/test/java/de/fitko/fitconnect/client/factory/ClientFactoryTest.java index cb34ab68ff4e248767a087ca63e9ab3a2f3f8d6d..af7d628c929eb1c56ee50218518520c7aa8ff8d5 100644 --- a/client/src/test/java/de/fitko/fitconnect/client/factory/ClientFactoryTest.java +++ b/client/src/test/java/de/fitko/fitconnect/client/factory/ClientFactoryTest.java @@ -38,6 +38,8 @@ public class ClientFactoryTest { senderConfig.setSender(sender); senderConfig.setUsedEnvironment(DEV); senderConfig.setResourcePaths(resourcePaths); + senderConfig.setMetadataSchemaPath("src/test/resources/metadata_schema.json"); + senderConfig.setPrivateSigningKeyPath("src/test/resources/private_test_signing_key.json"); assertNotNull(ClientFactory.senderClient(senderConfig)); } @@ -57,7 +59,6 @@ public class ClientFactoryTest { subscriber.setClientSecret("123"); subscriber.setClientSecret("abc"); subscriber.setPrivateDecryptionKeyPath("src/test/resources/private_decryption_test_key.json"); - subscriber.setPrivateSigningKeyPath("src/test/resources/private_test_signing_key.json"); final var subscriberConfig = new ApplicationConfig(); subscriberConfig.setHttpProxyHost("https://proxy.fitco.de"); @@ -67,6 +68,7 @@ public class ClientFactoryTest { subscriberConfig.setUsedEnvironment(DEV); subscriberConfig.setResourcePaths(resourcePaths); subscriberConfig.setMetadataSchemaPath("src/test/resources/metadata_schema.json"); + subscriberConfig.setPrivateSigningKeyPath("src/test/resources/private_test_signing_key.json"); assertNotNull(ClientFactory.subscriberClient(subscriberConfig)); } diff --git a/sdk.conf b/sdk.conf index 3531ec7f2784d46ce14445257cbeb215c339c1c3..a099696393950820a462154ae1dffbcf3c9cd71a 100644 --- a/sdk.conf +++ b/sdk.conf @@ -9,6 +9,9 @@ sdk { # Path that references the metadata schema metadataSchemaPath: "path/to/metadata_schema.json" + # Path that references the signing key file + privateSigningKeyPath: "path/to/singning_key.json" + # switch between the active environments DEV, PROD or TEST usedEnvironment: "DEV" @@ -25,9 +28,6 @@ sdk { # Path that references the private key file privateDecryptionKeyPath: "path/to/decrpytion_key.json" - # Path that references the signing key file - privateSigningKeyPath: "path/to/singning_key.json" - securityEventTokenSchemaPath: "" }