cloudcommerce 0.0.48 → 0.0.51

package/packages/apps/discounts/lib/discounts.config.d.ts

@@ -0,0 +1,14 @@
+declare const _default: () => {
+    app_id: number;
+    title: string;
+    slug: string;
+    type: string;
+    state: string;
+    modules: {
+        apply_discount: {
+            enabled: boolean;
+        };
+    };
+    admin_settings: {};
+};
+export default _default;

package/packages/apps/discounts/lib/discounts.config.js

@@ -0,0 +1,19 @@
+import config from '@cloudcommerce/firebase/lib/config';
+
+export default () => {
+  const { lang, apps: { discounts: { appId } } } = config.get();
+  return {
+    app_id: appId,
+    title: lang.startsWith('en') ? 'Campaigns and discounts' : 'Campanhas e descontos',
+    slug: 'discounts',
+    type: 'external',
+    state: 'active',
+    modules: {
+      apply_discount: {
+        enabled: true,
+      },
+    },
+    admin_settings: {},
+  };
+};
+// # sourceMappingURL=discounts.config.js.map

package/packages/apps/discounts/lib/discounts.config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"discounts.config.js","sourceRoot":"","sources":["../src/discounts.config.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oCAAoC,CAAC;AAExD,eAAe,GAAG,EAAE;IAClB,MAAM,EACJ,IAAI,EACJ,IAAI,EAAE,EACJ,SAAS,EAAE,EAAE,KAAK,EAAE,GACrB,GACF,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;IAEjB,OAAO;QACL,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,uBAAuB;QAClF,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,UAAU;QAChB,KAAK,EAAE,QAAQ;QACf,OAAO,EAAE;YACP,cAAc,EAAE;gBACd,OAAO,EAAE,IAAI;aACd;SACF;QACD,cAAc,EAAE,EACf;KACF,CAAC;AACJ,CAAC,CAAC"}

package/packages/apps/discounts/lib/discounts.d.ts

@@ -0,0 +1,2 @@
+import type { AppModuleBody } from '@cloudcommerce/types';
+export declare const applyDiscount: (modBody: AppModuleBody) => Promise<{}>;

package/packages/apps/discounts/lib/discounts.js

@@ -0,0 +1,7 @@
+import { logger } from 'firebase-functions';
+
+export const applyDiscount = async (modBody) => {
+  logger.info(modBody);
+  return {};
+};
+// # sourceMappingURL=discounts.js.map

package/packages/apps/discounts/lib/discounts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"discounts.js","sourceRoot":"","sources":["../src/discounts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAAE,OAAsB,EAAE,EAAE;IAC5D,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACrB,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC"}

package/packages/apps/discounts/lib/index.d.ts

@@ -1,3 +1 @@
-import type { AppEventsTopic } from '@cloudcommerce/types';
-export declare const events: AppEventsTopic[];
-export declare const applyDiscount: () => Promise<{}>;
+export * from './discounts';

package/packages/apps/discounts/lib/index.js

@@ -1,9 +1,2 @@
-import { logger } from 'firebase-functions';
-
-export const events = [];
-
-export const applyDiscount = async () => {
-  logger.info('Hello discounts app');
-  return {};
-};
+export * from './discounts';
 // # sourceMappingURL=index.js.map

package/packages/apps/discounts/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,MAAM,CAAC,MAAM,MAAM,GAAqB,EAAE,CAAC;AAE3C,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,IAAI,EAAE;IACtC,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACnC,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC"}

package/packages/apps/discounts/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@cloudcommerce/app-discounts",
   "type": "module",
-  "version": "0.0.48",
+  "version": "0.0.51",
   "description": "E-Com Plus Cloud Commerce app for complex discount rules",
-  "main": "lib/index.js",
+  "main": "lib/discounts.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ecomplus/cloud-commerce.git",
@@ -20,6 +20,7 @@
   },
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
+    "@cloudcommerce/firebase": "workspace:*",
     "firebase-admin": "^11.0.1",
     "firebase-functions": "^3.22.0"
   },

