cloudcommerce 0.0.50 → 0.0.53

package/packages/apps/_app.config.js

@@ -0,0 +1,80 @@
+/* eslint-disable comma-dangle, no-multi-spaces, key-spacing, max-len */
+
+/**
+ * Edit base E-Com Plus Application object here.
+ * Ref.: https://developers.e-com.plus/docs/api/#/store/applications/
+ */
+
+export default () => {
+  return {
+    app_id: 9000,
+    title: 'My Awesome E-Com Plus App',
+    slug: 'my-awesome-app',
+    type: 'external',
+    state: 'active',
+
+    /**
+     * Uncomment modules above to work with E-Com Plus Mods API on Storefront.
+     * Ref.: https://developers.e-com.plus/modules-api/
+     */
+    modules: {
+      /**
+       * Triggered to calculate shipping options, must return values and deadlines.
+       * Start editing `routes/ecom/modules/calculate-shipping.js`
+       */
+      // calculate_shipping:   { enabled: true },
+
+      /**
+       * Triggered to validate and apply discount value, must return discount and conditions.
+       * Start editing `routes/ecom/modules/apply-discount.js`
+       */
+      // apply_discount:       { enabled: true },
+
+      /**
+       * Triggered when listing payments, must return available payment methods.
+       * Start editing `routes/ecom/modules/list-payments.js`
+       */
+      // list_payments:        { enabled: true },
+
+      /**
+       * Triggered when order is being closed, must create payment transaction and return info.
+       * Start editing `routes/ecom/modules/create-transaction.js`
+       */
+      // create_transaction:   { enabled: true },
+    },
+
+    admin_settings: {
+      /**
+       * JSON schema based fields to be configured by merchant and saved to app `data` / `hidden_data`, such as:
+
+       webhook_uri: {
+         schema: {
+           type: 'string',
+           maxLength: 255,
+           format: 'uri',
+           title: 'Notifications URI',
+           description: 'Unique notifications URI available on your Custom App dashboard'
+         },
+         hide: true
+       },
+       token: {
+         schema: {
+           type: 'string',
+           maxLength: 50,
+           title: 'App token'
+         },
+         hide: true
+       },
+       opt_in: {
+         schema: {
+           type: 'boolean',
+           default: false,
+           title: 'Some config option'
+         },
+         hide: false
+       },
+
+       */
+    },
+  };
+};

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.50",
+  "version": "0.0.53",
   "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

@@ -36,7 +36,22 @@
       "firebase.json",
       "**/.*",
       "**/node_modules/**"
