@ductape/sdk 0.0.3-beta10 → 0.0.3-beta12

package/dist/processor/utils/storage.util.js

@@ -39,7 +39,6 @@ async function uploadBlobToCloud({ data, destinationPath, config, }) {
     if (typeof window !== 'undefined') {
         return null; // We're in a browser, don't load the PostgreSQL handler
     }
-    console.log("JASMINE", data);
     const bufferData = Buffer.from(data, "base64");
     switch (config.provider) {
         case types_1.StorageProviders.AWS: {

package/dist/processor/utils/storage.util.js.map

@@ -1 +1 @@
-{"version":3,"file":"storage.util.js","sourceRoot":"","sources":["../../../src/processor/utils/storage.util.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,8CAiEC;AAzED,uCAAkE;AAQ3D,KAAK,UAAU,iBAAiB,CAAC,EACpC,IAAI,EACJ,eAAe,EACf,MAAM,GACU;IAEhB,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;QAChC,OAAO,IAAI,CAAC,CAAC,wDAAwD;IACzE,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAE7B,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAE/C,QAAQ,MAAM,CAAC,QAAQ,EAAE,CAAC;QACtB,KAAK,wBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC;YAExB,MAAM,GAAG,GAAG,wDAAa,SAAS,GAAC,CAAA;YAEnC,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,SAAU,CAAC;YAC/E,MAAM,EAAE,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC;gBAClB,WAAW;gBACX,eAAe;gBACf,MAAM;aACT,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG;gBACX,MAAM,EAAE,UAAU;gBAClB,GAAG,EAAE,eAAe;gBACpB,IAAI,EAAE,UAAU;aACnB,CAAC;YAEF,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;YACjD,OAAO,MAAM,CAAC,QAAQ,CAAC;QAC3B,CAAC;QAED,KAAK,wBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC;YAExB,MAAM,EAAE,OAAO,EAAE,GAAG,wDAAa,uBAAuB,GAAC,CAAC;YAC1D,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC,SAAU,CAAC;YAC9D,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;YAC7C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAE1C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAC1C,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,YAAY,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAO,UAA8B,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;YAExH,OAAO,QAAQ,UAAU,IAAI,eAAe,EAAE,CAAC;QACnD,CAAC;QAED,KAAK,wBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC;YAC1B,MAAM,EAAE,iBAAiB,EAAE,GAAG,wDAAa,qBAAqB,GAAC,CAAC;YAClE,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,GAAG,MAAM,CAAC,WAAY,CAAC;YAChE,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,CAAC;YACnF,MAAM,eAAe,GAAG,iBAAiB,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;YAC5E,MAAM,eAAe,GAAG,eAAe,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;YAE5E,4GAA4G;YAE5G,MAAM,eAAe,CAAC,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;YAC5D,OAAO,eAAe,CAAC,GAAG,CAAC;QAC/B,CAAC;QAED;YACI,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACvD,CAAC;AACL,CAAC"}
+{"version":3,"file":"storage.util.js","sourceRoot":"","sources":["../../../src/processor/utils/storage.util.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,8CA+DC;AAvED,uCAAkE;AAQ3D,KAAK,UAAU,iBAAiB,CAAC,EACpC,IAAI,EACJ,eAAe,EACf,MAAM,GACU;IAEhB,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;QAChC,OAAO,IAAI,CAAC,CAAC,wDAAwD;IACzE,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAE/C,QAAQ,MAAM,CAAC,QAAQ,EAAE,CAAC;QACtB,KAAK,wBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC;YAExB,MAAM,GAAG,GAAG,wDAAa,SAAS,GAAC,CAAA;YAEnC,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,SAAU,CAAC;YAC/E,MAAM,EAAE,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC;gBAClB,WAAW;gBACX,eAAe;gBACf,MAAM;aACT,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG;gBACX,MAAM,EAAE,UAAU;gBAClB,GAAG,EAAE,eAAe;gBACpB,IAAI,EAAE,UAAU;aACnB,CAAC;YAEF,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;YACjD,OAAO,MAAM,CAAC,QAAQ,CAAC;QAC3B,CAAC;QAED,KAAK,wBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC;YAExB,MAAM,EAAE,OAAO,EAAE,GAAG,wDAAa,uBAAuB,GAAC,CAAC;YAC1D,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC,SAAU,CAAC;YAC9D,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;YAC7C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAE1C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAC1C,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,YAAY,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAO,UAA8B,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;YAExH,OAAO,QAAQ,UAAU,IAAI,eAAe,EAAE,CAAC;QACnD,CAAC;QAED,KAAK,wBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC;YAC1B,MAAM,EAAE,iBAAiB,EAAE,GAAG,wDAAa,qBAAqB,GAAC,CAAC;YAClE,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,GAAG,MAAM,CAAC,WAAY,CAAC;YAChE,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,CAAC;YACnF,MAAM,eAAe,GAAG,iBAAiB,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;YAC5E,MAAM,eAAe,GAAG,eAAe,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;YAE5E,4GAA4G;YAE5G,MAAM,eAAe,CAAC,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;YAC5D,OAAO,eAAe,CAAC,GAAG,CAAC;QAC/B,CAAC;QAED;YACI,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACvD,CAAC;AACL,CAAC"}

package/dist/products/services/products.service.d.ts

@@ -1,6 +1,7 @@
-import { IApp, IAppAccess, IAppAction, IAppWebhook, IVersion } from '../../types/appBuilder.types';
+import { IApp, IAppAccess, IAppAction, IAppWebhook, ISample, IVersion } from '../../types/appBuilder.types';
 import { IBuilderInit } from '../../types/index.types';
 import { IActionDataParserInput, IActionRequest, ICreateProductsBuilder, IFeatureEvent, IFeatureInput, IFeatureSequence, IProduct, IProductApp, IProductCache, IProductDatabase, IProductDatabaseAction, IProductEnv, IProductFeature, IProductFunction, IProductJobs, IParseActionEventInput, IParseInputStringInput, IParseInputStringMetaData, IProductStorage, IDbActionRequest, INotificationRequest, IProductQuota, IProductFallback, IProductDatabaseMigration, IQuotaOptions, IFallbackOptions, IProductSession } from '../../types/productsBuilder.types';
+import { KeyValuePair } from '../../imports/imports.types';
 import { IProductNotification, INotificationEnv, IProductNotificationTemplate, IProductMessageBroker, IProductMessageBrokerTopic } from '../../types/processor.types';
 import { IParsedSample } from '../../types/inputs.types';
 export interface IProductsBuilderService {
@@ -118,9 +119,15 @@ export default class ProductsBuilderService implements IProductsBuilderService {
     updateMessageBrokerTopic(data: Partial<IProductMessageBrokerTopic>): Promise<void>;
     fetchMessageBrokerTopic(tag: string, throwErrorIfExists?: boolean): IProductMessageBrokerTopic | null;
     fetchMessageBrokerTopics(messageBrokerTag: string): Array<IProductMessageBrokerTopic>;
-    validateQuotaFallbackInputAndOutput(data: Partial<IProductQuota> | Partial<IProductFallback>): Promise<void>;
-    validateQuotaFallbackInput(option: IQuotaOptions | IFallbackOptions, input: Record<string, IFeatureInput>): Promise<void>;
-    validateQuotaFallbackOutput(option: IQuotaOptions | IFallbackOptions, pastResponse: Record<string, unknown> | null, input: Record<string, IFeatureInput>): Promise<void>;
+    validateQuotaFallbackInputAndOutput(data: Partial<IProductQuota> | Partial<IProductFallback>, type: string): Promise<void>;
+    validateQuotaFallbackInput(option: IQuotaOptions | IFallbackOptions, input: Record<string, IFeatureInput>, type: string): Promise<void>;
+    checkKeyValuesInput(keyValues: Array<KeyValuePair>, input: Record<string, IFeatureInput>, type: string): void;
+    checkActionQuotaFallbackInput(sample: ISample, obj: any, featureInput: Record<string, IFeatureInput>, type: string): void;
+    checkFuncArgsForInputs(value: string, input: Record<string, IFeatureInput>, type: string): void;
+    checkInput(value: string, input: Record<string, IFeatureInput>, type: string): void;
+    validateQuotaFallbackOutput(option: IQuotaOptions | IFallbackOptions, pastResponse: Record<string, unknown> | null, input: Record<string, IFeatureInput>, type: string): Promise<void>;
+    checkFuncArgsForResponse(value: string, output: Record<string, unknown>, input: Record<string, IFeatureInput>, type: string): void;
+    checkResponse(value: string, output: Record<string, unknown>, input: Record<string, IFeatureInput>, type: string): void;
     createQuota(data: Partial<IProductQuota>): Promise<void>;
     updateQuota(tag: string, data: Partial<IProductQuota>): Promise<void>;
     fetchQuota(tag: string): IProductQuota | null;

package/dist/products/services/products.service.js

@@ -330,15 +330,15 @@ class ProductsBuilderService {
             throw new Error(`Message Broker ${messageBrokerTag} not found`);
         return messageBroker.topics;
     }
-    async validateQuotaFallbackInputAndOutput(data) {
+    async validateQuotaFallbackInputAndOutput(data, type) {
         const input = data.input;
         await Promise.all(data.options.map(async (d, index) => {
-            await this.validateQuotaFallbackInput(d, input);
+            await this.validateQuotaFallbackInput(d, input, type);
             const pastOutput = index > 0 ? data.options[index - 1].output : null;
-            await this.validateQuotaFallbackOutput(d, pastOutput, input);
+            await this.validateQuotaFallbackOutput(d, pastOutput, input, type);
         }));
     }
-    async validateQuotaFallbackInput(option, input) {
+    async validateQuotaFallbackInput(option, input, type) {
         if (option.type === productsBuilder_types_1.FeatureEventTypes.ACTION) {
             const _a = await this.fetchThirdPartyAppByAccessTag(option.app), { version } = _a, appData = __rest(_a, ["version"]);
             if (!appData) {
@@ -350,45 +350,171 @@ class ProductsBuilderService {
             if (!appData) {
                 throw new Error(`Action ${option.event} not found in ${option.app} version ${version}`);
             }
-            await this.validateActionDataInput({ input }, action, option.input, 0, 0);
+            //await this.validateActionDataInput({ input }, action, option.input, 0, 0);
+            // const keyValues = traverseObject(input.option);
+            //query
+            this.checkActionQuotaFallbackInput(action.query, option.input.query, input, 'query');
+            //headers
+            this.checkActionQuotaFallbackInput(action.headers, option.input.headers, input, 'headers');
+            // params
+            this.checkActionQuotaFallbackInput(action.params, option.input.params, input, 'params');
+            //body
+            this.checkActionQuotaFallbackInput(action.body, option.input.body, input, 'body');
         }
         else {
             const feature = this.fetchFeature(option.event);
             if (!feature) {
                 throw new Error(`Feature ${option.event} not found`);
             }
-            (0, objects_utils_2.validateObjectKeys)(feature.input, option.input);
-            const keyValues = (0, objects_utils_1.traverseObject)(option.input);
-            for (let keyValue of keyValues) {
-                const { key, value } = keyValue;
-                if (!value.startsWith('$Input{')) {
-                    //throw new Error(`Feature input ${value} is invalid, all feature Inputs are expected to start with $Input{}`);
-                }
-            }
+            const map = (0, functions_utils_1.convertInputToValueMap)(feature.input);
+            (0, objects_utils_2.validateObjectKeys)(map, option.input, '', 'option input', 'feature input definition');
         }
+        const keyValues = (0, objects_utils_1.traverseObject)(option.input);
+        this.checkKeyValuesInput(keyValues, input, type);
         this.isQuotaFallbackInput = false;
     }
-    async validateQuotaFallbackOutput(option, pastResponse, input) {
-        const _a = await this.fetchThirdPartyAppByAccessTag(option.app), { version } = _a, appData = __rest(_a, ["version"]);
-        if (!appData) {
-            throw new Error(`App ${option.app} not found`);
+    checkKeyValuesInput(keyValues, input, type) {
+        for (let keyValue of keyValues) {
+            const { key, value } = keyValue;
+            if (!String(value).startsWith('$')) {
+            }
+            else if (String(value).startsWith('$Auth{')) {
+                // TODO: validate auth input later
+            }
+            else if (String(value).startsWith('$') && !String(value).startsWith('$Input{')) {
+                this.checkFuncArgsForInputs(String(value).trim(), input, type);
+            }
+            else if (!String(value).startsWith('$Input{')) {
+                throw new Error(`Feature input ${value} is invalid, all feature Inputs are expected to start with $Input{}`);
+            }
+            else {
+                this.checkInput(String(value).trim(), input, type);
+            }
+        }
+    }
+    checkActionQuotaFallbackInput(sample, obj, featureInput, type) {
+        const data = (0, objects_utils_1.traverseObject)(obj);
+        //compare obj keys to sample keys
+        (0, objects_utils_2.validateObjectKeys)(sample.sample ? JSON.parse(String(sample.sample)) : {}, obj, '', `action ${type} input`, `action ${type} input sample`);
+        // check if values in data can be found inside featureInput
+        this.checkKeyValuesInput(data, featureInput, type);
+    }
+    checkFuncArgsForInputs(value, input, type) {
+        const isFunc = (0, functions_utils_1.startsWithFunctionAndEndsWithParen)(value);
+        if (!isFunc) {
+            throw new Error(`Invalid function call ${value}`);
+        }
+        const funcArgs = (0, functions_utils_1.extractFunctionAndArgs)(value);
+        if (funcArgs && funcArgs.args.length) {
+            funcArgs.args.map((arg) => {
+                const args = arg.trim().split(',');
+                args.map((argz) => {
+                    const arg = argz.trim();
+                    if (arg.startsWith('$') && !arg.startsWith('$Input{')) {
+                        this.checkFuncArgsForInputs(arg, input, type);
+                    }
+                    else if (arg.startsWith('$Input{')) {
+                        this.checkInput(arg, input, type);
+                    }
+                });
+            });
         }
-        const { actions } = appData.versions.find((data) => data.tag === version);
-        const action = actions.find((data) => data.tag === option.event);
-        if (!appData) {
-            throw new Error(`Action ${event} not found in ${option.app} version ${version}`);
+    }
+    checkInput(value, input, type) {
+        const stages = this.extractStages(value);
+        if (stages.length > 1) {
+            throw new Error(`Invalid input ${value}, nested locators not allowed in $Input`);
         }
-        const response = action.responses.find((item) => item.success === true);
-        // fetch success result
-        if (!response) {
-            throw new Error(`event ${event} does not have a success response`);
+        if (!input[stages[0]]) {
+            throw new Error(`${value} not found in ${type} input definition`);
         }
+    }
+    async validateQuotaFallbackOutput(option, pastResponse, input, type) {
         if (pastResponse) {
-            (0, objects_utils_2.validateObjectKeys)(option.output, pastResponse);
+            (0, objects_utils_2.validateObjectKeys)(option.output, pastResponse, `previous outputs`, `${option.event} ${type} output`);
+        }
+        if (option.type === productsBuilder_types_1.FeatureEventTypes.ACTION) {
+            const _a = await this.fetchThirdPartyAppByAccessTag(option.app), { version } = _a, appData = __rest(_a, ["version"]);
+            if (!appData) {
+                throw new Error(`App ${option.app} not found`);
+            }
+            const { actions } = appData.versions.find((data) => data.tag === version);
+            const action = actions.find((data) => data.tag === option.event);
+            if (!appData) {
+                throw new Error(`Action ${event} not found in ${option.app} version ${version}`);
+            }
+            const response = action.responses.find((item) => item.success === true);
+            // fetch success result
+            if (!response) {
+                throw new Error(`event ${event} does not have a success response`);
+            }
+            // validate that each output item starts with response or Input and then validate the stages are valid;
+        }
+        else {
+            // fetch feature
+            const feature = this.fetchFeature(option.event);
+            if (!feature) {
+                throw new Error(`Feature ${option.event} not found`);
+            }
+            const { output } = feature;
+            const keyValues = (0, objects_utils_1.traverseObject)(option.output);
+            for (let keyValue of keyValues) {
+                const { key, value } = keyValue;
+                if (!value.startsWith('$')) {
+                }
+                else if (value.startsWith('$') && !value.startsWith('$Response{') && !value.startsWith('$Input')) {
+                    this.checkFuncArgsForResponse(value.trim(), output, input, type);
+                }
+                else if (!value.startsWith('$Response{') && !value.startsWith('$Input{')) {
+                    throw new Error(`Feature output ${value} is invalid, all feature outputs for ${type} are expected to start with $Response or $Input{}`);
+                }
+                else if (value.startsWith('$Response')) {
+                    this.checkResponse(value.trim(), output, input, type);
+                }
+                else if (value.startsWith('$Input')) {
+                    this.checkInput(value, input, type);
+                }
+            }
         }
         // validate that each response matches the expected format
         /**await this.validateActionResponse(response, res)*/
     }
+    checkFuncArgsForResponse(value, output, input, type) {
+        const isFunc = (0, functions_utils_1.startsWithFunctionAndEndsWithParen)(value);
+        if (!isFunc) {
+            throw new Error(`Invalid function call ${value}`);
+        }
+        const funcArgs = (0, functions_utils_1.extractFunctionAndArgs)(value);
+        if (funcArgs && funcArgs.args.length) {
+            funcArgs.args.map((arg) => {
+                const args = arg.trim().split(',');
+                args.map((argz) => {
+                    const arg = argz.trim();
+                    if (arg.startsWith('$') && !arg.startsWith('$Response{') && !arg.startsWith('$Input{')) {
+                        this.checkFuncArgsForResponse(arg, output, input, type);
+                    }
+                    else if (arg.startsWith('$Response{')) {
+                        this.checkResponse(arg, output, input, type);
+                    }
+                    else if (arg.startsWith('$Input{')) {
+                        this.checkInput(arg, input, type);
+                    }
+                });
+            });
+        }
+    }
+    checkResponse(value, output, input, type) {
+        const stages = this.extractStages(value);
+        let current = output;
+        for (const stage of stages) {
+            if (current && typeof current === 'object' && stage in current) {
+                current = current[stage];
+            }
+            else {
+                throw new Error(`${value} not found in ${type} response definition`);
+            }
+        }
+    }
     async createQuota(data) {
         try {
             if (!data.tag) {
@@ -396,7 +522,7 @@ class ProductsBuilderService {
             }
             if (!this.fetchQuota(data.tag)) {
                 await validators_1.CreateProductQuotaSchema.validateAsync(data);
-                await this.validateQuotaFallbackInputAndOutput(data);
+                await this.validateQuotaFallbackInputAndOutput(data, 'quota');
                 data.total_quota = 0;
                 data.total_init = 0;
                 await Promise.all(data.options.map(async (d) => {
@@ -419,9 +545,9 @@ class ProductsBuilderService {
                             if (!action) {
                                 throw new Error(`Cannot find healthcheck action ${d.healthcheck} on app ${app.tag} version ${app.version}`);
                             }
-                        }
-                        if (action.headers.data.length > 0 || action.body.data.length > 0 || action.params.data.length > 0 || action.query.data.length > 0) {
-                            throw new Error('Healthcheck action is expected to have no headers, body, params or query');
+                            if (action.headers.data.length > 0 || action.body.data.length > 0 || action.params.data.length > 0 || action.query.data.length > 0) {
+                                throw new Error('Healthcheck action is expected to have no headers, body, params or query');
+                            }
                         }
                     }
                     d.last_checked = new Date();
@@ -430,9 +556,6 @@ class ProductsBuilderService {
                 }));
                 await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({}, data), { component: enums_1.ProductComponents.QUOTA, action: enums_1.RequestAction.CREATE }), this.getUserAccess());
             }
-            else {
-                throw new Error(`Quota with tag ${data.tag} already exists`);
-            }
         }
         catch (e) {
             throw e;
@@ -440,12 +563,14 @@ class ProductsBuilderService {
     }
     async updateQuota(tag, data) {
         try {
-            if (this.fetchQuota(tag)) {
+            const quota = this.fetchQuota(tag);
+            if (quota) {
                 await validators_1.UpdateProductQuotaSchema.validateAsync(data);
                 if (data.options) {
-                    await this.validateQuotaFallbackInputAndOutput(data);
+                    await this.validateQuotaFallbackInputAndOutput(data, 'quota');
                     data.total_quota = 0;
                     data.total_init = 0;
+                    data.tag = tag;
                     await Promise.all(data.options.map(async (d) => {
                         data.total_quota += d.quota;
                         if (d.type === productsBuilder_types_1.FeatureEventTypes.ACTION) {
@@ -476,7 +601,7 @@ class ProductsBuilderService {
                         d.last_available = true;
                     }));
                 }
-                await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({}, data), { component: enums_1.ProductComponents.QUOTA, action: enums_1.RequestAction.UPDATE }), this.getUserAccess());
+                await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign(Object.assign({}, quota), data), { component: enums_1.ProductComponents.QUOTA, action: enums_1.RequestAction.UPDATE }), this.getUserAccess());
             }
             else {
                 throw new Error(`Quota with tag ${data.tag} not found`);
@@ -497,9 +622,9 @@ class ProductsBuilderService {
             if (!data.tag) {
                 throw new Error('tag field is required');
             }
-            if (!this.fetchQuota(data.tag)) {
+            if (!this.fetchFallback(data.tag)) {
                 await validators_1.CreateProductFallbackSchema.validateAsync(data);
-                await this.validateQuotaFallbackInputAndOutput(data);
+                await this.validateQuotaFallbackInputAndOutput(data, 'fallback');
                 await Promise.all(data.options.map(async (d) => {
                     if (d.type === productsBuilder_types_1.FeatureEventTypes.ACTION) {
                         const app = await this.fetchThirdPartyAppByAccessTag(d.app);
@@ -530,9 +655,6 @@ class ProductsBuilderService {
                 }));
                 await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({}, data), { component: enums_1.ProductComponents.FALLBACK, action: enums_1.RequestAction.CREATE }), this.getUserAccess());
             }
-            else {
-                throw new Error(`Quota with tag ${data.tag} already exists`);
-            }
         }
         catch (e) {
             throw e;
@@ -540,10 +662,12 @@ class ProductsBuilderService {
     }
     async updateFallback(tag, data) {
         try {
-            if (this.fetchFallback(tag)) {
+            const fallback = this.fetchFallback(tag);
+            if (fallback) {
                 await validators_1.UpdateProductFallbackSchema.validateAsync(data);
                 if (data.options) {
-                    await this.validateQuotaFallbackInputAndOutput(data);
+                    await this.validateQuotaFallbackInputAndOutput(data, 'fallback');
+                    data.tag = tag;
                     await Promise.all(data.options.map(async (d) => {
                         if (d.type === productsBuilder_types_1.FeatureEventTypes.ACTION) {
                             const app = await this.fetchThirdPartyAppByAccessTag(d.app);
@@ -573,10 +697,10 @@ class ProductsBuilderService {
                         d.last_available = true;
                     }));
                 }
-                await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({}, data), { component: enums_1.ProductComponents.FALLBACK, action: enums_1.RequestAction.UPDATE }), this.getUserAccess());
+                await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign(Object.assign({}, fallback), data), { component: enums_1.ProductComponents.FALLBACK, action: enums_1.RequestAction.UPDATE }), this.getUserAccess());
             }
             else {
-                throw new Error(`Quota with tag ${data.tag} not found`);
+                throw new Error(`Fallback with tag ${data.tag} not found`);
             }
         }
         catch (e) {