package/packages/apps/discounts/src/discounts.config.ts

@@ -0,0 +1,25 @@
+import config from '@cloudcommerce/firebase/lib/config';
+
+export default () => {
+  const {
+    lang,
+    apps: {
+      discounts: { appId },
+    },
+  } = config.get();
+
+  return {
+    app_id: appId,
+    title: lang.startsWith('en') ? 'Campaigns and discounts' : 'Campanhas e descontos',
+    slug: 'discounts',
+    type: 'external',
+    state: 'active',
+    modules: {
+      apply_discount: {
+        enabled: true,
+      },
+    },
+    admin_settings: {
+    },
+  };
+};

package/packages/apps/discounts/src/discounts.ts

@@ -0,0 +1,8 @@
+/* eslint-disable import/prefer-default-export */
+import type { AppModuleBody } from '@cloudcommerce/types';
+import { logger } from 'firebase-functions';
+
+export const applyDiscount = async (modBody: AppModuleBody) => {
+  logger.info(modBody);
+  return {};
+};

package/packages/apps/discounts/src/index.ts

@@ -1,9 +1 @@
-import type { AppEventsTopic } from '@cloudcommerce/types';
-import { logger } from 'firebase-functions';
-
-export const events: AppEventsTopic[] = [];
-
-export const applyDiscount = async () => {
-  logger.info('Hello discounts app');
-  return {};
-};
+export * from './discounts';

package/packages/cli/config/firebase.json

@@ -9,6 +9,11 @@
       "source": "functions/core",
       "codebase": "core"
     },
+    {
+      "predeploy": "npm run build -- --codebase events --dir \"$RESOURCE_DIR\"",
+      "source": "functions/events",
+      "codebase": "events"
+    },
     {
       "predeploy": "npm run build -- --codebase modules --dir \"$RESOURCE_DIR\"",
       "source": "functions/modules",

package/packages/cli/lib/config-gcloud.js

@@ -0,0 +1,79 @@
+import path from 'path';
+import { $, echo, fs } from 'zx';
+
+const serviceAccountId = 'cloud-commerce-gh-actions';
+const serviceAccountEmail = (projectId) => {
+  return `${serviceAccountId}@${projectId}.iam.gserviceaccount.com`;
+};
+const checkServiceAccountExists = async (projectId) => {
+  try {
+    return $`gcloud iam service-accounts describe ${serviceAccountEmail(projectId)}`;
+  } catch (e) {
+    return null;
+  }
+};
+const siginGcloudAndSetIAM = async (projectId, pwd) => {
+  await $`gcloud auth login`;
+  await $`gcloud config set project ${projectId} `;
+  const roles = [
+    'roles/cloudconfig.admin',
+    'roles/appengine.appAdmin',
+    'roles/appengine.appCreator',
+    'roles/artifactregistry.admin',
+    'roles/cloudfunctions.admin',
+    'roles/cloudscheduler.admin',
+    'roles/iam.serviceAccountUser',
+    'roles/run.viewer',
+    'roles/serviceusage.apiKeysViewer',
+  ];
+  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"`;
+  }
+  const pathPolicyIAM = path.join(pwd, 'policyIAM.json');
+  await $`gcloud projects get-iam-policy ${projectId} --format json > ${pathPolicyIAM}`;
+  const policyIAM = fs.readJSONSync(pathPolicyIAM);
+  const { bindings } = policyIAM;
+  let updatePolicy = false;
+  roles.forEach((role) => {
+    const roleFound = bindings.find((binding) => binding.role === role);
+    const memberServiceAccount = `serviceAccount:${serviceAccountEmail(projectId)}`;
+    if (!roleFound) {
+      const newBinding = {
+        members: [
+          memberServiceAccount,
+        ],
+        role,
+      };
+      bindings.push(newBinding);
+      updatePolicy = true;
+    } else {
+      const serviceAccountHavePermission = roleFound.members.find((account) => account === memberServiceAccount);
+      if (!serviceAccountHavePermission) {
+        roleFound.members.push(memberServiceAccount);
+        updatePolicy = true;
+      }
+    }
+  });
+  if (updatePolicy) {
+    fs.writeJSONSync(pathPolicyIAM, policyIAM);
+    return $`gcloud projects set-iam-policy ${projectId} ${pathPolicyIAM}`;
+  }
+  return echo``;
+};
+const createKeyServiceAccount = async (projectId, pwd) => {
+  try {
+    const pathFileKey = path.join(pwd, 'serviceAccountKey.json');
+    await $`gcloud iam service-accounts keys create ${pathFileKey} \
+      --iam-account=${serviceAccountEmail(projectId)}`;
+    return JSON.stringify(fs.readJSONSync(pathFileKey));
+  } catch (e) {
+    return null;
+  }
+};
+
+export default siginGcloudAndSetIAM;
+
+export { siginGcloudAndSetIAM, createKeyServiceAccount };

