VRP authorization flow

open-banking-accelerator/components/com.wso2.openbanking.accelerator.common/src/main/java/com/wso2/openbanking/accelerator/common/util/ErrorConstants.java

@@ -290,5 +290,14 @@ public class ErrorConstants {
     public static final String PATH_PERIOD_TYPE = "Data.ControlParameters.PeriodicLimits.PeriodType";
     public static final String PATH_PERIOD_ALIGNMENT = "Data.ControlParameters.PeriodicLimits.PeriodAlignment";
 
+    // VRP Authorization flow
+    public static final String CONTROL_PARAMETERS_MISSING_ERROR = "Missing mandatory parameter the ControlParameters";
+    public static final String DATA_OBJECT_MISSING_ERROR = "Missing mandatory parameter the Data";
+    public static final String MAX_AMOUNT_NOT_JSON_OBJECT_ERROR = "Parameter Maximum Individual Amount is" +
+            "not of type JSONObject";
+    public static final String NOT_JSON_ARRAY_ERROR = "Parameter PeriodicLimits is not a JSON Array";
+    public static final String PERIOD_ALIGNMENT_NOT_STRING_ERROR = "Parameter Period Alignment is not a String";
+    public static final String PERIOD_TYPE_NOT_STRING_ERROR = "Parameter Period Type is not a String";
+    public static final String NOT_STRING_ERROR = "Parameter amount or currency is not a String";
 }
 

open-banking-accelerator/components/consent-management/com.wso2.openbanking.accelerator.consent.extensions/src/main/java/com/wso2/openbanking/accelerator/consent/extensions/authorize/impl/DefaultConsentRetrievalStep.java

@@ -16,19 +16,16 @@
  * under the License.
  */
 
-
 package com.wso2.openbanking.accelerator.consent.extensions.authorize.impl;
 
 import com.wso2.openbanking.accelerator.common.exception.ConsentManagementException;
-import com.wso2.openbanking.accelerator.consent.extensions.authorize.impl.handler.retrieval.ConsentRetrievalHandler;
 import com.wso2.openbanking.accelerator.consent.extensions.authorize.model.ConsentData;
 import com.wso2.openbanking.accelerator.consent.extensions.authorize.model.ConsentRetrievalStep;
 import com.wso2.openbanking.accelerator.consent.extensions.authorize.utils.ConsentRetrievalUtil;
 import com.wso2.openbanking.accelerator.consent.extensions.common.ConsentException;
 import com.wso2.openbanking.accelerator.consent.extensions.common.ConsentExtensionConstants;
 import com.wso2.openbanking.accelerator.consent.extensions.common.ConsentServiceUtil;
 import com.wso2.openbanking.accelerator.consent.extensions.common.ResponseStatus;
-import com.wso2.openbanking.accelerator.consent.extensions.common.factory.AcceleratorConsentExtensionFactory;
 import com.wso2.openbanking.accelerator.consent.extensions.internal.ConsentExtensionsDataHolder;
 import com.wso2.openbanking.accelerator.consent.mgt.dao.models.AuthorizationResource;
 import com.wso2.openbanking.accelerator.consent.mgt.dao.models.ConsentResource;
@@ -44,7 +41,6 @@
 public class DefaultConsentRetrievalStep implements ConsentRetrievalStep {
 
     private static final Log log = LogFactory.getLog(DefaultConsentRetrievalStep.class);
-    ConsentRetrievalHandler consentRetrievalHandler;
 
     @Override
     public void execute(ConsentData consentData, JSONObject jsonObject) throws ConsentException {
@@ -66,7 +62,7 @@ public void execute(ConsentData consentData, JSONObject jsonObject) throws Conse
                             "executed successfully before default consent persist step");
                 }
                 String requestObject = ConsentRetrievalUtil.extractRequestObject(consentData.getSpQueryParams());
-                consentId =  ConsentRetrievalUtil.extractConsentId(requestObject);
+                consentId = ConsentRetrievalUtil.extractConsentId(requestObject);
                 consentData.setConsentId(consentId);
             }
             ConsentResource consentResource = consentCoreService.getConsent(consentId, false);
@@ -101,7 +97,6 @@ public void execute(ConsentData consentData, JSONObject jsonObject) throws Conse
             JSONArray accountsJSON = ConsentRetrievalUtil.appendDummyAccountID();
             jsonObject.appendField(ConsentExtensionConstants.ACCOUNTS, accountsJSON);
 
-
         } catch (ConsentException e) {
             JSONObject errorObj = (JSONObject) e.getPayload();
             JSONArray errorList = (JSONArray) errorObj.get("Errors");
@@ -113,18 +108,16 @@ public void execute(ConsentData consentData, JSONObject jsonObject) throws Conse
                     "Exception occurred while getting consent data");
         }
     }
+
     /**
      * Method to retrieve consent related data from the initiation payload.
      * @param consentResource
-     * @return
+     * @return  consent
      * @throws ConsentException
      */
-    public JSONArray getConsentDataSet(ConsentResource consentResource)
-            throws ConsentException {
+    public JSONArray getConsentDataSet(ConsentResource consentResource) {
 
-        String type = consentResource.getConsentType();
-        consentRetrievalHandler = AcceleratorConsentExtensionFactory.getConsentRetrievalHandler(type);
-        return consentRetrievalHandler.getConsentDataSet(consentResource);
+        return ConsentRetrievalUtil.getConsentData(consentResource);
     }
 
 }