Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moving Idempotency Validation to consent management component #44

Merged
merged 18 commits into from
Mar 8, 2024
Merged

Moving Idempotency Validation to consent management component #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
506ff87
Moving Idempotency Validation to consent management component
Ashi1993 Mar 4, 2024
112ec76
Merge remote-tracking branch 'upstream/main' into event
Ashi1993 Mar 4, 2024
b1bc71c
Moving Idempotency Validation to consent management component
Ashi1993 Mar 4, 2024
86bba0f
Moving Idempotency Validation to consent management component
Ashi1993 Mar 4, 2024
02cc94a
Moving Idempotency Validation to consent management component
Ashi1993 Mar 4, 2024
fad705b
Fixed review comments
Ashi1993 Mar 4, 2024
b796dbc
Fixed review comments
Ashi1993 Mar 4, 2024
243855e
Fixed review comments
Ashi1993 Mar 4, 2024
e431fc5
Fixed build issue
Ashi1993 Mar 5, 2024
b344948
Fixed build issue
Ashi1993 Mar 5, 2024
28d7b78
Fixed review comments
Ashi1993 Mar 5, 2024
b4a872e
Fixed review comments
Ashi1993 Mar 5, 2024
a20ff5a
Fixed review comments
Ashi1993 Mar 5, 2024
83666b0
Fixed review comments
Ashi1993 Mar 5, 2024
f51e3d2
Fixed review comments
Ashi1993 Mar 6, 2024
5c470ec
Fixed code review comments
Ashi1993 Mar 6, 2024
336d1c5
Fixed code review comments
Ashi1993 Mar 7, 2024
2e54ae5
Fixed code review comments
Ashi1993 Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 0 additions & 104 deletions ...-apim/carbon-home/repository/resources/conf/templates/repository/conf/open-banking.xml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -210,26 +203,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>
Expand Down Expand Up @@ -504,83 +477,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 -->
Expand Down
3 changes: 0 additions & 3 deletions open-banking-accelerator/accelerators/ob-apim/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@
</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>
Expand Down
91 changes: 13 additions & 78 deletions ...ob-is/carbon-home/repository/resources/conf/templates/repository/conf/open-banking.xml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,19 @@
{% endif %}
</Params>
</Portal>
<Idempotency>
{% if open_banking.consent.idempotency.enabled is defined %}
<Enabled>{{open_banking.consent.idempotency.enabled}}</Enabled>
{% else %}
<IsEnabled>false</IsEnabled>
{% endif %}

{% if open_banking.consent.idempotency.allowed_time_duration is defined %}
<AllowedTimeDuration>{{open_banking.consent.idempotency.allowed_time_duration}}</AllowedTimeDuration>
{% else %}
<AllowedTimeDuration>1440</AllowedTimeDuration>
{% endif %}
</Idempotency>
</Consent>
<DCR>
{% if open_banking.dcr.validator is defined %}
Expand Down Expand Up @@ -1021,84 +1034,6 @@
{% endif %}
</PollingResponseParams>
</OBEventNotifications>

<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>
<AuthenticationWorkers>
{% for worker in open_banking.identity.authentication.worker %}
<AuthenticationWorker
Expand Down
1 change: 0 additions & 1 deletion open-banking-accelerator/accelerators/ob-is/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
<exclude>**/org.wso2.carbon.identity.application.authenticator.push-0.1.1.jar</exclude>
<exclude>**/org.wso2.carbon.identity.application.authenticator.push.common-0.1.1.jar</exclude>
<exclude>**/org.wso2.carbon.identity.application.authenticator.push.device.handler-0.1.1.jar</exclude>
<exclude>**/hazelcast-5.0.2.jar</exclude>
</excludes>
</fileset>
<fileset>
Expand Down
10 changes: 2 additions & 8 deletions open-banking-accelerator/components/com.wso2.openbanking.accelerator.common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@
<packaging>bundle</packaging>
<name>WSO2 Open Banking - Common component</name>
<dependencies>
<dependency>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom.wso2</groupId>
<artifactId>axiom</artifactId>
Expand Down Expand Up @@ -183,6 +179,7 @@
<exclude>**/JDBCPersistenceManager.class</exclude>
<exclude>**/CertValidationErrors.class</exclude>
<exclude>**/JDBCRetentionDataPersistenceManager.class</exclude>
<exclude>**/*Type*/**</exclude>
</excludes>
</configuration>
<executions>
Expand Down Expand Up @@ -275,10 +272,7 @@
</Private-Package>
<Import-Package>
org.osgi.framework;version="${osgi.framework.imp.pkg.version.range}",
org.osgi.service.component;version="${osgi.service.component.imp.pkg.version.range}",
com.hazelcast.config; version="${com.hazelcast.hazelcast.version}",
com.hazelcast.core; version="${com.hazelcast.hazelcast.version}",
com.hazelcast.map; version="${com.hazelcast.hazelcast.version}"
org.osgi.service.component;version="${osgi.service.component.imp.pkg.version.range}"
</Import-Package>
<Export-Package>
!com.wso2.openbanking.accelerator.common.internal,
Expand Down
Loading
Loading