RM-4449: change default sid/mid props path in use places

Author: Olesja Aarma

cdoc2-cli/config/mobile-id/mobile_id.properties

@@ -5,7 +5,7 @@
 mobileid.client.hostUrl=https://tsp.demo.sk.ee/mid-api
 mobileid.client.relyingPartyUuid=00000000-0000-0000-0000-000000000000
 mobileid.client.relyingPartyName=DEMO
-mobileid.client.ssl.trust-store=config/localhost/mobile-id/mobileid_demo_server_trusted_ssl_certs.p12
+mobileid.client.ssl.trust-store=config/mobile-id/mobileid_demo_server_trusted_ssl_certs.p12
 mobileid.client.ssl.trust-store.type=PKCS12
 mobileid.client.ssl.trust-store-password=passwd
 mobileid.client.long-polling-timeout-seconds=60

cdoc2-cli/config/smart-id/smart-id.properties

@@ -2,5 +2,5 @@
 smartid.client.hostUrl=https://sid.demo.sk.ee/smart-id-rp/v2/
 smartid.client.relyingPartyUuid=00000000-0000-0000-0000-000000000000
 smartid.client.relyingPartyName=DEMO
-smartid.client.ssl.trust-store=config/localhost/smart-id/smartid_demo_server_trusted_ssl_certs.jks
+smartid.client.ssl.trust-store=config/smart-id/smartid_demo_server_trusted_ssl_certs.jks
 smartid.client.ssl.trust-store-password=passwd

cdoc2-cli/src/main/java/ee/cyber/cdoc2/cli/util/CDocCommonHelper.java

@@ -80,7 +80,7 @@ private static KeySharesConfiguration loadKeySharesConfiguration() {
     private static void loadSmartIdConfiguration() throws ConfigurationLoadingException {
         String propertiesFilePath = System.getProperty(
             SMART_ID_PROPERTIES,
-            "config/localhost/smart-id/" + SMART_ID_PROPERTIES
+            "config/smart-id/" + SMART_ID_PROPERTIES
         );
         if (null == propertiesFilePath) {
             throw new ConfigurationLoadingException("Smart ID configuration property is missing");

cdoc2-lib/README.md

@@ -147,7 +147,7 @@ directory:
   }
 ```
 
-Configuration is created from `smart-id.properties` in `cdoc2-cli/config/localhost/smart-id` 
+Configuration is created from `smart-id.properties` in `cdoc2-cli/config/smart-id` 
 directory:
 * `smartid.client.hostUrl`
 * `smartid.client.relyingPartyUuid`
@@ -165,7 +165,7 @@ directory:
   }
 ```
 
-Configuration is created from `mobile-id.properties` in `cdoc2-cli/config/localhost/mobile-id`
+Configuration is created from `mobile-id.properties` in `cdoc2-cli/config/mobile-id`
 directory:
 * `mobileid.client.hostUrl`
 * `mobileid.client.relyingPartyUuid`

cdoc2-lib/src/main/java/ee/cyber/cdoc2/util/SIDAuthTokenCreator.java

@@ -161,7 +161,7 @@ private static SmartIdClientConfiguration loadSmartIdConfiguration()
 
         String propertiesFilePath = System.getProperty(
             SMART_ID_PROPERTIES,
-            "config/localhost/smart-id/" + SMART_ID_PROPERTIES
+            "config/smart-id/" + SMART_ID_PROPERTIES
         );
         if (null == propertiesFilePath) {
             throw new ConfigurationLoadingException("Smart ID configuration property is missing");