package/packages/cli/lib/create-auth.js

@@ -26,15 +26,15 @@ export default async (storeId, accessToken) => {
       username: `cloudcomm${Date.now()}`,
       permissions: {
         applications: ['all'],
-        brands: ['GET'],
-        carts: ['all'],
-        categories: ['GET'],
-        collections: ['GET'],
+        brands: ['all'],
+        categories: ['all'],
+        collections: ['all'],
+        grids: ['all'],
+        products: ['all'],
         customers: ['all'],
-        grids: ['GET'],
+        carts: ['all'],
         orders: ['GET', 'POST', 'PATCH'],
-        products: ['GET', 'PATCH'],
-        stores: ['GET'],
+        stores: ['GET', 'PATCH'],
       },
     }, apiConfig);
     authenticationId = _id;

package/packages/cli/lib/index.js

@@ -5,6 +5,7 @@ import {
 } from 'zx';
 import login from './login.js';
 import build from './build.js';
+import { siginGcloudAndSetIAM, createKeyServiceAccount } from './config-gcloud.js';
 
 const { FIREBASE_PROJECT_ID, GOOGLE_APPLICATION_CREDENTIALS } = process.env;
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
@@ -43,6 +44,9 @@ export default async () => {
     return opts;
   }, '');
   const $firebase = (cmd) => {
+    if (cmd === 'deploy') {
+      return $`firebase --project=${projectId} ${cmd}${options} --force`;
+    }
     return $`firebase --project=${projectId} ${cmd}${options}`;
   };
   if (argv._.includes('serve')) {
@@ -94,6 +98,13 @@ ECOM_STORE_ID=${storeId}
         //
       }
     }
+    let serviceAccountJSON = null;
+    try {
+      await siginGcloudAndSetIAM(projectId, pwd);
+      serviceAccountJSON = await createKeyServiceAccount(projectId, pwd);
+    } catch (e) {
+      //
+    }
     return echo`
     ****
 
@@ -103,7 +114,7 @@ Finish by saving the following secrets to your GitHub repository:
 
   ${chalk.bold('ECOM_API_KEY')} = ${chalk.bgMagenta(apiKey)}
 
-  ${chalk.bold('FIREBASE_SERVICE_ACCOUNT')} = {YOUR_SERVICE_ACCOUNT_JSON}
+  ${chalk.bold('FIREBASE_SERVICE_ACCOUNT')} = ${chalk.bgMagenta(serviceAccountJSON || '{YOUR_SERVICE_ACCOUNT_JSON}')}
 
 -- More info at https://github.com/ecomplus/store#getting-started
 `;

package/packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/cli",
   "type": "module",
