cloudcommerce 0.0.29 → 0.0.32

package/CHANGELOG.md

@@ -2,6 +2,33 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.0.32](https://github.com/ecomplus/cloud-commerce/compare/v0.0.31...v0.0.32) (2022-07-20)
+
+
+### Bug Fixes
+
+* **firebase:** Get `process.env` on function handler only ([2095621](https://github.com/ecomplus/cloud-commerce/commit/209562152d31a4f31104502897af2f2330c3330f))
+
+### [0.0.31](https://github.com/ecomplus/cloud-commerce/compare/v0.0.30...v0.0.31) (2022-07-20)
+
+
+### Bug Fixes
+
+* GH Action must get credentials from inputs (`secrets` unrecognized) ([482f82b](https://github.com/ecomplus/cloud-commerce/commit/482f82bc4ff3ddc73445b4ffbbf5bf9655cf7de2))
+
+### [0.0.30](https://github.com/ecomplus/cloud-commerce/compare/v0.0.29...v0.0.30) (2022-07-20)
+
+
+### Features
+
+* **firebase:** Start listing stor eevents (orders, carts, products) with new cron function ([2eb0616](https://github.com/ecomplus/cloud-commerce/commit/2eb06168b03e7cd751c58001cf36c8253da040d7))
+* GH Action setup functions .env with repo secrets ([98bf2a2](https://github.com/ecomplus/cloud-commerce/commit/98bf2a2ba25edd45da32555fa6e18fab3b459be8))
+
+
+### Bug Fixes
+
+* **cli:** Do not change `config.json with `--no-commit` option ([f94ca57](https://github.com/ecomplus/cloud-commerce/commit/f94ca5740d16412a0c07537d512632f5d12a5904))
+
 ### [0.0.29](https://github.com/ecomplus/cloud-commerce/compare/v0.0.28...v0.0.29) (2022-07-17)
 
 ### [0.0.28](https://github.com/ecomplus/cloud-commerce/compare/v0.0.27...v0.0.28) (2022-07-17)

package/CONTRIBUTING.md

@@ -12,6 +12,7 @@ Clone this repo to your local machine and install the dependencies:
 
 ```console
 git clone --recurse-submodules git@github.com:ecomplus/cloud-commerce.git
+cd cloud-commerce
 pnpm install
 ```
 
@@ -43,3 +44,20 @@ If you want to deploy to a new Firebase project (needed for larger changes):
 4. Go to `/store` folder and edit `.firebaserc` setting your project ID (don't commit this file);
 
 5. Deploy with `firebase login && npm run deploy`;
+
+## Development
+
+To emulate Firebase and serve all starter Store services locally, run the following commands on the monorepo root:
+
+```console
+pnpm run setup
+pnpm serve
+```
+
+`run setup` is only needed for the first time, it'll get your store credentials and put them in `functions/.env`.
+
+To run tests for all packages:
+
+```console
+pnpm test
+```

package/action.yml

@@ -8,6 +8,12 @@ inputs:
   firebase-service-account:
     description: 'Firebase service account JSON'
     required: true
+  ecom-authentication-id:
+    description: 'E-Com Plus store authentication ID'
+    required: true
+  ecom-api-key:
+    description: 'E-Com Plus store API key'
+    required: true
 
 outputs: {}
 
@@ -37,11 +43,18 @@ runs:
       name: Deploy to Firebase live
       shell: bash
       env:
+        GITHUB_TOKEN: ${{ inputs.github-token }}
         FIREBASE_SERVICE_ACCOUNT: ${{ inputs.firebase-service-account }}
+        ECOM_AUTHENTICATION_ID: ${{ inputs.ecom-authentication-id }}
+        ECOM_API_KEY: ${{ inputs.ecom-api-key }}
       run: |
-        export GAC_FILENAME=".gac-$RANDOM.json";
-        echo $FIREBASE_SERVICE_ACCOUNT > $GAC_FILENAME;
-        GOOGLE_APPLICATION_CREDENTIALS=$GAC_FILENAME npm run deploy;
+        export GAC_FILENAME=".gac-$RANDOM.json"
+        echo $FIREBASE_SERVICE_ACCOUNT > $GAC_FILENAME
+        printf "ECOM_AUTHENTICATION_ID=$ECOM_AUTHENTICATION_ID
+        ECOM_API_KEY=$ECOM_API_KEY
+        GITHUB_TOKEN=$GITHUB_TOKEN
+        " > functions/.env
+        GOOGLE_APPLICATION_CREDENTIALS=$GAC_FILENAME npm run deploy
 
     - if: github.event_name == 'pull_request'
       name: Deploy Firebase Hosting PR preview

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloudcommerce",
   "type": "module",
-  "version": "0.0.29",
+  "version": "0.0.32",
   "description": "Open fair-code headless commerce platform: API-first, microservices based, event driven and cloud native",
   "main": "packages/api/lib/index.js",
   "author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",
@@ -20,15 +20,15 @@
     "@commitlint/config-conventional": "^17.0.3",
     "@commitlint/rules": "^17.0.0",
     "@types/node": "^18.0.5",
-    "@typescript-eslint/eslint-plugin": "^5.30.6",
-    "@typescript-eslint/parser": "^5.30.6",
+    "@typescript-eslint/eslint-plugin": "^5.30.7",
+    "@typescript-eslint/parser": "^5.30.7",
     "esbuild": "^0.14.49",
     "eslint": "^8.20.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-vue": "^9.2.0",
     "husky": "^8.0.1",
-    "node-fetch": "^3.2.8",
+    "node-fetch": "^3.2.9",
     "standard-version": "^9.5.0",
     "turbo": "^1.3.1",
     "typescript": "^4.7.4",
@@ -45,6 +45,7 @@
     "store:run": "pnpm build && npm --prefix \"store\" run",
     "start": "pnpm store:run start",
     "serve": "pnpm store:run serve",
-    "deploy": "pnpm store:run deploy"
+    "deploy": "pnpm store:run deploy",
+    "setup": "pnpm store:run setup:quiet"
   }
 }

package/packages/api/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/api",
   "type": "module",
-  "version": "0.0.29",
+  "version": "0.0.32",
   "description": "E-Com Plus Cloud Commerce APIs client/adapter",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/packages/apps/discounts/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-discounts",
   "type": "module",
-  "version": "0.0.29",
+  "version": "0.0.32",
   "description": "E-Com Plus Cloud Commerce app for complex discount rules",
   "main": "functions/dist/index.js",
   "repository": {

package/packages/cli/lib/index.js

@@ -62,12 +62,15 @@ export default async () => {
   }
   if (argv._.includes('setup')) {
     const { storeId, authenticationId, apiKey } = await login();
-    fs.writeFileSync(path.join(pwd, 'functions', 'config.json'), JSON.stringify({ storeId }, null, 2));
-    fs.writeFileSync(path.join(pwd, 'functions', '.env'), `ECOM_AUTHENTICATION_ID=${authenticationId}\nECOM_API_KEY=${apiKey}\n`);
+    fs.writeFileSync(path.join(pwd, 'functions', '.env'), `ECOM_AUTHENTICATION_ID=${authenticationId}
+ECOM_API_KEY=${apiKey}
+ECOM_STORE_ID=${storeId}
+`);
     if (argv.deploy !== false) {
       await $firebase('deploy');
     }
     if (argv.commit !== false) {
+      fs.writeFileSync(path.join(pwd, 'functions', 'config.json'), JSON.stringify({ storeId }, null, 2));
       try {
         await $`git add .firebaserc functions/config.json`;
         await $`git commit -m "Setup store [skip ci]"`;

package/packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/cli",
   "type": "module",
-  "version": "0.0.29",
+  "version": "0.0.32",
   "description": "E-Com Plus Cloud Commerce CLI tools",
   "bin": {
     "cloudcommerce": "./bin/run.mjs"

package/packages/cli/src/index.ts

@@ -78,18 +78,21 @@ export default async () => {
 
   if (argv._.includes('setup')) {
     const { storeId, authenticationId, apiKey } = await login();
-    fs.writeFileSync(
-      path.join(pwd, 'functions', 'config.json'),
-      JSON.stringify({ storeId }, null, 2),
-    );
     fs.writeFileSync(
       path.join(pwd, 'functions', '.env'),
-      `ECOM_AUTHENTICATION_ID=${authenticationId}\nECOM_API_KEY=${apiKey}\n`,
+      `ECOM_AUTHENTICATION_ID=${authenticationId}
+ECOM_API_KEY=${apiKey}
+ECOM_STORE_ID=${storeId}
+`,
     );
     if (argv.deploy !== false) {
       await $firebase('deploy');
     }
     if (argv.commit !== false) {
+      fs.writeFileSync(
+        path.join(pwd, 'functions', 'config.json'),
+        JSON.stringify({ storeId }, null, 2),
+      );
       try {
         await $`git add .firebaserc functions/config.json`;
         await $`git commit -m "Setup store [skip ci]"`;

package/packages/firebase/lib/env.js

@@ -0,0 +1,19 @@
+export default () => {
+  const { ECOM_AUTHENTICATION_ID, ECOM_API_KEY, GITHUB_TOKEN } = process.env;
+  if (!ECOM_AUTHENTICATION_ID) {
+    throw new Error('ECOM_AUTHENTICATION_ID is not set');
+  }
+  if (!ECOM_API_KEY) {
+    throw new Error('ECOM_API_KEY is not set');
+  }
+  const authenticationId = ECOM_AUTHENTICATION_ID;
+  const apiKey = ECOM_API_KEY;
+  const githubToken = GITHUB_TOKEN;
+  const env = {
+    authenticationId,
+    apiKey,
+    githubToken,
+  };
+  return env;
+};
+// # sourceMappingURL=env.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AAMA,eAAe,GAAG,EAAE;IAClB,MAAM,EACJ,sBAAsB,EACtB,YAAY,EACZ,YAAY,GACb,GAAG,OAAO,CAAC,GAAG,CAAC;IAChB,IAAI,CAAC,sBAAsB,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;KACtD;IACD,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;KAC5C;IACD,MAAM,gBAAgB,GAAG,sBAAsB,CAAC;IAChD,MAAM,MAAM,GAAG,YAAY,CAAC;IAC5B,MAAM,WAAW,GAAG,YAAY,CAAC;IACjC,MAAM,GAAG,GAAQ;QACf,gBAAgB;QAChB,MAAM;QACN,WAAW;KACZ,CAAC;IACF,OAAO,GAAG,CAAC;AACb,CAAC,CAAC"}

package/packages/firebase/lib/index.js

@@ -1,15 +1,17 @@
 import 'source-map-support/register.js';
-import { logger } from 'firebase-functions';
+import { pubsub, logger } from 'firebase-functions';
 // eslint-disable-next-line import/no-unresolved
 import { onRequest } from 'firebase-functions/v2/https';
 import config from './config.js';
+import checkStoreEvents from './methods/check-store-events.js';
 
+const processId = String(Date.now());
 const options = {
   region: process.env.DEPLOY_REGION || 'us-east1',
 };
-const processId = String(Date.now());
 
 export const z = onRequest(options, ({ url }, response) => {
+  process.env.ECOM_API_KEY = '***';
   if (url === '/hello') {
     logger.info('Hello logs!', {
       structuredData: true,
@@ -29,4 +31,8 @@ export const z = onRequest(options, ({ url }, response) => {
 export const ssr = onRequest(options, (request, response) => {
   response.send('<h1>Hello SSR!</h1>');
 });
+
+export const cronStoreEvents = pubsub.schedule('* * * * *').onRun(() => {
+  return checkStoreEvents();
+});
 // # 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,OAAO,gCAAgC,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,gDAAgD;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,MAAM,MAAM,UAAU,CAAC;AAE9B,MAAM,OAAO,GAAG;IACd,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,UAAU;CAChD,CAAC;AAEF,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;AAErC,MAAM,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,EAAE;IACxD,IAAI,GAAG,KAAK,QAAQ,EAAE;QACpB,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE;YACzB,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC;QACH,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;QAClC,OAAO;KACR;IACD,IAAI,GAAG,KAAK,MAAM,EAAE;QAClB,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACzB,OAAO;KACR;IACD,QAAQ,CAAC,IAAI,CAAC;QACZ,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE;KACrB,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,GAAG,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;IAC1D,QAAQ,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;AACvC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,gCAAgC,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACpD,gDAAgD;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,gBAAgB,MAAM,8BAA8B,CAAC;AAE5D,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;AAErC,MAAM,OAAO,GAAG;IACd,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,UAAU;CAChD,CAAC;AAEF,MAAM,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,EAAE;IACxD,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,KAAK,CAAC;IACjC,IAAI,GAAG,KAAK,QAAQ,EAAE;QACpB,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE;YACzB,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC;QACH,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;QAClC,OAAO;KACR;IACD,IAAI,GAAG,KAAK,MAAM,EAAE;QAClB,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACzB,OAAO;KACR;IACD,QAAQ,CAAC,IAAI,CAAC;QACZ,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE;KACrB,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,GAAG,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;IAC1D,QAAQ,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;AACvC,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;IACrE,OAAO,gBAAgB,EAAE,CAAC;AAC5B,CAAC,CAAC,CAAC"}

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

@@ -0,0 +1,21 @@
+import { logger } from 'firebase-functions';
+import api from '@cloudcommerce/api';
+import getEnv from '../env.js';
+
+export default async () => {
+  const { authenticationId, apiKey } = getEnv();
+  [
+    'orders',
+    'products',
+    'carts',
+  ].forEach(async (resource) => {
+    const { data: { result } } = await api({
+      authenticationId,
+      apiKey,
+      endpoint: `events/${resource}`,
+    });
+    logger.info(`${resource} events: `, result);
+  });
+  return true;
+};
+// # sourceMappingURL=check-store-events.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"check-store-events.js","sourceRoot":"","sources":["../../src/methods/check-store-events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,GAAG,MAAM,oBAAoB,CAAC;AACrC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,eAAe,KAAK,IAAI,EAAE;IACxB,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;IAC9C;QACE,QAAQ;QACR,UAAU;QACV,OAAO;KACR,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QAC3B,MAAM,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM,GAAG,CAAC;YACrC,gBAAgB;YAChB,MAAM;YACN,QAAQ,EAAE,UAAU,QAAoB,EAAE;SAC3C,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,WAAW,EAAE,MAAM,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}

package/packages/firebase/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/firebase",
   "type": "module",
-  "version": "0.0.29",
+  "version": "0.0.32",
   "description": "E-Com Plus Cloud Commerce on Firebase",
   "main": "lib/index.js",
   "exports": {

package/packages/firebase/src/env.ts

@@ -0,0 +1,30 @@
+type Env = {
+  authenticationId: string;
+  apiKey: string;
+  githubToken?: string;
+};
+
+export default () => {
+  const {
+    ECOM_AUTHENTICATION_ID,
+    ECOM_API_KEY,
+    GITHUB_TOKEN,
+  } = process.env;
+  if (!ECOM_AUTHENTICATION_ID) {
+    throw new Error('ECOM_AUTHENTICATION_ID is not set');
+  }
+  if (!ECOM_API_KEY) {
+    throw new Error('ECOM_API_KEY is not set');
+  }
+  const authenticationId = ECOM_AUTHENTICATION_ID;
+  const apiKey = ECOM_API_KEY;
+  const githubToken = GITHUB_TOKEN;
+  const env: Env = {
+    authenticationId,
+    apiKey,
+    githubToken,
+  };
+  return env;
+};
+
+export type { Env };

package/packages/firebase/src/index.ts

@@ -1,16 +1,18 @@
 import 'source-map-support/register.js';
-import { logger } from 'firebase-functions';
+import { pubsub, logger } from 'firebase-functions';
 // eslint-disable-next-line import/no-unresolved
 import { onRequest } from 'firebase-functions/v2/https';
 import config from './config';
+import checkStoreEvents from './methods/check-store-events';
+
+const processId = String(Date.now());
 
 const options = {
   region: process.env.DEPLOY_REGION || 'us-east1',
 };
 
-const processId = String(Date.now());
-
 export const z = onRequest(options, ({ url }, response) => {
+  process.env.ECOM_API_KEY = '***';
   if (url === '/hello') {
     logger.info('Hello logs!', {
       structuredData: true,
@@ -30,3 +32,7 @@ export const z = onRequest(options, ({ url }, response) => {
 export const ssr = onRequest(options, (request, response) => {
   response.send('<h1>Hello SSR!</h1>');
 });
+
+export const cronStoreEvents = pubsub.schedule('* * * * *').onRun(() => {
+  return checkStoreEvents();
+});

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

@@ -0,0 +1,20 @@
+import { logger } from 'firebase-functions';
+import api from '@cloudcommerce/api';
+import getEnv from '../env';
+
+export default async () => {
+  const { authenticationId, apiKey } = getEnv();
+  [
+    'orders',
+    'products',
+    'carts',
+  ].forEach(async (resource) => {
+    const { data: { result } } = await api({
+      authenticationId,
+      apiKey,
+      endpoint: `events/${resource as 'orders'}`,
+    });
+    logger.info(`${resource} events: `, result);
+  });
+  return true;
+};

package/packages/storefront/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/storefront",
   "type": "module",
-  "version": "0.0.29",
+  "version": "0.0.32",
   "description": "E-Com Plus Cloud Commerce storefront with Astro",
   "main": "src/index.js",
   "repository": {
@@ -20,6 +20,6 @@
   },
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
-    "astro": "1.0.0-beta.64"
+    "astro": "1.0.0-beta.72"
   }
 }