Merge remote-tracking branch 'upstream/main' into realtime-4.0.0

wso2 · Dec 4, 2024 · 86e2eaa · 86e2eaa
2 parents 8f40d67 + 08f9dfd
commit 86e2eaa
Show file tree

Hide file tree

Showing 51 changed files with 3,224 additions and 10,493 deletions.
diff --git a/...accelerator/accelerators/fs-apim/carbon-home/repository/components/dropins/jjwt-0.9.1.jar b/...accelerator/accelerators/fs-apim/carbon-home/repository/components/dropins/jjwt-0.9.1.jar
diff --git a/...vices-accelerator/accelerators/fs-apim/carbon-home/repository/conf/financial-services.xml b/...vices-accelerator/accelerators/fs-apim/carbon-home/repository/conf/financial-services.xml
@@ -36,4 +36,7 @@
         <MaxConnections>2000</MaxConnections>
         <MaxConnectionsPerRoute>1500</MaxConnectionsPerRoute>
     </HTTPConnectionPool>
+    <Identity>
+        <ConsentIDClaimName>consent_id</ConsentIDClaimName>
+    </Identity>
 </Server>
diff --git a/...carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2 b/...carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2
@@ -25,12 +25,12 @@
         <RequestRouter>org.wso2.financial.services.accelerator.gateway.executor.core.DefaultRequestRouter</RequestRouter>
         {% endif %}
         <FinancialServicesGatewayExecutors>
-            {% for type in financial_services.gateway.openbanking_gateway_executors.type %}
-                <{{type.name}}>
-                    {% for executor in type.executors %}
+            {% for executors in financial_services.gateway.executors %}
+                <{{executors.type}}>
+                    {% for executor in executors.executor %}
                        <Executor class="{{executor.name}}" priority="{{executor.priority}}"/>
                         {% endfor %}
-                 </{{type.name}}>
+                 </{{executors.type}}>
             {% endfor %}
         </FinancialServicesGatewayExecutors>
         {% if financial_services.gateway.consent.validation.endpoint is defined %}
@@ -62,4 +62,11 @@
         <MaxConnectionsPerRoute>{{financial_services.http_connection_pool.max_connections_per_route}}</MaxConnectionsPerRoute>
         {% endif %}
     </HTTPConnectionPool>
+    <Identity>
+        {% if financial_services.identity.consent_id_claim_name is defined %}
+        <ConsentIDClaimName>{{financial_services.identity.consent_id_claim_name}}</ConsentIDClaimName>
+        {% else %}
+        <ConsentIDClaimName>consent_id</ConsentIDClaimName>
+        {% endif %}
+    </Identity>
 </Server>
diff --git a/financial-services-accelerator/accelerators/fs-apim/pom.xml b/financial-services-accelerator/accelerators/fs-apim/pom.xml
@@ -47,14 +47,11 @@
                 <configuration>
                     <filesets>
                         <fileset>
-                            <directory>${project.basedir}/carbon-home/repository/components/lib</directory>
+                            <directory>${project.basedir}/carbon-home/repository/components/dropins</directory>
                             <excludes>
                                 <exclude>**/jjwt-0.9.1.jar</exclude>
                             </excludes>
                         </fileset>
-                        <fileset>
-                            <directory>${project.basedir}/carbon-home/repository/components/dropins</directory>
-                        </fileset>
                         <fileset>
                             <directory>${project.basedir}/carbon-home/repository/deployment/server/webapps</directory>
                         </fileset>
@@ -95,6 +92,8 @@
                                                 regex="org.wso2.financial.services.accelerator.gateway-(\d.*?)\.jar$"/>
                                     </fileset>
                                 </copy>
+                                <unzip src="../../internal-webapps/org.wso2.financial.services.accelerator.demo.backend/target/api#fs#backend.war"
+                                       dest="${project.basedir}/carbon-home/repository/deployment/server/webapps/api#fs#backend/"/>
                             </target>
                         </configuration>
                         <goals>