resolved conflicts

Author: aka4rKO

financial-services-accelerator/accelerators/fs-is/repository/resources/wso2is-7.2.0-deployment.toml

@@ -291,6 +291,9 @@ grant_handler = "org.wso2.carbon.identity.oauth2.token.handlers.grant.ClientCred
 enable_fapi_enforcement=true
 ssa_jkws= "https://keystore.openbankingtest.org.uk/0015800001HQQrZAAX/0015800001HQQrZAAX.jwks"
 
+[oauth.dcrm]
+return_null_fields_in_response=false
+
 [oauth.oidc]
 id_token.signature_algorithm="PS256"
 enable_claims_separation_for_access_tokens = false
@@ -495,7 +498,7 @@ priority = 7
 [[financial_services.app_registration.dcr.validators.validator]]
 name = "SSAJTIValidator"
 class = "org.wso2.financial.services.accelerator.identity.extensions.client.registration.dcr.validators.SSAJTIValidator"
-enable = true
+enable = false
 priority = 8
 [[financial_services.app_registration.dcr.validators.validator]]
 name = "TokenEndpointAuthSigningAlgValidator"
@@ -582,6 +585,9 @@ allowed_api_resources=["payment-consents"]
 [financial_services.consent.preserve_consent_link]
 enabled=false
 
+[financial_services.consent.authorize_jsp]
+path="fs_default.jsp"
+
 [financial_services.identity]
 consent_id_claim_name="consent_id"
 append_consent_id_to_token_id_token=false
@@ -593,7 +599,7 @@ append_consent_id_to_token_introspect_response=false
 servlet_extension="org.wso2.financial.services.accelerator.consent.mgt.extensions.authservlet.impl.FSDefaultAuthServletImpl"
 
 [financial_services.identity.extensions]
-# Uncomment these to get a default implementation of identity extensions
+# Uncomment these to get a default IS implementation of identity extensions ( Not required for OB scenarios)
 #request_object_validator="org.wso2.financial.services.accelerator.identity.extensions.auth.extensions.request.validator.DefaultFSRequestObjectValidator"
 #response_type_handler="org.wso2.financial.services.accelerator.identity.extensions.auth.extensions.response.handler.impl.FSDefaultResponseTypeHandlerImpl"
 #claim_provider="org.wso2.financial.services.accelerator.identity.extensions.claims.FSDefaultClaimProvider"
@@ -632,3 +638,6 @@ retry_function="EX"
 circuit_breaker_open_timeout=500
 pool_size=20
 event_notification_request_generator="org.wso2.financial.services.accelerator.event.notifications.service.realtime.service.DefaultRealtimeEventNotificationRequestGenerator"
+
+[agent_identity]
+enabled=false

pom.xml

@@ -655,7 +655,7 @@
         <carbon.identity.local.auth.api.version>2.5.10</carbon.identity.local.auth.api.version>
         <wso2.is7.key.manager.version>2.0.5</wso2.is7.key.manager.version>
         <org.wso2.carbon.apimgt.version>9.30.10</org.wso2.carbon.apimgt.version>
-        <org.wso2.carbon.apimgt.version.range>[9.29.120, 9.31.100)</org.wso2.carbon.apimgt.version.range>
+        <org.wso2.carbon.apimgt.version.range>[9.29.120, 9.32.133)</org.wso2.carbon.apimgt.version.range>
         <!--Unit Test related dependencies-->
         <jacoco.version>0.8.6</jacoco.version>
         <mockito.version>5.3.1</mockito.version>