-  "version": "0.0.48",
+  "version": "0.0.51",
   "description": "E-Com Plus Cloud Commerce CLI tools",
   "bin": {
     "cloudcommerce": "./bin/run.mjs"
@@ -28,6 +28,6 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "md5": "^2.3.0",
-    "zx": "^7.0.7"
+    "zx": "^7.0.8"
   }
 }

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

@@ -0,0 +1,93 @@
+import path from 'path';
+import { $, echo, fs } from 'zx';
+
+const serviceAccountId = 'cloud-commerce-gh-actions';
+const serviceAccountEmail = (projectId: string) => {
+  return `${serviceAccountId}@${projectId}.iam.gserviceaccount.com`;
+};
+
+const checkServiceAccountExists = async (projectId: string) => {
+  try {
+    return $`gcloud iam service-accounts describe ${serviceAccountEmail(projectId)}`;
+  } catch (e) {
+    return null;
+  }
+};
+
+const siginGcloudAndSetIAM = async (
+  projectId: string,
+  pwd: string,
+) => {
+  await $`gcloud auth login`;
+  await $`gcloud config set project ${projectId} `;
+  const roles = [
+    'roles/cloudconfig.admin',
+    'roles/appengine.appAdmin',
+    'roles/appengine.appCreator',
+    'roles/artifactregistry.admin',
+    'roles/cloudfunctions.admin',
+    'roles/cloudscheduler.admin',
+    'roles/iam.serviceAccountUser',
+    'roles/run.viewer',
+    'roles/serviceusage.apiKeysViewer',
+  ];
+  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"`;
+  }
+  const pathPolicyIAM = path.join(pwd, 'policyIAM.json');
+  await $`gcloud projects get-iam-policy ${projectId} --format json > ${pathPolicyIAM}`;
+  const policyIAM = fs.readJSONSync(pathPolicyIAM);
+  const { bindings } = policyIAM;
+  let updatePolicy = false;
+
+  roles.forEach((role) => {
+    const roleFound = bindings.find(
+      (binding: { [key: string]: string | string[] }) => binding.role === role,
+    );
+    const memberServiceAccount = `serviceAccount:${serviceAccountEmail(projectId)}`;
+    if (!roleFound) {
+      const newBinding = {
+        members: [
+          memberServiceAccount,
+        ],
+        role,
+      };
+      bindings.push(newBinding);
+      updatePolicy = true;
+    } else {
+      const serviceAccountHavePermission = roleFound.members.find(
+        (account: string) => account === memberServiceAccount,
+      );
+      if (!serviceAccountHavePermission) {
+        roleFound.members.push(memberServiceAccount);
+        updatePolicy = true;
+      }
+    }
+  });
+  if (updatePolicy) {
+    fs.writeJSONSync(pathPolicyIAM, policyIAM);
+    return $`gcloud projects set-iam-policy ${projectId} ${pathPolicyIAM}`;
+  }
+  return echo``;
+};
+
+const createKeyServiceAccount = async (projectId: string, pwd: string) => {
+  try {
+    const pathFileKey = path.join(pwd, 'serviceAccountKey.json');
+    await $`gcloud iam service-accounts keys create ${pathFileKey} \
+      --iam-account=${serviceAccountEmail(projectId)}`;
+    return JSON.stringify(fs.readJSONSync(pathFileKey));
+  } catch (e) {
+    return null;
+  }
+};
+
+export default siginGcloudAndSetIAM;
+
+export {
+  siginGcloudAndSetIAM,
+  createKeyServiceAccount,
+};

package/packages/cli/src/create-auth.ts

