Fix encrypted passwords with the cipher tool are not being decrypted

open-banking-accelerator/components/com.wso2.openbanking.accelerator.common/pom.xml

@@ -198,6 +198,7 @@
                         <exclude>**/CertValidationErrors.class</exclude>
                         <exclude>**/JDBCRetentionDataPersistenceManager.class</exclude>
                         <exclude>**/*Type*/**</exclude>
+                        <exclude>**/*OpenBankingConfigurationService*/**</exclude>
                     </excludes>
                 </configuration>
                 <executions>

open-banking-accelerator/components/com.wso2.openbanking.accelerator.common/src/main/java/com/wso2/openbanking/accelerator/common/config/OpenBankingConfigParser.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
+ * Copyright (c) 2023 - 2025, WSO2 LLC. (https://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -30,6 +30,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.wso2.securevault.SecretResolver;
 import org.wso2.securevault.SecretResolverFactory;
+import org.wso2.securevault.commons.MiscellaneousUtil;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -484,9 +485,8 @@ private void readChildElements(OMElement serverConfig, Stack<String> nameStack)
                 String key = getKey(nameStack);
                 Object currentObject = configuration.get(key);
                 String value = replaceSystemProperty(element.getText());
-                if (secretResolver != null && secretResolver.isInitialized() &&
-                        secretResolver.isTokenProtected(key)) {
-                    value = secretResolver.resolve(key);
+                if (secretResolver != null && secretResolver.isInitialized()) {
+                    value = MiscellaneousUtil.resolve(element, secretResolver);
                 }
                 if (currentObject == null) {
                     configuration.put(key, value);

open-banking-accelerator/components/com.wso2.openbanking.accelerator.common/src/main/java/com/wso2/openbanking/accelerator/common/config/OpenBankingConfigurationService.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
+ * Copyright (c) 2023 - 2025, WSO2 LLC. (https://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -18,6 +18,7 @@
 
 package com.wso2.openbanking.accelerator.common.config;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -44,4 +45,7 @@ public interface OpenBankingConfigurationService {
 
     public Map<String, String> getAuthenticationWorkers();
 
+    default List<String> getServiceActivatorSubscribers() {
+        return Collections.emptyList();
+    }
 }

open-banking-accelerator/components/com.wso2.openbanking.accelerator.common/src/main/java/com/wso2/openbanking/accelerator/common/config/OpenBankingConfigurationServiceImpl.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
+ * Copyright (c) 2023 - 2025, WSO2 LLC. (https://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -83,5 +83,9 @@ public Map<String, String> getAuthenticationWorkers() {
         return openBankingConfigParser.getAuthWorkerConfig();
     }
 
+    @Override
+    public List<String> getServiceActivatorSubscribers() {
+        return openBankingConfigParser.getServiceActivatorSubscribers();
+    }
 
 }

open-banking-accelerator/components/com.wso2.openbanking.accelerator.service.activator/src/main/java/com/wso2/openbanking/accelerator/service/activator/internal/ServiceRegisterComponent.java

@@ -1,13 +1,13 @@
 /**
- * Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
- *
+ * Copyright (c) 2023 - 2025, WSO2 LLC. (https://www.wso2.com).
+ * <p>
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License.
  * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,32 +18,36 @@
 
 package com.wso2.openbanking.accelerator.service.activator.internal;
 
-import com.wso2.openbanking.accelerator.common.config.OpenBankingConfigParser;
+import com.wso2.openbanking.accelerator.common.config.OpenBankingConfigurationService;
 import com.wso2.openbanking.accelerator.service.activator.OBServiceObserver;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicy;
 
 import java.util.Objects;
 
 /**
  * ServiceRegisterComponent.
- *
+ * <p>
  * OSGI Component class to register and activate subscriber (observer) classes
  */
 @Component
 public class ServiceRegisterComponent {
 
     private static final Log LOG = LogFactory.getLog(ServiceRegisterComponent.class);
+    private OpenBankingConfigurationService openBankingConfigurationService;
 
     @Activate
     protected void activate(ComponentContext context) {
         ServiceObservable serviceObservable = ServiceObservable.getInstance();
 
-        OpenBankingConfigParser.getInstance().getServiceActivatorSubscribers()
+        this.openBankingConfigurationService.getServiceActivatorSubscribers()
                 .stream()
                 .map(this::getInstanceFromFQN)
                 .filter(Objects::nonNull)
@@ -55,7 +59,7 @@ protected void activate(ComponentContext context) {
 
     @Deactivate
     protected void deactivate(ComponentContext context) {
-        LOG.debug("Metadata Updater bundle is deactivated");
+        LOG.debug("Service register component is deactivated");
     }
 
     private OBServiceObserver getInstanceFromFQN(String fqn) {
@@ -68,4 +72,20 @@ private OBServiceObserver getInstanceFromFQN(String fqn) {
         }
         return null;
     }
+
+    @Reference(
+            service = OpenBankingConfigurationService.class,
+            cardinality = ReferenceCardinality.MANDATORY,
+            policy = ReferencePolicy.DYNAMIC,
+            unbind = "unsetOpenBankingConfigurationService"
+    )
+    public void setOpenBankingConfigurationService(OpenBankingConfigurationService openBankingConfigurationService) {
+
+        this.openBankingConfigurationService = openBankingConfigurationService;
+    }
+
+    public void unsetOpenBankingConfigurationService(OpenBankingConfigurationService openBankingConfigurationService) {
+
+        this.openBankingConfigurationService = null;
+    }
 }