-    ]
+    ],
+    "rewrites": [
+      {
+        "source": "/api/modules/**",
+        "function": "modules"
+      },
+      {
+        "source": "/api/passport/**",
+        "function": "passport"
+      },
+      {
+        "source": "**/!(*(*.)js|*(*.)css|*(*.)ico|*(*.)png|*(*.)gif|*(*.)jpg|*(*.)jpeg|*(*.)webp|*(*.)avif|*(*.)svg|*(*.)woff|*(*.)woff2|*(*.)otf|*(*.)ttf|*(*.)eot)",
+        "function": "ssr"
+      }
+    ],
+    "cleanUrls": true
   },
   "storage": {
     "rules": "storage.rules"

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

@@ -0,0 +1,94 @@
+import path from 'path';
+import { $, fs } from 'zx';
+
+const serviceAccountId = 'cloud-commerce-gh-actions';
+const getAccountEmail = (projectId) => {
+  return `${serviceAccountId}@${projectId}.iam.gserviceaccount.com`;
+};
+const checkServiceAccountExists = async (projectId) => {
+  let hasServiceAccount;
+  try {
+    const { stderr } = await $`gcloud iam service-accounts describe ${getAccountEmail(projectId)}`;
+    hasServiceAccount = !/not_?found/i.test(stderr);
+  } catch (e) {
+    return null;
+  }
+  return hasServiceAccount;
+};
+const siginGcloudAndSetIAM = async (projectId, pwd) => {
+  if (/no credential/i.test((await $`gcloud auth list`).stderr)) {
+    await $`gcloud auth login`;
+  }
+  await $`gcloud config set project ${projectId}`;
+  const roles = [
+    'roles/firebase.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',
+    '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"`;
+  }
+  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);
+    const memberServiceAccount = `serviceAccount:${getAccountEmail(projectId)}`;
+    if (!roleFound) {
+      const newBinding = {
+        members: [
+          memberServiceAccount,
+        ],
+        role,
+      };
+      if (role === 'roles/serviceusage.serviceUsageAdmin') {
+        const roleExpiration = Date.now() + 1000 * 60 * 60 * 12;
+        newBinding.condition = {
+          expression: `request.time < timestamp("${new Date(roleExpiration).toISOString()}")`,
+          title: 'Enable APIs on first deploy',
+          description: null,
+        };
+      }
+      bindings.push(newBinding);
+      mustUpdatePolicy = true;
+    } else {
+      const serviceAccountHavePermission = roleFound.members.find((account) => account === memberServiceAccount);
+      if (!serviceAccountHavePermission) {
+        roleFound.members.push(memberServiceAccount);
+        mustUpdatePolicy = true;
+      }
+    }
+  });
+  if (mustUpdatePolicy) {
+    fs.writeJSONSync(pathPolicyIAM, policyIAM);
+    return $`gcloud projects set-iam-policy ${projectId} ${pathPolicyIAM}`;
+  }
+  return null;
+};
+const createKeyServiceAccount = async (projectId, pwd) => {
+  try {
+    const pathFileKey = path.join(pwd, '.cloudcommerce', 'serviceAccountKey.json');
+    await $`gcloud iam service-accounts keys create ${pathFileKey} \
+      --iam-account=${getAccountEmail(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));
@@ -28,7 +29,7 @@ if (projectId) {
       const firebaserc = fs.readJSONSync(path.join(pwd, '.firebaserc'));
       projectId = firebaserc.projects.default;
     } catch (e) {
-      projectId = 'ecom2-hello';
+      projectId = 'ecom2-001';
     }
   }
 }
@@ -36,13 +37,16 @@ if (projectId) {
 export default async () => {
   await fs.copy(path.join(__dirname, '..', 'config'), pwd);
   const options = Object.keys(argv).reduce((opts, key) => {
-    if (key !== '_' && key !== 'deploy' && key !== 'commit') {
+    if (key !== '_' && argv[key] !== false) {
       // eslint-disable-next-line no-param-reassign
       opts += ` --${key} ${argv[key]}`;
     }
     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,15 @@ ECOM_STORE_ID=${storeId}
         //
       }
     }
+    let serviceAccountJSON = null;
+    if (argv.gcloud !== false) {
+      try {
+        await siginGcloudAndSetIAM(projectId, pwd);
+        serviceAccountJSON = await createKeyServiceAccount(projectId, pwd);
+      } catch (e) {
+        //
+      }
+    }
     return echo`
     ****
 
@@ -103,7 +116,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.50",
+  "version": "0.0.53",
   "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,103 @@
+import path from 'path';
+import { $, fs } from 'zx';
+
+const serviceAccountId = 'cloud-commerce-gh-actions';
+const getAccountEmail = (projectId: string) => {
+  return `${serviceAccountId}@${projectId}.iam.gserviceaccount.com`;
+};
+
+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) {
+    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`;
+  }
+  await $`gcloud config set project ${projectId}`;
+  const roles = [
+    'roles/firebase.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',
+    '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"`;
+  }
+  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);
+    const memberServiceAccount = `serviceAccount:${getAccountEmail(projectId)}`;
+    if (!roleFound) {
+      const newBinding: { [key: string]: any } = {
+        members: [
+          memberServiceAccount,
+        ],
+        role,
+      };
+      if (role === 'roles/serviceusage.serviceUsageAdmin') {
+        const roleExpiration = Date.now() + 1000 * 60 * 60 * 12;
+        newBinding.condition = {
+          expression: `request.time < timestamp("${new Date(roleExpiration).toISOString()}")`,
+          title: 'Enable APIs on first deploy',
+          description: null,
+        };
+      }
+      bindings.push(newBinding);
+      mustUpdatePolicy = true;
+    } else {
+      const serviceAccountHavePermission = roleFound.members.find(
+        (account: string) => account === memberServiceAccount,
+      );
+      if (!serviceAccountHavePermission) {
+        roleFound.members.push(memberServiceAccount);
+        mustUpdatePolicy = true;
+      }
+    }
+  });
+  if (mustUpdatePolicy) {
+    fs.writeJSONSync(pathPolicyIAM, policyIAM);
+    return $`gcloud projects set-iam-policy ${projectId} ${pathPolicyIAM}`;
+  }
+  return null;
+};
+
+const createKeyServiceAccount = async (projectId: string, pwd: string) => {
+  try {
+    const pathFileKey = path.join(pwd, '.cloudcommerce', 'serviceAccountKey.json');
+    await $`gcloud iam service-accounts keys create ${pathFileKey} \
+      --iam-account=${getAccountEmail(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,
@@ -40,7 +41,7 @@ if (projectId) {
       const firebaserc = fs.readJSONSync(path.join(pwd, '.firebaserc'));
       projectId = firebaserc.projects.default;
     } catch (e) {
-      projectId = 'ecom2-hello';
+      projectId = 'ecom2-001';
     }
   }
 }
@@ -49,13 +50,16 @@ export default async () => {
   await fs.copy(path.join(__dirname, '..', 'config'), pwd);
 
   const options = Object.keys(argv).reduce((opts, key) => {
-    if (key !== '_' && key !== 'deploy' && key !== 'commit') {
+    if (key !== '_' && argv[key] !== false) {
       // eslint-disable-next-line no-param-reassign
       opts += ` --${key} ${argv[key]}`;
     }
     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,16 @@ ECOM_STORE_ID=${storeId}
         //
       }
     }
+    let serviceAccountJSON : string | null = null;
+    if (argv.gcloud !== false) {
+      try {
+        await siginGcloudAndSetIAM(projectId as string, pwd);
+        serviceAccountJSON = await createKeyServiceAccount(projectId as string, pwd);
+      } catch (e) {
+        //
+      }
+    }
+
     return echo`
     ****
 
@@ -125,11 +139,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.50",
+  "version": "0.0.53",
   "description": "E-Com Plus Cloud Commerce app events",
   "main": "lib/index.js",
   "exports": {