Updating 3.0.0 branch with latest 3.0.0 implementation

.github/workflows/maven.yml

@@ -17,10 +17,10 @@
 name: Build Open Banking Repository
 
 on:
-  # Triggers the workflow on push or pull request events but only for the master branch
+  # Triggers the workflow on push or pull request events
   pull_request:
     branches:
-      - 'main'
+      - '3.0.0'
 
 jobs:
 

open-banking-accelerator/accelerators/ob-apim/bin/merge.ps1

@@ -0,0 +1,82 @@
+ # Copyright (c) 2023-2024, 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
+ # in compliance with the License.
+ # You may obtain a copy of the License at
+ #
+ #    http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # 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
+ # KIND, either express or implied. See the License for the
+ # specific language governing permissions and limitations
+ # under the License.
+
+# How to execute :
+#   If your accelerator is located inside of the base product you can just call .\merge.ps1
+#   If your accelerator is in a different location you can call .\merge.ps1 <YOUR_BASE_PRODUCT_HOME_DIR>
+
+# IMPORTANT : 
+#   Please note that these powershell files are not digitally signed yet. So, powershell will not allow these scripts under any of their execution policies.
+#   You may need to run these scripts on an execution policy bypassed powershell instance. You can do that using the following command.
+#       powershell.exe -executionpolicy bypass <SCRIPT_FILEPATH>
+
+# Get the current working directory of the powershell session, so we can set to this directory after the script finishes.
+$CURRENT_DIRECTORY = (Get-Location).path
+
+# Some black magic to get the fully qualified path of the WSO2 Base Product if it was given as an argument.
+$WSO2_BASE_PRODUCT_HOME = $args[0]
+if (-NOT($null -eq $WSO2_BASE_PRODUCT_HOME)) {
+    if (Test-Path $WSO2_BASE_PRODUCT_HOME) {
+        Set-Location $WSO2_BASE_PRODUCT_HOME
+        $WSO2_BASE_PRODUCT_HOME = (Get-Location).path
+        Set-Location $CURRENT_DIRECTORY
+    }
+}
+
+Function Exit-Clean {
+    Set-Location $CURRENT_DIRECTORY
+    exit 1
+}
+
+# Get the root directory location of the accelerator. Which is <BASE_PRODUCT>/<ACCELERATOR>/
+Set-Location (Join-Path $PSScriptRoot ".\..\")
+$WSO2_OB_ACCELERATOR_HOME = (Get-Location).path
+Write-Output "[INFO] Accelerator Home : $WSO2_OB_ACCELERATOR_HOME"
+
+# Get the root directory of the base product.
+if ($null -eq $WSO2_BASE_PRODUCT_HOME) {
+    Set-Location (Join-Path $WSO2_OB_ACCELERATOR_HOME ".\..\")
+    $WSO2_BASE_PRODUCT_HOME = (Get-Location).path
+}
+Write-Output "[INFO] Base Product Home : $WSO2_BASE_PRODUCT_HOME"
+
+# Check whether the extracted base product location contains a valid WSO2 carbon product by checking whether this location
+# contains the "repository/components" directory.
+if (-NOT(Test-Path (Join-Path $WSO2_BASE_PRODUCT_HOME "repository\components"))) {
+    Write-Error "[ERROR] $WSO2_BASE_PRODUCT_HOME does NOT contain a valid carbon product!"
+    # The current path does not contain a valid carbon product.
+    # Set the current working directory to the original location and exit.
+    Exit-Clean
+} else {
+    Write-Output "[INFO] $WSO2_BASE_PRODUCT_HOME is a valid carbon product home."
+}
+
+# Remove old open-banking artifacts
+Write-Output "[INFO] Removing old open-banking artifacts..."
+Get-ChildItem (Join-Path $WSO2_BASE_PRODUCT_HOME "repository\components\dropins") | Where-Object{$_.Name -Match "com.wso2.openbanking.accelerator.*"} | Remove-Item
+Get-ChildItem (Join-Path $WSO2_BASE_PRODUCT_HOME "repository\components\lib") | Where-Object{$_.Name -Match "com.wso2.openbanking.accelerator.*"} | Remove-Item
+Write-Output "[INFO] All previous OB artifacts have been deleted!"
+
+# Copying all the new OB artifacts to the base product
+# Copy-Item -Force -Recurse -Verbose (Join-Path $WSO2_OB_ACCELERATOR_HOME "carbon-home\*") -Destination $WSO2_BASE_PRODUCT_HOME
+# Using Robocopy.exe becuase powershell Copy-Item cmdlet doesn't do recursive copying after a certain number of subdirectories.
+Write-Output "[INFO] Copying new open-banking artifacts..."
+Robocopy.exe (Join-Path $WSO2_OB_ACCELERATOR_HOME "carbon-home") $WSO2_BASE_PRODUCT_HOME * /E /NFL /NDL /NJH /NJS /nc /ns /np
+Write-Output "[INFO] All the new OB artifacts has been copied!"
+
+Write-Output "[INFO] Completed!"
+
+Exit-Clean

open-banking-accelerator/accelerators/ob-apim/carbon-home/repository/resources/conf/templates/repository/conf/open-banking.xml.j2

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- ~ Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
+ ~ Copyright (c) 2023-2024, 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
@@ -66,13 +66,6 @@
                     <CacheModifiedExpiry>{{open_banking.gateway.cache.cache_modified_expiry_minutes}}</CacheModifiedExpiry>
                 {% endif %}
             </GatewayCache>
-            <IdempotencyValidationCache>
-                {% if open_banking.gateway.cache.idempotency_validation_cache.cache_time_to_live is defined %}
-                    <CacheTimeToLive>{{open_banking.gateway.cache.idempotency_validation_cache.cache_time_to_live}}</CacheTimeToLive>
-                {% else %}
-                    <CacheTimeToLive>1440</CacheTimeToLive>
-                {% endif %}
-            </IdempotencyValidationCache>
         </Cache>
 
         <CertificateManagement>
@@ -170,6 +163,16 @@
         		{% else %}
         		<TrustStoreDynamicLoadingInterval>86400</TrustStoreDynamicLoadingInterval>
         		{% endif %}
+        		{% if open_banking.gateway.certificate_management.client_transport_cert_header_name is defined %}
+                <ClientTransportCertHeaderName>{{open_banking.gateway.certificate_management.client_transport_cert_header_name}}</ClientTransportCertHeaderName>
+                {% else %}
+                <ClientTransportCertHeaderName>x-wso2-mutual-auth-cert</ClientTransportCertHeaderName>
+                {% endif %}
+                {% if open_banking.gateway.certificate_management.url_encode_client_transport_cert_header_enabled is defined %}
+                <UrlEncodeClientTransportCertHeaderEnabled>{{open_banking.gateway.certificate_management.url_encode_client_transport_cert_header_enabled}}</UrlEncodeClientTransportCertHeaderEnabled>
+                {% else %}
+                <UrlEncodeClientTransportCertHeaderEnabled>true</UrlEncodeClientTransportCertHeaderEnabled>
+                {% endif %}
             </CertificateManagement>
 
             <TPPManagement>
@@ -210,26 +213,6 @@
             	</AllowedScopes>
 
             </TPPManagement>
-
-        <Idempotency>
-            {% if open_banking.gateway.idempotency.enabled is defined %}
-                <IsEnabled>{{open_banking.gateway.idempotency.enabled}}</IsEnabled>
-            {% else %}
-                <IsEnabled>false</IsEnabled>
-            {% endif %}
-
-            {% if open_banking.gateway.idempotency.allowed_time_duration is defined %}
-                <AllowedTimeDuration>{{open_banking.gateway.idempotency.allowed_time_duration}}</AllowedTimeDuration>
-            {% else %}
-                <AllowedTimeDuration>1440</AllowedTimeDuration>
-            {% endif %}
-
-            {% if open_banking.gateway.idempotency.idempotency_key_header is defined %}
-                <IdempotencyKeyHeader>{{open_banking.gateway.idempotency.idempotency_key_header}}</IdempotencyKeyHeader>
-            {% else %}
-                <IdempotencyKeyHeader>x-idempotency-key</IdempotencyKeyHeader>
-            {% endif %}
-        </Idempotency>
     </Gateway>
     <DCR>
         <APIMRESTEndPoints>
@@ -301,6 +284,25 @@
         {% else %}
         <RequestJWTValidation>true</RequestJWTValidation>
         {% endif %}
+        <RegistrationRequestParams>
+            <SoftwareEnvironmentIdentification>
+                {% if open_banking.dcr.registration.software_environment_identification.ssa_property_name is defined %}
+                    <PropertyName>{{open_banking.dcr.registration.software_environment_identification.ssa_property_name}}</PropertyName>
+                {% else %}
+                    <PropertyName>software_environment</PropertyName>
+                {% endif %}
+                {% if open_banking.dcr.registration.software_environment_identification.ssa_property_value_for_sandbox is defined %}
+                    <PropertyValueForSandbox>{{open_banking.dcr.registration.software_environment_identification.ssa_property_value_for_sandbox}}</PropertyValueForSandbox>
+                {% else %}
+                    <PropertyValueForSandbox>sandbox</PropertyValueForSandbox>
+                {% endif %}
+                {% if open_banking.dcr.registration.software_environment_identification.ssa_property_value_for_production is defined %}
+                    <PropertyValueForProduction>{{open_banking.dcr.registration.software_environment_identification.ssa_property_value_for_production}}</PropertyValueForProduction>
+                {% else %}
+                    <PropertyValueForProduction>production</PropertyValueForProduction>
+                {% endif %}
+            </SoftwareEnvironmentIdentification>
+        </RegistrationRequestParams>
     </DCR>
     <KeyManagerName>{{open_banking.keyManager.name}}</KeyManagerName>
     {% if open_banking.publisher.hostname is defined %}
@@ -315,6 +317,13 @@
         <Enabled>false</Enabled>
     {% endif %}
     </APIMAnalytics>
+    <ELKAnalytics>
+        {% if open_banking.analytics.elk is defined %}
+            <Enabled>{{open_banking.analytics.elk.enabled}}</Enabled>
+        {% else %}
+            <Enabled>false</Enabled>
+        {% endif %}
+    </ELKAnalytics>
     <DataPublishing>
     {% if open_banking.data_publishing.enable is defined %}
         <Enabled>{{open_banking.data_publishing.enable}}</Enabled>
@@ -478,83 +487,6 @@
             {% endif %}
         </KeyManagerAdditionalProperties>
     </KeyManager>
-    <DistributedCache>
-        {% if open_banking.distributed_cache.enabled is defined %}
-            <Enabled>{{open_banking.distributed_cache.enabled}}</Enabled>
-        {% else %}
-            <Enabled>false</Enabled>
-        {% endif %}
-        {% if open_banking.distributed_cache.host_name is defined %}
-            <HostName>{{open_banking.distributed_cache.host_name}}</HostName>
-        {% else %}
-            <HostName>localhost</HostName>
-        {% endif %}
-        {% if open_banking.distributed_cache.port is defined %}
-            <Port>{{open_banking.distributed_cache.port}}</Port>
-        {% else %}
-            <Port>5701</Port>
-        {% endif %}
-        {% if ( (open_banking.distributed_cache.discovery_mechanism is defined) and (open_banking.distributed_cache.discovery_mechanism == "TCP") ) %}
-            <DiscoveryMechanism>{{open_banking.distributed_cache.discovery_mechanism}}</DiscoveryMechanism>
-            {% if open_banking.distributed_cache.members is defined %}
-                <Members>
-                    {% for member in open_banking.distributed_cache.members %}
-                        <Member>{{member}}</Member>
-                    {% endfor %}
-                </Members>
-            {% else %}
-                <Members></Members>
-            {% endif %}
-        {% else %}
-            <DiscoveryMechanism>Multicast</DiscoveryMechanism>
-            {% if open_banking.distributed_cache.multicast_group is defined %}
-                <MulticastGroup>{{open_banking.distributed_cache.multicast_group}}</MulticastGroup>
-            {% else %}
-                <MulticastGroup>224.2.2.3</MulticastGroup>
-            {% endif %}
-            {% if open_banking.distributed_cache.multicast_port is defined %}
-                <MulticastPort>{{open_banking.distributed_cache.multicast_port}}</MulticastPort>
-            {% else %}
-                <MulticastPort>54321</MulticastPort>
-            {% endif %}
-            {% if open_banking.distributed_cache.trusted_interfaces is defined %}
-                <TrustedInterfaces>
-                    {% for trusted_interface in open_banking.distributed_cache.trusted_interfaces %}
-                        <TrustedInterface>{{trusted_interface}}</TrustedInterface>
-                    {% endfor %}
-                </TrustedInterfaces>
-            {% else %}
-                <TrustedInterfaces></TrustedInterfaces>
-            {% endif %}
-        {% endif %}
-        <Properties>
-            {% if open_banking.distributed_cache.properties.max_heartbeat is defined %}
-                <MaxHeartbeat>{{open_banking.distributed_cache.properties.max_heartbeat}}</MaxHeartbeat>
-            {% else %}
-                <MaxHeartbeat>600</MaxHeartbeat>
-            {% endif %}
-            {% if open_banking.distributed_cache.properties.max_master_confirmation is defined %}
-                <MaxMasterConfirmation>{{open_banking.distributed_cache.properties.max_master_confirmation}}</MaxMasterConfirmation>
-            {% else %}
-                <MaxMasterConfirmation>900</MaxMasterConfirmation>
-            {% endif %}
-            {% if open_banking.distributed_cache.properties.merge_first_run_delay is defined %}
-                <MergeFirstRunDelay>{{open_banking.distributed_cache.properties.merge_first_run_delay}}</MergeFirstRunDelay>
-            {% else %}
-                <MergeFirstRunDelay>60</MergeFirstRunDelay>
-            {% endif %}
-            {% if open_banking.distributed_cache.properties.merge_next_run_delay is defined %}
-                <MergeNextRunDelay>{{open_banking.distributed_cache.properties.merge_next_run_delay}}</MergeNextRunDelay>
-            {% else %}
-                <MergeNextRunDelay>30</MergeNextRunDelay>
-            {% endif %}
-            {% if open_banking.distributed_cache.properties.logging_type is defined %}
-                <LoggingType>{{open_banking.distributed_cache.properties.logging_type}}</LoggingType>
-            {% else %}
-                <LoggingType>none</LoggingType>
-            {% endif %}
-        </Properties>
-    </DistributedCache>
     <!--This configuration applies for Request Validation and Response Signing for `x-jws-signature`.  -->
     <JwsSignatureConfiguration>
         <!-- Configs for  Signature Validation -->

open-banking-accelerator/accelerators/ob-apim/pom.xml

@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>com.wso2</groupId>
+        <groupId>com.wso2.openbanking.accelerator</groupId>
         <artifactId>open-banking</artifactId>
-        <version>3.0.0</version>
+        <version>3.2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -49,14 +49,10 @@
                             <directory>${project.basedir}/carbon-home/repository/components/lib</directory>
                             <excludes>
                                 <exclude>**/jjwt-0.9.1.jar</exclude>
-                                <exclude>**/mysql-connector-java-5.1.44.jar</exclude>
                             </excludes>
                         </fileset>
                         <fileset>
                             <directory>${project.basedir}/carbon-home/repository/components/dropins</directory>
-                            <excludes>
-                                <exclude>**/hazelcast-5.0.2.jar</exclude>
-                            </excludes>
                         </fileset>
                         <fileset>
                             <directory>${project.basedir}/carbon-home/repository/deployment/server/webapps</directory>