cloudcommerce 0.0.51 → 0.0.52

package/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 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.52](https://github.com/ecomplus/cloud-commerce/compare/v0.0.51...v0.0.52) (2022-08-18)
+
+
+### Features
+
+* **cli:** Add `--no-gcloud` option to setup command to skip GCloud IAM ([bbe5ce2](https://github.com/ecomplus/cloud-commerce/commit/bbe5ce2813c4276783d86fdd577e746fa5ecda1d))
+* Properly config Firebase Hosting to call modules/passport/ssr Cloud Functions ([b6e6540](https://github.com/ecomplus/cloud-commerce/commit/b6e6540d29895287e4149a4b3c160e118144074a))
+
+
+### Bug Fixes
+
+* **cli:** Fix GCloud IAM roles and properly check if service account already exists ([bb23dd0](https://github.com/ecomplus/cloud-commerce/commit/bb23dd049d992223285e8f51bc053d9fda775d10))
+
 ### [0.0.51](https://github.com/ecomplus/cloud-commerce/compare/v0.0.50...v0.0.51) (2022-08-17)
 
 

package/CONTRIBUTING.md

@@ -35,9 +35,9 @@ If you want to deploy to a new Firebase project (needed for larger changes):
     - Set a nice project name (ID) and remember it;
     - You may enable Firebase Analytics for enhanced remote config options and A/B testing;
 
-2. Go to _Firestore Database_ page (on sidebar) and _create database_:
+2. Go to _Creation > Firestore Database_ page (on sidebar) and _create database_:
     - Just bypass with default production mode and rules;
-    - Select region `us-east1` (recommended);
+    - Select region `nam5 (us-central)` (recommended);
 
 3. Firebase free plan doesn't support sending external HTTP requests, so you'll need to upgrade to _Blaze_ (on demand) plan;
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloudcommerce",
   "type": "module",
-  "version": "0.0.51",
+  "version": "0.0.52",
   "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>",

package/packages/api/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/api",
   "type": "module",
-  "version": "0.0.51",
+  "version": "0.0.52",
   "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.51",
+  "version": "0.0.52",
   "description": "E-Com Plus Cloud Commerce app for complex discount rules",
   "main": "lib/discounts.js",
   "repository": {

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

@@ -1,22 +1,27 @@
 import path from 'path';
-import { $, echo, fs } from 'zx';
+import { $, fs } from 'zx';
 
 const serviceAccountId = 'cloud-commerce-gh-actions';
-const serviceAccountEmail = (projectId) => {
+const getAccountEmail = (projectId) => {
   return `${serviceAccountId}@${projectId}.iam.gserviceaccount.com`;
 };
 const checkServiceAccountExists = async (projectId) => {
+  let hasServiceAccount;
   try {
-    return $`gcloud iam service-accounts describe ${serviceAccountEmail(projectId)}`;
+    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) => {
-  await $`gcloud auth login`;
-  await $`gcloud config set project ${projectId} `;
+  if (/no credential/i.test((await $`gcloud auth list`).stderr)) {
+    await $`gcloud auth login`;
+  }
+  await $`gcloud config set project ${projectId}`;
   const roles = [
-    'roles/cloudconfig.admin',
+    'roles/firebase.admin',
     'roles/appengine.appAdmin',
     'roles/appengine.appCreator',
     'roles/artifactregistry.admin',
@@ -29,17 +34,18 @@ const siginGcloudAndSetIAM = async (projectId, pwd) => {
   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"`;
+      --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 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 updatePolicy = false;
+  let mustUpdatePolicy = false;
   roles.forEach((role) => {
     const roleFound = bindings.find((binding) => binding.role === role);
-    const memberServiceAccount = `serviceAccount:${serviceAccountEmail(projectId)}`;
+    const memberServiceAccount = `serviceAccount:${getAccountEmail(projectId)}`;
     if (!roleFound) {
       const newBinding = {
         members: [
@@ -48,26 +54,26 @@ const siginGcloudAndSetIAM = async (projectId, pwd) => {
         role,
       };
       bindings.push(newBinding);
-      updatePolicy = true;
+      mustUpdatePolicy = true;
     } else {
       const serviceAccountHavePermission = roleFound.members.find((account) => account === memberServiceAccount);
       if (!serviceAccountHavePermission) {
         roleFound.members.push(memberServiceAccount);
-        updatePolicy = true;
+        mustUpdatePolicy = true;
       }
     }
   });
-  if (updatePolicy) {
+  if (mustUpdatePolicy) {
     fs.writeJSONSync(pathPolicyIAM, policyIAM);
     return $`gcloud projects set-iam-policy ${projectId} ${pathPolicyIAM}`;
   }
-  return echo``;
+  return null;
 };
 const createKeyServiceAccount = async (projectId, pwd) => {
   try {
-    const pathFileKey = path.join(pwd, 'serviceAccountKey.json');
+    const pathFileKey = path.join(pwd, '.cloudcommerce', 'serviceAccountKey.json');
     await $`gcloud iam service-accounts keys create ${pathFileKey} \
-      --iam-account=${serviceAccountEmail(projectId)}`;
+      --iam-account=${getAccountEmail(projectId)}`;
     return JSON.stringify(fs.readJSONSync(pathFileKey));
   } catch (e) {
     return null;

package/packages/cli/lib/index.js

@@ -29,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';
     }
   }
 }
@@ -37,7 +37,7 @@ 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]}`;
     }
@@ -99,11 +99,13 @@ ECOM_STORE_ID=${storeId}
       }
     }
     let serviceAccountJSON = null;
-    try {
-      await siginGcloudAndSetIAM(projectId, pwd);
-      serviceAccountJSON = await createKeyServiceAccount(projectId, pwd);
-    } catch (e) {
-      //
+    if (argv.gcloud !== false) {
+      try {
+        await siginGcloudAndSetIAM(projectId, pwd);
+        serviceAccountJSON = await createKeyServiceAccount(projectId, pwd);
+      } catch (e) {
+        //
+      }
     }
     return echo`
     ****

package/packages/cli/package.json

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

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

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

package/packages/cli/src/index.ts

@@ -41,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';
     }
   }
 }
@@ -50,7 +50,7 @@ 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]}`;
     }
@@ -121,11 +121,13 @@ 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) {
-      //
+    if (argv.gcloud !== false) {
+      try {
+        await siginGcloudAndSetIAM(projectId as string, pwd);
+        serviceAccountJSON = await createKeyServiceAccount(projectId as string, pwd);
+      } catch (e) {
+        //
+      }
     }
 
     return echo`

package/packages/events/package.json

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

package/packages/firebase/lib/config.js

@@ -17,7 +17,7 @@ const self = {
     countryCode: env.ECOM_COUNTRY_CODE || DEFAULT_COUNTRY_CODE,
     storeId: Number(env.ECOM_STORE_ID),
     httpsFunctionOptions: {
-      region: env.DEPLOY_REGION || 'us-east1',
+      region: env.DEPLOY_REGION || 'us-central1',
     },
     apps: {
       discounts: {

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,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"}
+{"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,aAAa;SAC3C;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/package.json

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

package/packages/firebase/src/config.ts

@@ -22,7 +22,7 @@ const self = {
     countryCode: env.ECOM_COUNTRY_CODE || DEFAULT_COUNTRY_CODE,
     storeId: Number(env.ECOM_STORE_ID),
     httpsFunctionOptions: {
-      region: env.DEPLOY_REGION || 'us-east1',
+      region: env.DEPLOY_REGION || 'us-central1',
     },
     apps: {
       discounts: {

package/packages/modules/package.json

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

package/packages/passport/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/passport",
   "type": "module",
-  "version": "0.0.51",
+  "version": "0.0.52",
   "description": "E-Com Plus Cloud Commerce customers authentication (passport) API",
   "main": "lib/index.js",
   "exports": {

package/packages/ssr/package.json

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

package/packages/storefront/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/storefront",
   "type": "module",
-  "version": "0.0.51",
+  "version": "0.0.52",
   "description": "E-Com Plus Cloud Commerce storefront with Astro",
   "main": "src/index.js",
   "repository": {

package/packages/types/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/types",
   "type": "module",
-  "version": "0.0.51",
+  "version": "0.0.52",
   "description": "E-Com Plus Cloud Commerce reusable type definitions",
   "main": "index.ts",
   "repository": {