@@ -27,15 +27,15 @@ export default async (storeId: number, accessToken: string) => {
       username: `cloudcomm${Date.now()}`,
       permissions: {
         applications: ['all'],
-        brands: ['GET'],
-        carts: ['all'],
-        categories: ['GET'],
-        collections: ['GET'],
+        brands: ['all'],
+        categories: ['all'],
+        collections: ['all'],
+        grids: ['all'],
+        products: ['all'],
         customers: ['all'],
-        grids: ['GET'],
+        carts: ['all'],
         orders: ['GET', 'POST', 'PATCH'],
-        products: ['GET', 'PATCH'],
-        stores: ['GET'],
+        stores: ['GET', 'PATCH'],
       },
     }, apiConfig);
     authenticationId = _id;

package/packages/cli/src/index.ts

@@ -9,6 +9,7 @@ import {
 } from 'zx';
 import login from './login';
 import build from './build';
+import { siginGcloudAndSetIAM, createKeyServiceAccount } from './config-gcloud';
 
 const {
   FIREBASE_PROJECT_ID,
@@ -56,6 +57,9 @@ export default async () => {
     return opts;
   }, '');
   const $firebase = (cmd: string) => {
+    if (cmd === 'deploy') {
+      return $`firebase --project=${projectId} ${cmd}${options} --force`;
+    }
     return $`firebase --project=${projectId} ${cmd}${options}`;
   };
 
@@ -116,6 +120,14 @@ ECOM_STORE_ID=${storeId}
         //
       }
     }
+    let serviceAccountJSON : string | null = null;
+    try {
+      await siginGcloudAndSetIAM(projectId as string, pwd);
+      serviceAccountJSON = await createKeyServiceAccount(projectId as string, pwd);
+    } catch (e) {
+      //
+    }
+
     return echo`
     ****
 
@@ -125,11 +137,10 @@ Finish by saving the following secrets to your GitHub repository:
 
   ${chalk.bold('ECOM_API_KEY')} = ${chalk.bgMagenta(apiKey)}
 
-  ${chalk.bold('FIREBASE_SERVICE_ACCOUNT')} = {YOUR_SERVICE_ACCOUNT_JSON}
+  ${chalk.bold('FIREBASE_SERVICE_ACCOUNT')} = ${chalk.bgMagenta(serviceAccountJSON || '{YOUR_SERVICE_ACCOUNT_JSON}')}
 
 -- More info at https://github.com/ecomplus/store#getting-started
 `;
   }
-
   return $`echo 'Hello from @cloudcommerce/cli'`;
 };

package/packages/events/lib/firebase.js

@@ -19,8 +19,6 @@ export const onNewOrder = functions.region(region)
       logger.warn(`Dropping event ${context.eventId} with age[ms]: ${eventAgeMs}`);
       return;
     }
