Detect if ClientId includes PlatformId as well

symbiote-h2020 · Mar 13, 2018 · 271c5bb · 271c5bb
1 parent be442a1
commit 271c5bb
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/eu/h2020/symbiote/client/SymbioteComponentClientFactory.java b/src/main/java/eu/h2020/symbiote/client/SymbioteComponentClientFactory.java
@@ -110,10 +110,14 @@ public static <T> T createClient(String baseUrl, Class<T> clientClass, SecurityC
                 .encoder(new JacksonEncoder());
 
         if (securityConfiguration != null) {
+            String finalClientId = securityConfiguration.getClientId();
+            if (!finalClientId.contains("@")) {
+                finalClientId = securityConfiguration.getClientId() + "@" + securityConfiguration.getPlatformId();
+            }
             IComponentSecurityHandler secHandler = ComponentSecurityHandlerFactory
                     .getComponentSecurityHandler(securityConfiguration.getKeystorePath(),
                             securityConfiguration.getKeystorePassword(),
-                            securityConfiguration.getClientId()+"@"+securityConfiguration.getPlatformId(),
+                            finalClientId,
                             securityConfiguration.getLocalAAMAddress(),
                             securityConfiguration.getComponentOwnerUsername(),
                             securityConfiguration.getComponentOwnerPassword()