cloudcommerce 0.0.59 → 0.0.62

package/packages/firebase/package.json

@@ -1,15 +1,18 @@
 {
   "name": "@cloudcommerce/firebase",
   "type": "module",
-  "version": "0.0.59",
+  "version": "0.0.62",
   "description": "E-Com Plus Cloud Commerce on Firebase",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "exports": {
     ".": "./lib/index.js",
     "./config": "./config.js",
+    "./lib/init": "./lib/init.js",
     "./lib/config": "./lib/config.js",
-    "./lib/env": "./lib/env.js"
+    "./lib/env": "./lib/env.js",
+    "./lib/helpers/pubsub": "./lib/helpers/pubsub.js",
+    "./lib/helpers/update-app-data": "./lib/helpers/update-app-data.js"
   },
   "repository": {
     "type": "git",

package/packages/firebase/src/config.ts

@@ -1,4 +1,4 @@
-import type { AppEventsTopic } from '@cloudcommerce/types';
+import type { ApiEventName } from '@cloudcommerce/types';
 import Deepmerge from '@fastify/deepmerge';
 import {
   DEFAULT_LANG,
@@ -14,6 +14,13 @@ const env: { [key: string]: string } = (typeof process === 'object' && process?.
 
 const deepmerge = Deepmerge();
 
+const tinyErpEvents: ApiEventName[] = [
+  'orders-anyStatusSet',
+  'products-new',
+  'products-priceSet',
+  'applications-dataSet',
+];
+
 const self = {
   __config: {
     hello: 'from @cloudcommerce/firebase',
@@ -31,11 +38,7 @@ const self = {
       },
       tinyErp: {
         appId: 105922,
-        events: [
-          'orders-anyStatusSet',
-          'products-new',
-          'products-priceSet',
-        ] as AppEventsTopic[],
+        events: tinyErpEvents,
       },
     },
   },

package/packages/firebase/src/const.ts

@@ -0,0 +1,5 @@
+export const EVENT_SKIP_FLAG = '_skip';
+
+export const GET_PUBSUB_TOPIC = (appId: number) => {
+  return `app${appId}_api_events`;
+};

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

@@ -1,25 +1,27 @@
-import type { Resource, AppEventsTopic } from '@cloudcommerce/types';
+import type { Resource, ApiEventName, AppEventsPayload } from '@cloudcommerce/types';
 // eslint-disable-next-line import/no-unresolved
 import { getFirestore } from 'firebase-admin/firestore';
 import logger from 'firebase-functions/lib/logger';
 import { PubSub } from '@google-cloud/pubsub';
 import api, { ApiConfig } from '@cloudcommerce/api';
-import getEnv from '../env';
 import config from '../config';
+import { EVENT_SKIP_FLAG, GET_PUBSUB_TOPIC } from '../const';
 
-const parseEventsTopic = (
-  eventsTopic: AppEventsTopic,
+const parseEventName = (
+  evName: ApiEventName,
   baseApiEventsFilter: Record<string, string>,
 ) => {
-  const [resource, eventName] = eventsTopic.split('-');
-  const params: ApiConfig['params'] = {};
+  const [resource, actionName] = evName.split('-');
+  const params: ApiConfig['params'] = {
+    'flag!': EVENT_SKIP_FLAG,
+  };
   const bodySet: { [key: string]: any } = { ...baseApiEventsFilter };
-  if (eventName === 'new') {
+  if (actionName === 'new') {
     params.action = 'create';
   } else {
     switch (resource) {
       case 'orders':
-        switch (eventName) {
+        switch (actionName) {
           case 'paid':
             bodySet['financial_status.current'] = 'paid';
             break;
@@ -28,7 +30,7 @@ const parseEventsTopic = (
             break;
           case 'shipped':
           case 'delivered':
-            bodySet['fulfillment_status.current'] = eventName;
+            bodySet['fulfillment_status.current'] = actionName;
             break;
           case 'cancelled':
             bodySet.status = 'cancelled';
@@ -42,13 +44,16 @@ const parseEventsTopic = (
         }
         break;
       case 'products':
-        params.modified_fields = eventName === 'priceSet'
+        params.modified_fields = actionName === 'priceSet'
           ? ['price', 'variations.price']
           : ['quantity']; // quantitySet
         break;
       case 'carts':
         params.modified_fields = ['customers']; // customerSet
         break;
+      case 'applications':
+        params.modified_fields = ['data', 'hidden_data']; // dataSet
+        break;
       default:
     }
   }
@@ -56,8 +61,8 @@ const parseEventsTopic = (
     params[`body.${field}`] = bodySet[field];
   });
   return { resource, params } as {
-    resource: Resource;
-    params: ApiConfig['params'];
+    resource: Resource,
+    params: ApiConfig['params'],
   };
 };
 
@@ -90,35 +95,37 @@ export default async () => {
     'timestamp<': new Date(timestamp).toISOString(),
   };
   const { apps } = config.get();
-  const { apiAuth } = getEnv();
-  const subscribersApps: Array<{ appId: number, events: AppEventsTopic[] }> = [];
+  const subscribersApps: Array<{ appId: number, events: ApiEventName[] }> = [];
   Object.keys(apps).forEach((appName) => {
     const appObj = apps[appName];
     if (appObj.events && appObj.events.length) {
       subscribersApps.push(appObj);
     }
   });
-  const activeAppsIds = (await api.get('applications', {
+  const activeApps = (await api.get('applications', {
     params: {
       state: 'active',
       app_id: subscribersApps.map(({ appId }) => appId),
-      fields: 'app_id',
+      fields: '_id,app_id,data,hidden_data',
     },
-  })).data.result.map((app) => app.app_id);
-  const listenedEvents: AppEventsTopic[] = [];
+  })).data.result as Array<AppEventsPayload['app']>;
+  const listenedEvents: ApiEventName[] = [];
   subscribersApps.forEach(({ appId, events }) => {
-    if (activeAppsIds.includes(appId)) {
-      events.forEach((eventsTopic) => {
-        if (!listenedEvents.includes(eventsTopic)) {
-          listenedEvents.push(eventsTopic);
+    if (activeApps.find((app) => app.app_id === appId)) {
+      events.forEach((evName) => {
+        if (!listenedEvents.includes(evName)) {
+          listenedEvents.push(evName);
         }
       });
     }
   });
-  listenedEvents.forEach(async (eventsTopic) => {
-    const { resource, params } = parseEventsTopic(eventsTopic, baseApiEventsFilter);
+  listenedEvents.forEach(async (listenedEventName) => {
+    const { resource, params } = parseEventName(listenedEventName, baseApiEventsFilter);
+    if (resource !== 'orders' && resource !== 'carts' && new Date().getMinutes() % 5) {
+      // Other resource events are not listened to every minute
+      return;
+    }
     let { data: { result } } = await api.get(`events/${resource}`, {
-      ...apiAuth,
       params,
     });
     /*
@@ -136,23 +143,39 @@ export default async () => {
     if (typeof middleware === 'function') {
       result = await middleware(resource, result);
     }
-    result.forEach((apiEvent) => {
-      subscribersApps.forEach(({ appId, events }) => {
-        if (events.includes(eventsTopic) && activeAppsIds.includes(appId)) {
-          const topicName = `app${appId}_${eventsTopic}`;
+    const resourceIdsRead: string[] = [];
+    result.forEach(async (apiEvent) => {
+      const resourceId = apiEvent.resource_id;
+      if (resourceIdsRead.includes(resourceId)) {
+        return;
+      }
+      resourceIdsRead.push(resourceId);
+      const apiDoc = resource !== 'applications'
+        ? (await api.get(`${resource}/${resourceId}`)).data
+        : null;
+      activeApps.forEach((app) => {
+        const appConfig = subscribersApps.find(({ appId }) => appId === app.app_id);
+        if (appConfig?.events.includes(listenedEventName)) {
+          const topicName = GET_PUBSUB_TOPIC(app.app_id);
+          const json: AppEventsPayload = {
+            evName: listenedEventName,
+            apiEvent,
+            apiDoc: apiDoc || app,
+            app,
+          };
           const messageObj = {
-            messageId: `${eventsTopic}_${apiEvent.timestamp}`,
-            json: apiEvent,
+            messageId: `${resourceId}_${apiEvent.timestamp}`,
+            json,
           };
           tryPubSubPublish(topicName, messageObj);
         }
       });
     });
-    logger.info(`> '${eventsTopic}' events: `, result);
+    logger.info(`> '${listenedEventName}' events: `, result);
   });
   return documentRef.set({
     timestamp,
-    activeAppsIds,
+    activeApps,
     listenedEvents,
   });
 };

package/packages/firebase/src/helpers/pubsub.ts

@@ -0,0 +1,52 @@
+import type { AppEventsPayload } from '@cloudcommerce/types';
+import functions from 'firebase-functions';
+import config from '../config';
+import { GET_PUBSUB_TOPIC } from '../const';
+
+const { logger } = functions;
+
+/* eslint-disable no-unused-vars */
+type PubSubHandler<TMessage> = (
+  json: TMessage,
+  context: functions.EventContext,
+  message: functions.pubsub.Message,
+) => void;
+type ApiEventHandler = PubSubHandler<AppEventsPayload>;
+/* eslint-enable no-unused-vars */
+
+const createPubSubFunction = (
+  pubSubTopic: string,
+  fn: PubSubHandler<any>,
+  eventMaxAgeMs = 60000,
+) => {
+  const { httpsFunctionOptions: { region } } = config.get();
+  return functions.region(region)
+    .runWith({ failurePolicy: true })
+    .pubsub.topic(pubSubTopic).onPublish((message, context) => {
+      const eventAgeMs = Date.now() - Date.parse(context.timestamp);
+      if (eventAgeMs > eventMaxAgeMs) {
+        logger.warn(`Dropping event ${context.eventId} with age[ms]: ${eventAgeMs}`);
+      }
+      fn(message.json, context, message);
+    });
+};
+
+const createAppEventsFunction = (
+  appNameOrId: string | number,
+  fn: ApiEventHandler,
+  eventMaxAgeMs = 60000,
+) => {
+  let appId: number;
+  if (typeof appNameOrId === 'string') {
+    appId = config.get().apps[appNameOrId].appId;
+  } else {
+    appId = appNameOrId;
+  }
+  return createPubSubFunction(GET_PUBSUB_TOPIC(appId), fn, eventMaxAgeMs);
+};
+
+export default createPubSubFunction;
+
+export { createPubSubFunction, createAppEventsFunction };
+
+export type { PubSubHandler, ApiEventHandler };

package/packages/firebase/src/helpers/update-app-data.ts

@@ -0,0 +1,49 @@
+import type { Applications, AppEventsPayload } from '@cloudcommerce/types';
+import { PubSub } from '@google-cloud/pubsub';
+import logger from 'firebase-functions/lib/logger';
+import api from '@cloudcommerce/api';
+import { EVENT_SKIP_FLAG, GET_PUBSUB_TOPIC } from '../const';
+
+export default async (
+  application: Applications | Applications['_id'],
+  data: Record<string, any>,
+  { isHiddenData = false, canSendPubSub = true } = {},
+) => {
+  const applicationId = typeof application === 'string'
+    ? application : application._id;
+  const subresource = isHiddenData ? 'hidden_data' : 'data';
+  if (application && typeof application === 'object' && canSendPubSub) {
+    // eslint-disable-next-line no-param-reassign
+    application[subresource] = data;
+    const json: AppEventsPayload = {
+      evName: 'applications-dataSet',
+      apiEvent: {
+        timestamp: new Date().toISOString(),
+        resource_id: applicationId,
+        action: 'update',
+        modified_fields: [subresource],
+        authentication_id: null,
+      },
+      apiDoc: application,
+      app: {
+        _id: applicationId,
+        app_id: application.app_id,
+        data: application.data,
+        hidden_data: application.hidden_data,
+      },
+      isInternal: true,
+    };
+    try {
+      await new PubSub()
+        .topic(GET_PUBSUB_TOPIC(application.app_id))
+        .publishMessage({ json });
+    } catch (err) {
+      logger.error(err);
+    }
+  }
+  return api.patch(`applications/${applicationId}/${subresource}`, data, {
+    headers: {
+      'X-Event-Flag': EVENT_SKIP_FLAG,
+    },
+  });
+};

package/packages/firebase/src/index.ts

@@ -1,16 +1,10 @@
 /* eslint-disable import/prefer-default-export */
 
-import 'source-map-support/register.js';
-import '@cloudcommerce/api/fetch-polyfill.js';
-// https://github.com/import-js/eslint-plugin-import/issues/1810
-// eslint-disable-next-line import/no-unresolved
-import { initializeApp } from 'firebase-admin/app';
+import './init';
 import functions from 'firebase-functions';
 import config from './config';
 import checkStoreEvents from './handlers/check-store-events';
 
-initializeApp();
-
 const { httpsFunctionOptions: { region } } = config.get();
 
 const functionBuilder = functions

package/packages/firebase/src/init.ts

@@ -0,0 +1,9 @@
+/* eslint-disable import/first */
+
+import 'source-map-support/register.js';
+import '@cloudcommerce/api/fetch-polyfill.js';
+// https://github.com/import-js/eslint-plugin-import/issues/1810
+// eslint-disable-next-line import/no-unresolved
+import { initializeApp } from 'firebase-admin/app';
+
+initializeApp();

package/packages/modules/lib/firebase/handle-module.js

@@ -11,7 +11,7 @@ const ajvAppsResponse = new Ajv({ ...ajvOptions, allErrors: true });
 // Cache apps list and no params modules results
 const appsCache = {};
 const resultsCache = {};
-async function runModule(apiAuth, params, res, modName, validate, responseValidate, appId) {
+async function runModule(params, res, modName, validate, responseValidate, appId) {
   const respond = (result) => res.send({
     result,
     meta: params,
@@ -47,7 +47,6 @@ async function runModule(apiAuth, params, res, modName, validate, responseValida
   } else {
     try {
       const { data } = await api.get('applications', {
-        ...apiAuth,
         params: listAppsParams,
       });
       appsList = data.result;
@@ -151,15 +150,15 @@ async function runModule(apiAuth, params, res, modName, validate, responseValida
   return res.sendStatus(501);
 }
 
-export default (modName, schema, responseSchema, req, res, apiAuth) => {
+export default (modName, schema, responseSchema, req, res) => {
   const validate = ajv.compile(schema);
   const responseValidate = ajvAppsResponse.compile(responseSchema);
   return {
     GET() {
-      runModule(apiAuth, req.query, res, modName, validate, responseValidate);
+      runModule(req.query, res, modName, validate, responseValidate);
     },
     POST() {
-      runModule(apiAuth, req.body, res, modName, validate, responseValidate, req.query.app_id);
+      runModule(req.body, res, modName, validate, responseValidate, req.query.app_id);
     },
   };
 };

package/packages/modules/lib/firebase/handle-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"handle-module.js","sourceRoot":"","sources":["../../src/firebase/handle-module.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,GAAyB,MAAM,KAAK,CAAC;AAC5C,OAAO,GAA4B,MAAM,oBAAoB,CAAC;AAC9D,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,EACL,GAAG,EACH,UAAU,EACV,cAAc,EACd,gBAAgB,GACjB,MAAM,OAAO,CAAC;AACf,OAAO,aAAa,MAAM,mBAAmB,CAAC;AAE9C,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,EAAE,GAAG,UAAU,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AAEpE,gDAAgD;AAChD,MAAM,SAAS,GAAG,EAAE,CAAC;AACrB,MAAM,YAAY,GAAG,EAAE,CAAC;AAExB,KAAK,UAAU,SAAS,CACtB,OAAqD,EACrD,MAA8B,EAC9B,GAAa,EACb,OAAe,EACf,QAA0B,EAC1B,gBAAkC,EAClC,KAAW;IAEX,MAAM,OAAO,GAAG,CAAC,MAAa,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC;QAC1C,MAAM;QACN,IAAI,EAAE,MAAM;KACb,CAAC,CAAC;IACH,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;IACjC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;IAC/D,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;QACrB,OAAO,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;KACxD;IACD,IAAI,QAAQ,GAAG,IAAI,CAAC;IACpB,MAAM,QAAQ,GAAG,GAAG,OAAO,IAAI,OAAO,EAAE,CAAC;IACzC,MAAM,cAAc,GAAwB;QAC1C,KAAK,EAAE,QAAQ;QACf,CAAC,WAAW,OAAO,UAAU,CAAC,EAAE,IAAI;QACpC,MAAM,EAAE,+CAA+C,OAAO,EAAE;KACjE,CAAC;IACF,IACE,KAAK;WACF,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EACpF;QACA,QAAQ,GAAG,KAAK,CAAC;QACjB,cAAc,CAAC,MAAM,GAAG,KAAK,CAAC;QAC9B,cAAc,CAAC,KAAK,GAAG,CAAC,CAAC;KAC1B;IACD,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,IAAI,QAAQ,IAAI,aAAa,EAAE;QAC7B,IAAI,YAAY,CAAC,QAAQ,CAAC,EAAE;YAC1B,OAAO,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;SACxC;QACD,eAAe,GAAG,IAAI,CAAC;KACxB;IAED,IAAI,QAAwB,CAAC;IAC7B,IAAI,QAAQ,IAAI,SAAS,CAAC,QAAQ,CAAC,EAAE;QACnC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;KAChC;SAAM;QACL,IAAI;YACF,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE;gBAC7C,GAAG,OAAO;gBACV,MAAM,EAAE,cAAc;aACvB,CAAC,CAAC;YACH,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC;SACxB;QAAC,OAAO,GAAQ,EAAE;YACjB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAClB,MAAM,KAAK,GAAG,GAAe,CAAC;YAC9B,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBAC1B,MAAM,EAAE,GAAG;gBACX,UAAU,EAAE,QAAQ;gBACpB,OAAO,EAAE,6BAA6B,KAAK,CAAC,UAAU,sBAAsB;gBAC5E,SAAS,EAAE,KAAK,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK;aAC3C,CAAC,CAAC;SACJ;KACF;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QAC3B,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;YACpB,OAAO,OAAO,CAAC,EAAE,CAAC,CAAC;SACpB;QACD,IAAI,QAAQ,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE;YACpC,SAAS,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;YAC/B,UAAU,CAAC,GAAG,EAAE;gBACd,SAAS,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;gBAC3B,OAAO,SAAS,CAAC,QAAQ,CAAC,CAAC;YAC7B,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SACpC;QACD,MAAM,UAAU,GAAmB,EAAE,CAAC;QACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACxC,MAAM,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAuD,CAAC;YACtF,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE;gBAC5B,WAAW,CAAC,WAAW,GAAG,EAAE,CAAC;aAC9B;YACD,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE;gBACrB,WAAW,CAAC,IAAI,GAAG,EAAE,CAAC;aACvB;YACD,MAAM,YAAY,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,QAAkB,CAAC;YACrE,mEAAmE;YACnE,MAAM,YAAY,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAC/B,MAAM,aAAa,GAAkB;gBACnC,OAAO;gBACP,MAAM,EAAE,OAAwB;gBAChC,MAAM;gBACN,WAAW;aACZ,CAAC;YAEF,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAChC,UAAU,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBACtC,IAAI,QAAa,CAAC;gBAClB,IAAI,OAAO,GAAG,KAAK,CAAC;gBACpB,IAAI,YAAY,GAAkB,IAAI,CAAC;gBACvC,aAAa,CACX,KAAK,EACL,OAAwB,EACxB,YAAY,EACZ,aAAa,EACb,YAAY,CACb;qBACE,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;oBACpB,QAAQ,GAAG,WAAW,CAAC;oBACvB,IAAI,WAAW,EAAE,KAAK,EAAE;wBACtB,OAAO,GAAG,IAAI,CAAC;wBACf,YAAY,GAAG,WAAW,CAAC,OAAO,IAAI,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;qBACjE;gBACH,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,GAAQ,EAAE,EAAE;oBAClB,QAAQ,GAAG,IAAI,CAAC;oBAChB,OAAO,GAAG,IAAI,CAAC;oBACf,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC;gBAC7B,CAAC,CAAC;qBACD,OAAO,CAAC,GAAG,EAAE;oBACZ,MAAM,MAAM,GAAG;wBACb,GAAG,EAAE,WAAW,CAAC,GAAG;wBACpB,MAAM,EAAE,WAAW,CAAC,MAAM;wBAC1B,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,YAAY;wBAC/B,OAAO,EAAE,WAAW,CAAC,OAAO;wBAC5B,SAAS,EAAE,KAAK;wBAChB,eAAe,EAAE,IAAI;wBACrB,KAAK,EAAE,OAAO;wBACd,aAAa,EAAE,YAAY;wBAC3B,QAAQ;qBACT,CAAC;oBACF,IAAI,CAAC,OAAO,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,IAAI,EAAE;wBACjE,MAAM,CAAC,SAAS,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;wBAC9C,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;4BACrB,aAAa;4BACb,MAAM,CAAC,eAAe,GAAG,cAAc,CACrC,gBAAgB,CAAC,MAAM,EACvB,eAAe,CAChB,CAAC;yBACH;qBACF;oBACD,OAAO,CAAC,MAAM,CAAC,CAAC;gBAClB,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC,CAAC;SACL;QAED,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YAC9C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE;gBAC7C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAChB,eAAe,GAAG,KAAK,CAAC;aACzB;YACD,IAAI,eAAe,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE;gBAC9C,YAAY,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC;gBACjC,UAAU,CAAC,GAAG,EAAE;oBACd,YAAY,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;oBAC9B,OAAO,YAAY,CAAC,QAAQ,CAAC,CAAC;gBAChC,CAAC,EAAE,KAAK,CAAC,CAAC;aACX;YACD,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;KACJ;IACD,qBAAqB;IACrB,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AAED,eAAe,CACb,OAAe,EACf,MAA8B,EAC9B,cAAsC,EACtC,GAAY,EACZ,GAAa,EACb,OAAqD,EACrD,EAAE;IACF,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACrC,MAAM,gBAAgB,GAAG,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACjE,OAAO;QACL,GAAG;YACD,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC;QAC1E,CAAC;QACD,IAAI;YACF,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3F,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"handle-module.js","sourceRoot":"","sources":["../../src/firebase/handle-module.ts"],"names":[],"mappings":"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"}

package/packages/modules/lib/firebase/serve-modules-api.js

@@ -1,7 +1,7 @@
 import { schemas } from '../index.js';
 import handleModule from './handle-module.js';
 
-export default (req, res, apiAuth) => {
+export default (req, res) => {
   const { method } = req;
   if (method !== 'POST' && method !== 'GET') {
     return res.sendStatus(405);
@@ -49,7 +49,7 @@ export default (req, res, apiAuth) => {
       return sendSchema(true);
     }
     if (url === `/${modName}`) {
-      return handleModule(modName, schema, responseSchema, req, res, apiAuth);
+      return handleModule(modName, schema, responseSchema, req, res);
     }
   }
   return res.sendStatus(404);

package/packages/modules/lib/firebase/serve-modules-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"serve-modules-api.js","sourceRoot":"","sources":["../../src/firebase/serve-modules-api.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAE3C,eAAe,CACb,GAAY,EACZ,GAAa,EACb,OAAqD,EACrD,EAAE;IACF,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IACvB,IAAI,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,KAAK,EAAE;QACzC,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;KAC5B;IACD,IACE,MAAM,KAAK,MAAM;WACd,CAAC,CAAC,GAAG,CAAC,IAAI,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,EACzE;QACA,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;KAC5B;IAED,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;IAClB,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QACzB,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KACxB;IACD,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAClC,MAAM,UAAU,GAAG,CAAC,gBAAgB,GAAG,KAAK,EAAE,EAAE;QAC9C,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC;aACnB,SAAS,CAAC,eAAe,EAAE,sBAAsB,CAAC;aAClD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IACtE,CAAC,CAAC;IAEF,IAAI,OAAO,KAAK,WAAW,EAAE;QAC3B,IAAI,GAAG,KAAK,YAAY,EAAE;YACxB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBAC1B,MAAM,EAAE,GAAG;gBACX,OAAO,EAAE,UAAU;aACpB,CAAC,CAAC;SACJ;QACD,IAAI,GAAG,KAAK,mBAAmB,EAAE;YAC/B,OAAO,UAAU,EAAE,CAAC;SACrB;QACD,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;KAC5B;IAED,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QACpB,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACnB,MAAM,CAAC,OAAO,GAAG,yCAAyC,CAAC;YAC3D,MAAM,CAAC,KAAK,GAAG,YAAY,OAAO,kBAAkB,CAAC;SACtD;QACD,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE;YAC3B,cAAc,CAAC,OAAO,GAAG,yCAAyC,CAAC;YACnE,cAAc,CAAC,KAAK,GAAG,YAAY,OAAO,wBAAwB,CAAC;SACpE;QACD,IAAI,GAAG,KAAK,IAAI,OAAO,SAAS,EAAE;YAChC,OAAO,UAAU,EAAE,CAAC;SACrB;QACD,IAAI,GAAG,KAAK,IAAI,OAAO,kBAAkB,EAAE;YACzC,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;SACzB;QACD,IAAI,GAAG,KAAK,IAAI,OAAO,EAAE,EAAE;YACzB,OAAO,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;SACzE;KACF;IACD,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC,CAAC"}
+{"version":3,"file":"serve-modules-api.js","sourceRoot":"","sources":["../../src/firebase/serve-modules-api.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAE3C,eAAe,CAAC,GAAY,EAAE,GAAa,EAAE,EAAE;IAC7C,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IACvB,IAAI,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,KAAK,EAAE;QACzC,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;KAC5B;IACD,IACE,MAAM,KAAK,MAAM;WACd,CAAC,CAAC,GAAG,CAAC,IAAI,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,EACzE;QACA,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;KAC5B;IAED,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;IAClB,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QACzB,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KACxB;IACD,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAClC,MAAM,UAAU,GAAG,CAAC,gBAAgB,GAAG,KAAK,EAAE,EAAE;QAC9C,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC;aACnB,SAAS,CAAC,eAAe,EAAE,sBAAsB,CAAC;aAClD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IACtE,CAAC,CAAC;IAEF,IAAI,OAAO,KAAK,WAAW,EAAE;QAC3B,IAAI,GAAG,KAAK,YAAY,EAAE;YACxB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBAC1B,MAAM,EAAE,GAAG;gBACX,OAAO,EAAE,UAAU;aACpB,CAAC,CAAC;SACJ;QACD,IAAI,GAAG,KAAK,mBAAmB,EAAE;YAC/B,OAAO,UAAU,EAAE,CAAC;SACrB;QACD,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;KAC5B;IAED,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QACpB,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACnB,MAAM,CAAC,OAAO,GAAG,yCAAyC,CAAC;YAC3D,MAAM,CAAC,KAAK,GAAG,YAAY,OAAO,kBAAkB,CAAC;SACtD;QACD,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE;YAC3B,cAAc,CAAC,OAAO,GAAG,yCAAyC,CAAC;YACnE,cAAc,CAAC,KAAK,GAAG,YAAY,OAAO,wBAAwB,CAAC;SACpE;QACD,IAAI,GAAG,KAAK,IAAI,OAAO,SAAS,EAAE;YAChC,OAAO,UAAU,EAAE,CAAC;SACrB;QACD,IAAI,GAAG,KAAK,IAAI,OAAO,kBAAkB,EAAE;YACzC,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;SACzB;QACD,IAAI,GAAG,KAAK,IAAI,OAAO,EAAE,EAAE;YACzB,OAAO,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;SAChE;KACF;IACD,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC,CAAC"}

package/packages/modules/lib/firebase.js

@@ -1,18 +1,13 @@
 /* eslint-disable import/prefer-default-export */
-import 'source-map-support/register.js';
-// eslint-disable-next-line import/no-unresolved
-import { initializeApp } from 'firebase-admin/app';
+import '@cloudcommerce/firebase/lib/init';
 // eslint-disable-next-line import/no-unresolved
 import { onRequest } from 'firebase-functions/v2/https';
 import config from '@cloudcommerce/firebase/lib/config';
-import getEnv from '@cloudcommerce/firebase/lib/env';
 import serveModulesApi from './firebase/serve-modules-api.js';
 
-initializeApp();
 const { httpsFunctionOptions } = config.get();
 
 export const modules = onRequest(httpsFunctionOptions, (req, res) => {
-  const { apiAuth } = getEnv();
-  serveModulesApi(req, res, apiAuth);
+  serveModulesApi(req, res);
 });
 // # sourceMappingURL=firebase.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"firebase.js","sourceRoot":"","sources":["../src/firebase.ts"],"names":[],"mappings":"AAAA,iDAAiD;AAEjD,OAAO,gCAAgC,CAAC;AACxC,gDAAgD;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,gDAAgD;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,MAAM,MAAM,iCAAiC,CAAC;AACrD,OAAO,eAAe,MAAM,8BAA8B,CAAC;AAE3D,aAAa,EAAE,CAAC;AAChB,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;AAE9C,MAAM,CAAC,MAAM,OAAO,GAAG,SAAS,CAAC,oBAAoB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IAClE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,EAAE,CAAC;IAC7B,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;AACrC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"firebase.js","sourceRoot":"","sources":["../src/firebase.ts"],"names":[],"mappings":"AAAA,iDAAiD;AAEjD,OAAO,kCAAkC,CAAC;AAC1C,gDAAgD;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,eAAe,MAAM,8BAA8B,CAAC;AAE3D,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;AAE9C,MAAM,CAAC,MAAM,OAAO,GAAG,SAAS,CAAC,oBAAoB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IAClE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAC5B,CAAC,CAAC,CAAC"}

package/packages/modules/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/modules",
   "type": "module",
-  "version": "0.0.59",
+  "version": "0.0.62",
   "description": "E-Com Plus Cloud Commerce modules API",
   "main": "lib/index.cjs",
   "exports": {

package/packages/modules/src/firebase/handle-module.ts

@@ -19,7 +19,6 @@ const appsCache = {};
 const resultsCache = {};
 
 async function runModule(
-  apiAuth: { authenticationId: string, apiKey: string },
   params: { [key: string]: any },
   res: Response,
   modName: string,
@@ -65,7 +64,6 @@ async function runModule(
   } else {
     try {
       const { data } = await api.get('applications', {
-        ...apiAuth,
         params: listAppsParams,
       });
       appsList = data.result;
@@ -187,16 +185,15 @@ export default (
   responseSchema: { [key: string]: any },
   req: Request,
   res: Response,
-  apiAuth: { authenticationId: string, apiKey: string },
 ) => {
   const validate = ajv.compile(schema);
   const responseValidate = ajvAppsResponse.compile(responseSchema);
   return {
     GET() {
-      runModule(apiAuth, req.query, res, modName, validate, responseValidate);
+      runModule(req.query, res, modName, validate, responseValidate);
     },
     POST() {
-      runModule(apiAuth, req.body, res, modName, validate, responseValidate, req.query.app_id);
+      runModule(req.body, res, modName, validate, responseValidate, req.query.app_id);
     },
   };
 };

package/packages/modules/src/firebase/serve-modules-api.ts

@@ -2,11 +2,7 @@ import type { Request, Response } from 'firebase-functions';
 import { schemas } from '../index';
 import handleModule from './handle-module';
 
-export default (
-  req: Request,
-  res: Response,
-  apiAuth: { authenticationId: string, apiKey: string },
-) => {
+export default (req: Request, res: Response) => {
   const { method } = req;
   if (method !== 'POST' && method !== 'GET') {
     return res.sendStatus(405);
@@ -59,7 +55,7 @@ export default (
       return sendSchema(true);
     }
     if (url === `/${modName}`) {
-      return handleModule(modName, schema, responseSchema, req, res, apiAuth);
+      return handleModule(modName, schema, responseSchema, req, res);
     }
   }
   return res.sendStatus(404);

package/packages/modules/src/firebase.ts

@@ -1,18 +1,13 @@
 /* eslint-disable import/prefer-default-export */
 
-import 'source-map-support/register.js';
-// eslint-disable-next-line import/no-unresolved
-import { initializeApp } from 'firebase-admin/app';
+import '@cloudcommerce/firebase/lib/init';
 // eslint-disable-next-line import/no-unresolved
 import { onRequest } from 'firebase-functions/v2/https';
 import config from '@cloudcommerce/firebase/lib/config';
-import getEnv from '@cloudcommerce/firebase/lib/env';
 import serveModulesApi from './firebase/serve-modules-api';
 
-initializeApp();
 const { httpsFunctionOptions } = config.get();
 
 export const modules = onRequest(httpsFunctionOptions, (req, res) => {
-  const { apiAuth } = getEnv();
-  serveModulesApi(req, res, apiAuth);
+  serveModulesApi(req, res);
 });

package/packages/passport/lib/firebase/handle-passport.js

@@ -1,9 +1,10 @@
 import { logger } from 'firebase-functions';
 import api from '@cloudcommerce/api';
+import getEnv from '@cloudcommerce/firebase/lib/env';
 
-const findCustomerByEmail = async (email, apiAuth) => {
+const findCustomerByEmail = async (email) => {
   try {
-    const { data } = await api.get(`customers?main_email=${email}`, apiAuth);
+    const { data } = await api.get(`customers?main_email=${email}`);
     if (data.result.length) {
       return data.result[0];
     }
@@ -25,16 +26,17 @@ const checkFirebaseAuth = async (auth, authToken) => {
     return null;
   }
 };
-const createCustomer = async (customer, apiAuth) => {
+const createCustomer = async (customer) => {
   try {
-    const { data } = await api.post('customers', customer, apiAuth);
+    const { data } = await api.post('customers', customer);
     return data._id;
   } catch (e) {
     logger.error(e);
     return null;
   }
 };
-const generateAccessToken = async (firestore, customerId, apiAuth) => {
+const generateAccessToken = async (firestore, customerId) => {
+  const { apiAuth } = getEnv();
   const docRef = firestore.doc(`customerTokens/${customerId}`);
   const doc = await docRef.get();
   const expires = doc.data()?.expires;
@@ -63,12 +65,12 @@ const generateAccessToken = async (firestore, customerId, apiAuth) => {
     return null;
   }
 };
-const getAuthCustomerApi = async (firestore, apiAuth, authtoken, authFirebase) => {
+const getAuthCustomerApi = async (firestore, authtoken, authFirebase) => {
   const customerFirebaseAuth = await checkFirebaseAuth(authFirebase, authtoken);
   if (customerFirebaseAuth !== null && customerFirebaseAuth.email) {
-    const customer = await findCustomerByEmail(customerFirebaseAuth.email, apiAuth);
+    const customer = await findCustomerByEmail(customerFirebaseAuth.email);
     if (customer !== null) {
-      return generateAccessToken(firestore, customer._id, apiAuth);
+      return generateAccessToken(firestore, customer._id);
     }
     const newCustomer = {
       display_name: customerFirebaseAuth.name || '',
@@ -82,9 +84,9 @@ const getAuthCustomerApi = async (firestore, apiAuth, authtoken, authFirebase) =
         user_id: customerFirebaseAuth.user_id,
       }],
     };
-    const customerId = await createCustomer(newCustomer, apiAuth);
+    const customerId = await createCustomer(newCustomer);
     if (customerId) {
-      return generateAccessToken(firestore, customerId, apiAuth);
+      return generateAccessToken(firestore, customerId);
     }
   }
   // TODO: Find customer by phone number, generate token if found, otherwise unauthorize