-    // Hide API key for security
-    process.env.ECOM_API_KEY = '***';
     const { json } = message;
     logger.info({
       topic: newOrderTopic,

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

@@ -1 +1 @@
-{"version":3,"file":"firebase.js","sourceRoot":"","sources":["../src/firebase.ts"],"names":[],"mappings":"AAAA,iDAAiD;AAGjD,OAAO,gCAAgC,CAAC;AACxC,gDAAgD;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,MAAM,MAAM,oCAAoC,CAAC;AAExD,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;AAC7B,aAAa,EAAE,CAAC;AAEhB,MAAM,aAAa,GAAG,KAAK,CAAC;AAC5B,MAAM,aAAa,GAAmB,YAAY,CAAC;AACnD,MAAM,EAAE,oBAAoB,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;AAE1D,MAAM,CAAC,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC;KAC/C,OAAO,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;KAChC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;IAC1D,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC9D,IAAI,UAAU,GAAG,aAAa,EAAE;QAC9B,MAAM,CAAC,IAAI,CAAC,kBAAkB,OAAO,CAAC,OAAO,kBAAkB,UAAU,EAAE,CAAC,CAAC;QAC7E,OAAO;KACR;IACD,4BAA4B;IAC5B,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,KAAK,CAAC;IACjC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACzB,MAAM,CAAC,IAAI,CAAC;QACV,KAAK,EAAE,aAAa;QACpB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,IAAI;KACL,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"firebase.js","sourceRoot":"","sources":["../src/firebase.ts"],"names":[],"mappings":"AAAA,iDAAiD;AAGjD,OAAO,gCAAgC,CAAC;AACxC,gDAAgD;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,MAAM,MAAM,oCAAoC,CAAC;AAExD,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;AAC7B,aAAa,EAAE,CAAC;AAEhB,MAAM,aAAa,GAAG,KAAK,CAAC;AAC5B,MAAM,aAAa,GAAmB,YAAY,CAAC;AACnD,MAAM,EAAE,oBAAoB,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;AAE1D,MAAM,CAAC,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC;KAC/C,OAAO,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;KAChC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;IAC1D,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC9D,IAAI,UAAU,GAAG,aAAa,EAAE;QAC9B,MAAM,CAAC,IAAI,CAAC,kBAAkB,OAAO,CAAC,OAAO,kBAAkB,UAAU,EAAE,CAAC,CAAC;QAC7E,OAAO;KACR;IACD,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACzB,MAAM,CAAC,IAAI,CAAC;QACV,KAAK,EAAE,aAAa;QACpB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,IAAI;KACL,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/packages/events/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/events",
   "type": "module",
-  "version": "0.0.48",
+  "version": "0.0.51",
   "description": "E-Com Plus Cloud Commerce app events",
   "main": "lib/index.js",
   "exports": {

package/packages/events/src/firebase.ts

@@ -22,8 +22,6 @@ export const onNewOrder = functions.region(region)
       logger.warn(`Dropping event ${context.eventId} with age[ms]: ${eventAgeMs}`);
       return;
     }
-    // Hide API key for security
-    process.env.ECOM_API_KEY = '***';
     const { json } = message;
     logger.info({
       topic: newOrderTopic,

package/packages/firebase/lib/config.js

@@ -3,21 +3,25 @@ import {
   DEFAULT_LANG, DEFAULT_CURRENCY, DEFAULT_CURRENCY_SYMBOL, DEFAULT_COUNTRY_CODE,
 } from './defaults.js';
 
+// @ts-ignore
+const env = (typeof process === 'object' && process?.env)
+    || (typeof window === 'object' && window)
+    || {};
 const deepmerge = Deepmerge();
 const self = {
   __config: {
     hello: 'from @cloudcommerce/firebase',
-    lang: process.env.ECOM_LANG || DEFAULT_LANG,
-    currency: process.env.ECOM_CURRENCY || DEFAULT_CURRENCY,
-    currencySymbol: process.env.ECOM_CURRENCY_SYMBOL || DEFAULT_CURRENCY_SYMBOL,
-    countryCode: process.env.ECOM_COUNTRY_CODE || DEFAULT_COUNTRY_CODE,
-    storeId: Number(process.env.ECOM_STORE_ID),
+    lang: env.ECOM_LANG || DEFAULT_LANG,
+    currency: env.ECOM_CURRENCY || DEFAULT_CURRENCY,
+    currencySymbol: env.ECOM_CURRENCY_SYMBOL || DEFAULT_CURRENCY_SYMBOL,
+    countryCode: env.ECOM_COUNTRY_CODE || DEFAULT_COUNTRY_CODE,
+    storeId: Number(env.ECOM_STORE_ID),
     httpsFunctionOptions: {
-      region: process.env.DEPLOY_REGION || 'us-east1',
+      region: env.DEPLOY_REGION || 'us-east1',
     },
     apps: {
       discounts: {
-        appId: 912000,
+        appId: 1252,
       },
     },
   },
@@ -30,7 +34,7 @@ export default {
   set(config) {
     self.__config = deepmerge(self.__config, config);
     if (config.storeId) {
-      process.env.ECOM_STORE_ID = config.storeId;
+      env.ECOM_STORE_ID = config.storeId;
     }
   },
 };

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

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,YAAY,CAAC;AAEpB,MAAM,SAAS,GAAG,SAAS,EAAE,CAAC;AAE9B,MAAM,IAAI,GAAG;IACX,QAAQ,EAAE;QACR,KAAK,EAAE,8BAA8B;QACrC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,YAAY;QAC3C,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,gBAAgB;QACvD,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,uBAAuB;QAC3E,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,oBAAoB;QAClE,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;QAC1C,oBAAoB,EAAE;YACpB,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,UAAU;SAChD;QACD,IAAI,EAAE;YACJ,SAAS,EAAE;gBACT,KAAK,EAAE,MAAM;aACd;SACF;KACF;CACF,CAAC;AAEF,eAAe;IACb,GAAG;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IACD,GAAG,CAAC,MAAM;QACR,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACjD,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC;SAC5C;IACH,CAAC;CACF,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,YAAY,CAAC;AAEpB,aAAa;AACb,MAAM,GAAG,GAA8B,CAAC,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,EAAE,GAAG,CAAC;OAC/E,CAAC,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC;OACtC,EAAE,CAAC;AAER,MAAM,SAAS,GAAG,SAAS,EAAE,CAAC;AAE9B,MAAM,IAAI,GAAG;IACX,QAAQ,EAAE;QACR,KAAK,EAAE,8BAA8B;QACrC,IAAI,EAAE,GAAG,CAAC,SAAS,IAAI,YAAY;QACnC,QAAQ,EAAE,GAAG,CAAC,aAAa,IAAI,gBAAgB;QAC/C,cAAc,EAAE,GAAG,CAAC,oBAAoB,IAAI,uBAAuB;QACnE,WAAW,EAAE,GAAG,CAAC,iBAAiB,IAAI,oBAAoB;QAC1D,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC;QAClC,oBAAoB,EAAE;YACpB,MAAM,EAAE,GAAG,CAAC,aAAa,IAAI,UAAU;SACxC;QACD,IAAI,EAAE;YACJ,SAAS,EAAE;gBACT,KAAK,EAAE,IAAI;aACZ;SACF;KACF;CACF,CAAC;AAEF,eAAe;IACb,GAAG;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IACD,GAAG,CAAC,MAAM;QACR,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACjD,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,GAAG,CAAC,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC;SACpC;IACH,CAAC;CACF,CAAC"}

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

@@ -2,4 +2,3 @@ import 'source-map-support/register.js';
 import '@cloudcommerce/api/fetch-polyfill.js';
 import functions from 'firebase-functions';
 export declare const cronStoreEvents: functions.CloudFunction<unknown>;
-export declare const appAuthCallback: functions.HttpsFunction;

package/packages/firebase/lib/index.js

@@ -7,7 +7,6 @@ import { initializeApp } from 'firebase-admin/app';
 import functions from 'firebase-functions';
 import config from './config.js';
 import checkStoreEvents from './handlers/check-store-events.js';
-import handleAuthCallback from './handlers/auth-callback.js';
 
 initializeApp();
 const { httpsFunctionOptions: { region } } = config.get();
@@ -23,7 +22,4 @@ export const cronStoreEvents = functionBuilder.pubsub
   .onRun(() => {
     return checkStoreEvents();
   });
-
-export const appAuthCallback = functionBuilder.https
-  .onRequest(handleAuthCallback);
 // # sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,iDAAiD;AAEjD,OAAO,gCAAgC,CAAC;AACxC,OAAO,sCAAsC,CAAC;AAC9C,gEAAgE;AAChE,gDAAgD;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,gBAAgB,MAAM,+BAA+B,CAAC;AAC7D,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAE1D,aAAa,EAAE,CAAC;AAEhB,MAAM,EAAE,oBAAoB,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;AAE1D,MAAM,eAAe,GAAG,SAAS;KAC9B,MAAM,CAAC,MAAM,CAAC;KACd,OAAO,CAAC;IACP,cAAc,EAAE,GAAG;IACnB,MAAM,EAAE,OAAO;CAChB,CAAC,CAAC;AAEL,MAAM,CAAC,MAAM,eAAe,GAAG,eAAe,CAAC,MAAM;KAClD,QAAQ,CAAC,WAAW,CAAC;KACrB,KAAK,CAAC,GAAG,EAAE;IACV,OAAO,gBAAgB,EAAE,CAAC;AAC5B,CAAC,CAAC,CAAC;AAEL,MAAM,CAAC,MAAM,eAAe,GAAG,eAAe,CAAC,KAAK;KACjD,SAAS,CAAC,kBAAkB,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,iDAAiD;AAEjD,OAAO,gCAAgC,CAAC;AACxC,OAAO,sCAAsC,CAAC;AAC9C,gEAAgE;AAChE,gDAAgD;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,gBAAgB,MAAM,+BAA+B,CAAC;AAE7D,aAAa,EAAE,CAAC;AAEhB,MAAM,EAAE,oBAAoB,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;AAE1D,MAAM,eAAe,GAAG,SAAS;KAC9B,MAAM,CAAC,MAAM,CAAC;KACd,OAAO,CAAC;IACP,cAAc,EAAE,GAAG;IACnB,MAAM,EAAE,OAAO;CAChB,CAAC,CAAC;AAEL,MAAM,CAAC,MAAM,eAAe,GAAG,eAAe,CAAC,MAAM;KAClD,QAAQ,CAAC,WAAW,CAAC;KACrB,KAAK,CAAC,GAAG,EAAE;IACV,OAAO,gBAAgB,EAAE,CAAC;AAC5B,CAAC,CAAC,CAAC"}

package/packages/firebase/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/firebase",
   "type": "module",
-  "version": "0.0.48",
+  "version": "0.0.51",
   "description": "E-Com Plus Cloud Commerce on Firebase",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/packages/firebase/src/config.ts

@@ -6,22 +6,27 @@ import {
   DEFAULT_COUNTRY_CODE,
 } from './defaults';
 
+// @ts-ignore
+const env: { [key: string]: string } = (typeof process === 'object' && process?.env)
+  || (typeof window === 'object' && window)
+  || {};
+
 const deepmerge = Deepmerge();
 
 const self = {
   __config: {
     hello: 'from @cloudcommerce/firebase',
-    lang: process.env.ECOM_LANG || DEFAULT_LANG,
-    currency: process.env.ECOM_CURRENCY || DEFAULT_CURRENCY,
-    currencySymbol: process.env.ECOM_CURRENCY_SYMBOL || DEFAULT_CURRENCY_SYMBOL,
-    countryCode: process.env.ECOM_COUNTRY_CODE || DEFAULT_COUNTRY_CODE,
-    storeId: Number(process.env.ECOM_STORE_ID),
+    lang: env.ECOM_LANG || DEFAULT_LANG,
+    currency: env.ECOM_CURRENCY || DEFAULT_CURRENCY,
+    currencySymbol: env.ECOM_CURRENCY_SYMBOL || DEFAULT_CURRENCY_SYMBOL,
+    countryCode: env.ECOM_COUNTRY_CODE || DEFAULT_COUNTRY_CODE,
+    storeId: Number(env.ECOM_STORE_ID),
     httpsFunctionOptions: {
-      region: process.env.DEPLOY_REGION || 'us-east1',
+      region: env.DEPLOY_REGION || 'us-east1',
     },
     apps: {
       discounts: {
-        appId: 912000,
+        appId: 1252,
       },
     },
   },
@@ -34,7 +39,7 @@ export default {
   set(config) {
     self.__config = deepmerge(self.__config, config);
     if (config.storeId) {
-      process.env.ECOM_STORE_ID = config.storeId;
+      env.ECOM_STORE_ID = config.storeId;
     }
   },
 };