cloudcommerce 0.3.0 → 0.4.1

package/packages/cli/src/setup-gcloud.ts

@@ -1,27 +1,135 @@
 import path from 'node:path';
-import { $, fs } from 'zx';
+import {
+  $,
+  fs,
+  question,
+  echo,
+} from 'zx';
 
+let gcpAccessToken: string | undefined;
 const serviceAccountId = 'cloud-commerce-gh-actions';
 const getAccountEmail = (projectId: string) => {
   return `${serviceAccountId}@${projectId}.iam.gserviceaccount.com`;
 };
 
+const requestApi = async (
+  projectId: string,
+  options?: {
+    baseURL?: string,
+    url?: string,
+    method: string,
+    body?: string,
+  },
+) => {
+  const body = options?.body;
+  let url = options?.baseURL
+    || `https://iam.googleapis.com/v1/projects/${projectId}/serviceAccounts`;
+  url += options?.url || '';
+  const data = await (await fetch(
+    url,
+    {
+      method: options?.method || 'GET',
+      headers: {
+        Authorization: `Bearer ${gcpAccessToken}`,
+        'Content-Type': 'application/json; charset=utf-8',
+      },
+      body,
+    },
+  )).json() as any;
+  const { error } = data;
+  if (error) {
+    let msgErr = 'Unexpected error in request';
+    msgErr = error.message ? `Code: ${error.code} - ${error.message}` : msgErr;
+    const err = new Error(msgErr);
+    throw err;
+  }
+  return data;
+};
+
+const getGcpAccessToken = async () => {
+  await echo`-- Get the Google Cloud account credentials:
+  1. Access https://shell.cloud.google.com/?fromcloudshell=true&show=terminal
+  2. Execute \`gcloud auth application-default print-access-token\` in Cloud Shell
+`;
+  return question('Google Cloud access token: ');
+};
+
 const checkServiceAccountExists = async (projectId: string) => {
   let hasServiceAccount: boolean;
   try {
-    const { stderr } = await $`gcloud iam service-accounts describe ${getAccountEmail(projectId)}`;
-    hasServiceAccount = !/not_?found/i.test(stderr);
-  } catch (e) {
+    if (!gcpAccessToken) {
+      const { stderr } = await $`gcloud iam service-accounts describe ${getAccountEmail(projectId)}`;
+      hasServiceAccount = !/not_?found/i.test(stderr);
+    } else {
+      // https://cloud.google.com/iam/docs/creating-managing-service-accounts?hl=pt-br#listing
+      const { accounts: listAccounts } = await requestApi(projectId);
+      const accountFound = listAccounts
+        && listAccounts.find(({ email }) => email === getAccountEmail(projectId));
+      hasServiceAccount = Boolean(accountFound);
+    }
+  } catch {
     return null;
   }
   return hasServiceAccount;
 };
 
 const siginGcloudAndSetIAM = async (projectId: string, pwd: string) => {
-  if (/no credential/i.test((await $`gcloud auth list`).stderr)) {
-    await $`gcloud auth login`;
+  let hasGcloud: boolean;
+  try {
+    hasGcloud = Boolean(await $`command -v gcloud`);
+  } catch {
+    hasGcloud = false;
+  }
+  if (hasGcloud) {
+    if (/no credential/i.test((await $`gcloud auth list`).stderr)) {
+      await $`gcloud auth login`;
+    }
+    await $`gcloud config set project ${projectId}`;
+  } else {
+    gcpAccessToken = await getGcpAccessToken();
+  }
+
+  const serviceAccount = await checkServiceAccountExists(projectId);
+  if (!serviceAccount) {
+    const description = 'A service account with permission to deploy Cloud Commerce'
+      + ' from the GitHub repository to Firebase';
+    const displayName = 'Cloud Commerce GH Actions';
+    if (hasGcloud) {
+      await $`gcloud iam service-accounts create ${serviceAccountId} \
+        --description=${description} --display-name=${displayName}`;
+    } else if (gcpAccessToken) {
+      const body = JSON.stringify({
+        accountId: serviceAccountId,
+        serviceAccount: {
+          description,
+          displayName,
+        },
+      });
+      await requestApi(projectId, { method: 'POST', body });
+    }
+  }
+  await fs.ensureDir(path.join(pwd, '.cloudcommerce'));
+  const pathPolicyIAM = path.join(pwd, '.cloudcommerce', 'policyIAM.json');
+  let policyIAM: Record<string, any> = {};
+  const version = 3; // most recent
+  const baseURL = `https://cloudresourcemanager.googleapis.com/v1/projects/${projectId}`;
+  if (hasGcloud) {
+    await $`gcloud projects get-iam-policy ${projectId} --format json > ${pathPolicyIAM}`;
+    policyIAM = fs.readJSONSync(pathPolicyIAM);
+  } else if (gcpAccessToken) {
+    // https://cloud.google.com/iam/docs/granting-changing-revoking-access?hl=pt-br#view-access
+    // POST https://cloudresourcemanager.googleapis.com/API_VERSION/RESOURCE_TYPE/RESOURCE_ID:getIamPolicy
+    policyIAM = await requestApi(
+      projectId,
+      {
+        baseURL,
+        url: ':getIamPolicy',
+        method: 'POST',
+        body: JSON.stringify({ options: { requestedPolicyVersion: version } }),
+      },
+    );
   }
-  await $`gcloud config set project ${projectId}`;
+
   const roles = [
     'roles/firebase.admin',
     'roles/appengine.appAdmin',
@@ -34,18 +142,10 @@ const siginGcloudAndSetIAM = async (projectId: string, pwd: string) => {
     'roles/serviceusage.apiKeysViewer',
     'roles/serviceusage.serviceUsageAdmin',
   ];
-  const serviceAccount = await checkServiceAccountExists(projectId);
-  if (!serviceAccount) {
-    await $`gcloud iam service-accounts create ${serviceAccountId} \
-      --description="A service account with permission to deploy Cloud Commerce from the GitHub repository to Firebase" \
-      --display-name="Cloud Commerce GH Actions"`;
+  let { bindings } = policyIAM;
+  if (!bindings) {
+    bindings = [];
   }
-  await fs.ensureDir(path.join(pwd, '.cloudcommerce'));
-  const pathPolicyIAM = path.join(pwd, '.cloudcommerce', 'policyIAM.json');
-  await $`gcloud projects get-iam-policy ${projectId} --format json > ${pathPolicyIAM}`;
-  const policyIAM = fs.readJSONSync(pathPolicyIAM);
-  const { bindings } = policyIAM;
-
   let mustUpdatePolicy = false;
   roles.forEach((role) => {
     const roleFound = bindings.find((binding) => binding.role === role);
@@ -78,8 +178,22 @@ const siginGcloudAndSetIAM = async (projectId: string, pwd: string) => {
     }
   });
   if (mustUpdatePolicy) {
-    fs.writeJSONSync(pathPolicyIAM, policyIAM);
-    return $`gcloud projects set-iam-policy ${projectId} ${pathPolicyIAM}`;
+    if (hasGcloud) {
+      fs.writeJSONSync(pathPolicyIAM, policyIAM);
+      return $`gcloud projects set-iam-policy ${projectId} ${pathPolicyIAM}`;
+    } if (gcpAccessToken) {
+      Object.assign(policyIAM, { version, bindings });
+      // POST https://cloudresourcemanager.googleapis.com/API_VERSION/RESOURCE_TYPE/RESOURCE_ID:setIamPolicy
+      return requestApi(
+        projectId,
+        {
+          baseURL,
+          url: ':setIamPolicy',
+          method: 'POST',
+          body: JSON.stringify({ policy: policyIAM }),
+        },
+      );
+    }
   }
   return null;
 };
@@ -87,8 +201,19 @@ const siginGcloudAndSetIAM = async (projectId: string, pwd: string) => {
 const createServiceAccountKey = async (projectId: string, pwd: string) => {
   try {
     const pathFileKey = path.join(pwd, '.cloudcommerce', 'serviceAccountKey.json');
-    await $`gcloud iam service-accounts keys create ${pathFileKey} \
+    if (!gcpAccessToken) {
+      await $`gcloud iam service-accounts keys create ${pathFileKey} \
       --iam-account=${getAccountEmail(projectId)}`;
+    } else {
+      const { privateKeyData } = await requestApi(
+        projectId,
+        {
+          url: `/${getAccountEmail(projectId)}/keys`,
+          method: 'POST',
+        },
+      );
+      await $`echo '${privateKeyData}' | base64 --decode > ${pathFileKey}`;
+    }
     return JSON.stringify(fs.readJSONSync(pathFileKey));
   } catch (e) {
     return null;

package/packages/config/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/config",
   "type": "module",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "E-Com Plus Cloud Commerce base config",
   "main": "lib/config.js",
   "exports": {

package/packages/emails/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/emails",
   "type": "module",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "E-Com Plus Cloud Commerce",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@cloudcommerce/firebase": "workspace:*",
-    "axios": "^1.2.6",
+    "axios": "^1.3.2",
     "ejs": "^3.1.8",
     "nodemailer": "^6.9.1"
   },

package/packages/emails/tests/assets/order.json

@@ -4,7 +4,7 @@
   "utm": {
       "campaign": "adwords_example"
   },
-  "browser_ip": "8.8.8.8",
+  "client_ip": "8.8.8.8",
   "channel_id": "10001",
   "domain": "www.sampleshop.com.br",
   "opened_at": "2017-11-19T13:10:00.612Z",

package/packages/events/lib/firebase.js

@@ -28,4 +28,6 @@ export * from '@cloudcommerce/app-google-analytics';
 export * from '@cloudcommerce/app-paghiper/webhook';
 
 export * from '@cloudcommerce/app-melhor-envio/events';
+
+export * from '@cloudcommerce/app-webhooks';
 // # sourceMappingURL=firebase.js.map

package/packages/events/lib/firebase.js.map

@@ -1 +1 @@
-{"version":3,"file":"firebase.js","sourceRoot":"","sources":["../src/firebase.ts"],"names":[],"mappings":"AAAA,iDAAiD;AACjD,OAAO,kCAAkC,CAAC;AAE1C,cAAc,6BAA6B,CAAC;AAE5C,cAAc,wCAAwC,CAAC;AAEvD,cAAc,2BAA2B,CAAC;AAE1C,cAAc,oCAAoC,CAAC;AAEnD,cAAc,gCAAgC,CAAC;AAE/C,cAAc,wCAAwC,CAAC;AAEvD,cAAc,oCAAoC,CAAC;AAEnD,cAAc,0CAA0C,CAAC;AAEzD,cAAc,kCAAkC,CAAC;AAEjD,cAAc,mCAAmC,CAAC;AAElD,cAAc,sCAAsC,CAAC;AAErD,cAAc,qCAAqC,CAAC;AAEpD,cAAc,qCAAqC,CAAC;AAEpD,cAAc,wCAAwC,CAAC"}
+{"version":3,"file":"firebase.js","sourceRoot":"","sources":["../src/firebase.ts"],"names":[],"mappings":"AAAA,iDAAiD;AACjD,OAAO,kCAAkC,CAAC;AAE1C,cAAc,6BAA6B,CAAC;AAE5C,cAAc,wCAAwC,CAAC;AAEvD,cAAc,2BAA2B,CAAC;AAE1C,cAAc,oCAAoC,CAAC;AAEnD,cAAc,gCAAgC,CAAC;AAE/C,cAAc,wCAAwC,CAAC;AAEvD,cAAc,oCAAoC,CAAC;AAEnD,cAAc,0CAA0C,CAAC;AAEzD,cAAc,kCAAkC,CAAC;AAEjD,cAAc,mCAAmC,CAAC;AAElD,cAAc,sCAAsC,CAAC;AAErD,cAAc,qCAAqC,CAAC;AAEpD,cAAc,qCAAqC,CAAC;AAEpD,cAAc,wCAAwC,CAAC;AAEvD,cAAc,6BAA6B,CAAC"}

package/packages/events/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/events",
   "type": "module",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "E-Com Plus Cloud Commerce app events",
   "main": "lib/index.js",
   "exports": {
@@ -38,9 +38,10 @@
     "@cloudcommerce/app-paghiper": "workspace:*",
     "@cloudcommerce/app-pix": "workspace:*",
     "@cloudcommerce/app-tiny-erp": "workspace:*",
+    "@cloudcommerce/app-webhooks": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
     "firebase-admin": "^11.5.0",
-    "firebase-functions": "^4.2.0",
+    "firebase-functions": "^4.2.1",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {

package/packages/events/src/firebase.ts

@@ -28,3 +28,5 @@ export * from '@cloudcommerce/app-google-analytics';
 export * from '@cloudcommerce/app-paghiper/webhook';
 
 export * from '@cloudcommerce/app-melhor-envio/events';
+
+export * from '@cloudcommerce/app-webhooks';

package/packages/firebase/lib/config.d.ts

@@ -77,6 +77,10 @@ declare const mergeConfig: {
             appId: number;
             events: ApiEventName[];
         };
+        webhooksApp: {
+            appId: number;
+            events: ApiEventName[];
+        };
     };
     cmsSettings: CmsSettings;
 };

package/packages/firebase/lib/config.js

@@ -24,7 +24,7 @@ const frenetEvents = [
 ];
 const fbConversionsEvents = [
   'orders-new',
-  'carts-new',
+  'carts-customerSet',
 ];
 const googleAnalyticsEvents = [
   'orders-anyStatusSet',
@@ -32,6 +32,11 @@ const googleAnalyticsEvents = [
 const melhorEnvioEvents = [
   'orders-anyStatusSet',
 ];
+const webhooksAppEvents = [
+  'applications-dataSet',
+  'orders-anyStatusSet',
+  'carts-delayed',
+];
 const {
   SETTINGS_FILEPATH, DEPLOY_REGION, SSR_DEPLOY_REGION, SSR_DEPLOY_MEMORY, SSR_DEPLOY_TIMEOUT_SECONDS, SSR_DEPLOY_MIN_INSTANCES,
 } = process.env;
@@ -119,6 +124,10 @@ const mergeConfig = {
       appId: 1236,
       events: melhorEnvioEvents,
     },
+    webhooksApp: {
+      appId: 123113,
+      events: webhooksAppEvents,
+    },
   },
   cmsSettings,
 };

package/packages/firebase/lib/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}

package/packages/firebase/lib/handlers/check-store-events.js

@@ -9,7 +9,7 @@ const parseEventName = (evName, baseApiEventsFilter) => {
   const [resource, actionName] = evName.split('-');
   const params = { ...baseApiEventsFilter };
   const bodySet = {};
-  if (actionName === 'new') {
+  if (actionName === 'new' || actionName === 'delayed') {
     params.action = 'create';
   } else {
     switch (resource) {
@@ -53,7 +53,7 @@ const parseEventName = (evName, baseApiEventsFilter) => {
   Object.keys(bodySet).forEach((field) => {
     params[`body.${field}`] = bodySet[field];
   });
-  return { resource, params };
+  return { resource, params, actionName };
 };
 const pubSubClient = new PubSub();
 const tryPubSubPublish = (topicName, messageObj, retries = 0) => {
@@ -111,13 +111,22 @@ export default async () => {
   // Some resource events are not listened to every minute
   const isOrdersOnly = Boolean(new Date().getMinutes() % 5);
   listenedEvents.forEach(async (listenedEventName) => {
-    const { resource, params } = parseEventName(listenedEventName, baseApiEventsFilter);
+    const { resource, params, actionName } = parseEventName(listenedEventName, baseApiEventsFilter);
     if (resource !== 'orders') {
       if (isOrdersOnly) {
         return;
       }
       if (lastNonOrdersTimestamp) {
-        params['timestamp>'] = new Date(lastNonOrdersTimestamp).toISOString();
+        if (actionName === 'delayed') {
+          // defines the limits for getting events with predefined delay
+          const delayMs = process.env.API_EVENTS_DELAYED_MS
+            ? (parseInt(process.env.API_EVENTS_DELAYED_MS, 10))
+            : (1000 * 60 * 5);
+          params['timestamp>'] = new Date(lastNonOrdersTimestamp - delayMs).toISOString();
+          params['timestamp<'] = new Date(timestamp - delayMs).toISOString();
+        } else {
+          params['timestamp>'] = new Date(lastNonOrdersTimestamp).toISOString();
+        }
       }
     }
     let { data: { result } } = await api.get(`events/${resource}`, {

package/packages/firebase/lib/handlers/check-store-events.js.map

@@ -1 +1 @@
-{"version":3,"file":"check-store-events.js","sourceRoot":"","sources":["../../src/handlers/check-store-events.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"check-store-events.js","sourceRoot":"","sources":["../../src/handlers/check-store-events.ts"],"names":[],"mappings":"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"}

package/packages/firebase/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/firebase",
   "type": "module",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "E-Com Plus Cloud Commerce on Firebase",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -33,7 +33,7 @@
     "@cloudcommerce/config": "workspace:*",
     "@google-cloud/pubsub": "^3.3.0",
     "firebase-admin": "^11.5.0",
-    "firebase-functions": "^4.2.0",
+    "firebase-functions": "^4.2.1",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {

package/packages/firebase/src/config.ts

@@ -9,36 +9,35 @@ const tinyErpEvents: ApiEventName[] = [
   'products-priceSet',
   'applications-dataSet',
 ];
-
 const emailsEvents: ApiEventName[] = [
   'orders-new',
   'orders-anyStatusSet',
 ];
-
 const galaxPayEvents: ApiEventName[] = [
   'orders-cancelled',
 ];
-
 const loyaltyPointsEvents: ApiEventName[] = [
   'orders-new',
   'orders-anyStatusSet',
 ];
-
 const frenetEvents: ApiEventName[] = [
   'orders-new',
 ];
 const fbConversionsEvents: ApiEventName[] = [
   'orders-new',
-  'carts-new',
+  'carts-customerSet',
 ];
-
 const googleAnalyticsEvents: ApiEventName[] = [
   'orders-anyStatusSet',
 ];
-
 const melhorEnvioEvents: ApiEventName[] = [
   'orders-anyStatusSet',
 ];
+const webhooksAppEvents: ApiEventName[] = [
+  'applications-dataSet',
+  'orders-anyStatusSet',
+  'carts-delayed',
+];
 
 const {
   SETTINGS_FILEPATH,
@@ -134,6 +133,10 @@ const mergeConfig = {
       appId: 1236,
       events: melhorEnvioEvents,
     },
+    webhooksApp: {
+      appId: 123113,
+      events: webhooksAppEvents,
+    },
   },
   cmsSettings,
 };

package/packages/firebase/src/handlers/check-store-events.ts

@@ -13,7 +13,7 @@ const parseEventName = (
   const [resource, actionName] = evName.split('-');
   const params: ApiConfig['params'] = { ...baseApiEventsFilter };
   const bodySet: { [key: string]: any } = {};
-  if (actionName === 'new') {
+  if (actionName === 'new' || actionName === 'delayed') {
     params.action = 'create';
   } else {
     switch (resource) {
@@ -57,9 +57,10 @@ const parseEventName = (
   Object.keys(bodySet).forEach((field) => {
     params[`body.${field}`] = bodySet[field];
   });
-  return { resource, params } as {
+  return { resource, params, actionName } as {
     resource: Resource,
     params: Exclude<ApiConfig['params'], undefined>,
+    actionName: string
   };
 };
 
@@ -123,13 +124,22 @@ export default async () => {
   // Some resource events are not listened to every minute
   const isOrdersOnly = Boolean(new Date().getMinutes() % 5);
   listenedEvents.forEach(async (listenedEventName) => {
-    const { resource, params } = parseEventName(listenedEventName, baseApiEventsFilter);
+    const { resource, params, actionName } = parseEventName(listenedEventName, baseApiEventsFilter);
     if (resource !== 'orders') {
       if (isOrdersOnly) {
         return;
       }
       if (lastNonOrdersTimestamp) {
-        params['timestamp>'] = new Date(lastNonOrdersTimestamp).toISOString();
+        if (actionName === 'delayed') {
+          // defines the limits for getting events with predefined delay
+          const delayMs = process.env.API_EVENTS_DELAYED_MS
+            ? (parseInt(process.env.API_EVENTS_DELAYED_MS, 10))
+            : (1000 * 60 * 5);
+          params['timestamp>'] = new Date(lastNonOrdersTimestamp - delayMs).toISOString();
+          params['timestamp<'] = new Date(timestamp - delayMs).toISOString();
+        } else {
+          params['timestamp>'] = new Date(lastNonOrdersTimestamp).toISOString();
+        }
       }
     }
     let { data: { result } } = await api.get(`events/${resource}`, {

package/packages/i18n/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/i18n",
   "type": "module",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "E-Com Plus Cloud Commerce i18n",
   "main": "lib/all.js",
   "exports": {

package/packages/modules/lib/firebase/checkout.js

@@ -17,9 +17,8 @@ export default async (req, res) => {
             + `/${(process.env.FUNCTION_REGION || httpsFunctionOptions.region)}/modules`;
   const validate = ajv.compile(checkoutSchema.params);
   const checkoutBody = req.body;
-  if (!req.body.browser_ip && req.ip) {
-    req.body.browser_ip = req.ip;
-  }
+  req.body.client_ip = req.ip;
+  req.body.client_user_agent = req.get('user-agent') || '';
   if (!validate(checkoutBody)) {
     return sendRequestError(res, '@checkout', validate.errors);
   }
@@ -63,7 +62,8 @@ export default async (req, res) => {
       const fields = [
         'utm',
         'affiliate_code',
-        'browser_ip',
+        'client_ip',
+        'client_user_agent',
         'channel_id',
         'channel_type',
         'domain',

package/packages/modules/lib/firebase/checkout.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkout.js","sourceRoot":"","sources":["../../src/firebase/checkout.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"checkout.js","sourceRoot":"","sources":["../../src/firebase/checkout.ts"],"names":[],"mappings":"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"}

package/packages/modules/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/modules",
   "type": "module",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "E-Com Plus Cloud Commerce modules API",
   "main": "lib/index.cjs",
   "exports": {
@@ -44,9 +44,9 @@
     "@ecomplus/utils": "1.5.0-rc.3",
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
-    "axios": "^1.2.6",
+    "axios": "^1.3.2",
     "firebase-admin": "^11.5.0",
-    "firebase-functions": "^4.2.0",
+    "firebase-functions": "^4.2.1",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {

package/packages/modules/schemas/@checkout.cjs

@@ -834,11 +834,6 @@ exports.params = {
       'maxLength': 200,
       'description': 'Code to identify the affiliate that referred the customer'
     },
-    'browser_ip': {
-      'type': 'string',
-      'maxLength': 50,
-      'description': 'IP address of the browser used by the customer when placing the order'
-    },
     'channel_id': {
       'type': 'integer',
       'minimum': 10000,

package/packages/modules/schemas/create_transaction.cjs

@@ -598,11 +598,16 @@ const schema = {
       'maxLength': 200,
       'description': 'Code to identify the affiliate that referred the customer'
     },
-    'browser_ip': {
+    'client_ip': {
       'type': 'string',
       'maxLength': 50,
       'description': 'IP address of the browser used by the customer when placing the order'
     },
+    'client_user_agent': {
+      'type': 'string',
+      'maxLength': 255,
+      'description': 'User-Agent of the browser (if any) used by the customer'
+    },
     'channel_id': {
       'type': 'integer',
       'minimum': 10000,