cloudcommerce 0.30.0 → 0.31.0

package/.github/workflows/test-apps.yml

@@ -41,7 +41,7 @@ jobs:
           repository: ecomplus/store
           path: store
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
 

package/CHANGELOG.md

@@ -2,6 +2,70 @@
 
 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.31.0](https://github.com/ecomplus/cloud-commerce/compare/v0.30.0...v0.31.0) (2023-11-03)
+
+
+### ⚠ BREAKING CHANGES
+
+* **correios:** Requires new Correios contracts and credentials
+
+* feat(correios v2): Create app
+
+* chore(correios db): Add database population and main search in database
+
+* chore(action): add correios app environment variables
+
+* chore(pnpm lock): update file
+
+* fix(pnpm lock): Update file
+
+* chore(events): Add event functions
+
+* chore(pnpm lock): Update file
+
+* fix(correios db): Fix fill database and write fallback data
+
+* fix(app correios): Update app package [skip ci]
+
+* fix(events): Remove app correios v2
+
+* fix(firebase config): Remove correiosV2 app and update appId [skip ci]
+
+* fix(modules): Remove correios v2 app
+
+* fix(pnpm lock): Return file to main version
+
+* fix(test correios): Remove debug
+
+* fix(correios): Remove unnecessary comments [skip ci]
+
+* fix(correios v2): Add and correct parsers adds declared value check
+
+* fix(correios): Add weight check and standardization of parameters
+
+* fix(correios): Remove unnecessary comments
+
+* fix(correios): Correct conversion of weight to grams
+
+* fix(correios): Parameterize weight array to grams
+
+### Features
+
+* **correios:** Update app to integrate new Correios API and read/save results to db ([#251](https://github.com/ecomplus/cloud-commerce/issues/251)) ([a1fb7e8](https://github.com/ecomplus/cloud-commerce/commit/a1fb7e8ac3581451ca2a2b57001ddb4a374c6c24))
+* **i18n:** Add `i19emailWasSentMsg` ([b3bcb53](https://github.com/ecomplus/cloud-commerce/commit/b3bcb53d0f2603e34ba0ea2ac9193e01dbce178d))
+* **storefront:** Add `linkActionUrl` opt param to `submitLogin` method on login form composable ([a783be6](https://github.com/ecomplus/cloud-commerce/commit/a783be6c9fe5af847a6f00eeb7a15b32a07ebad9))
+* **storefront:** New `vbeta-app` script to load legacy checkout SPA with session compatibility ([ed7cfb7](https://github.com/ecomplus/cloud-commerce/commit/ed7cfb7612016b577f60b05f4db84a28ea5b8550))
+
+
+### Bug Fixes
+
+* **affiliate-program:** Preventing error with undefined customer by code and other type fixes ([8340982](https://github.com/ecomplus/cloud-commerce/commit/834098212c539993ec3644c7cc01fcc6b61dbc2e))
+* **cli:** Update default `firebase.json` API routes CORS accepted methods ([31fd1c5](https://github.com/ecomplus/cloud-commerce/commit/31fd1c52e3d395f0b585d12bcacc323342b574bb))
+* **cli:** Update default `firebase.json` with API routes cache control and CORS headers ([c2a6ff2](https://github.com/ecomplus/cloud-commerce/commit/c2a6ff2f5f1cf5c20d048204628fdaab4f14d6fc))
+* **storefront:** Ensure Firebase app init on `useLoginForm` ([3505eda](https://github.com/ecomplus/cloud-commerce/commit/3505eda698ef5f4acdb206f2b4a0b2963fdbd25e))
+* **storefront:** Ensure View Transitions script not started on /app/* routes ([9e14b11](https://github.com/ecomplus/cloud-commerce/commit/9e14b11d01538534f13f33b2160c69e9fc95bb3a))
+* **storefront:** Update `useLoginForm` to throttle login submit and return `isSubmitting` state ([4096aab](https://github.com/ecomplus/cloud-commerce/commit/4096aabf3bfa0a13db911491bb36cac6c7ed53f7))
+
 ## [0.30.0](https://github.com/ecomplus/cloud-commerce/compare/v0.29.0...v0.30.0) (2023-11-01)
 
 

package/action.yml

@@ -80,13 +80,19 @@ inputs:
     description: 'App: Webhooks token'
   mandae-token:
     description: 'App: Mandaê token'
+  correios-user:
+    description: 'App: Correios username'
+  correios-access-code:
+    description: 'App: Correios access code'
+  correios-postcard-number:
+    description: 'App: Optional Correios postcard number'
 
 outputs: {}
 
 runs:
   using: "composite"
   steps:
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
       with:
         node-version: 18
         cache: 'npm'
@@ -242,6 +248,9 @@ runs:
         FLASHCOURIER_CONTRACT: ${{ inputs.flashcourier-contract }}
         WEBHOOKS_TOKEN: ${{ inputs.webhooks-token }}
         MANDAE_TOKEN: ${{ inputs.mandae-token }}
+        CORREIOS_USER: ${{ inputs.correios-user }}
+        CORREIOS_ACCESS_CODE: ${{ inputs.correios-access-code }}
+        CORREIOS_POSTCARD: ${{ inputs.correios-postcard-number }}
       run: |
         export GAC_FILENAME=".gac-$RANDOM.json"
         echo $FIREBASE_SERVICE_ACCOUNT > $GAC_FILENAME
@@ -281,6 +290,9 @@ runs:
         FLASHCOURIER_CONTRACT=$FLASHCOURIER_CONTRACT
         WEBHOOKS_TOKEN=$WEBHOOKS_TOKEN
         MANDAE_TOKEN=$MANDAE_TOKEN
+        CORREIOS_USER=$CORREIOS_USER
+        CORREIOS_ACCESS_CODE=$CORREIOS_ACCESS_CODE
+        CORREIOS_POSTCARD=$CORREIOS_POSTCARD
         " > functions/.env
         if [ -z "$DEPLOY_CODEBASE" ]; then
           GOOGLE_APPLICATION_CREDENTIALS=$GAC_FILENAME npm run deploy

package/ecomplus-stores/barra-doce/functions/many/package.json

@@ -15,8 +15,8 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@cloudcommerce/feeds": "^0.29.0",
-    "@cloudcommerce/firebase": "^0.29.0",
-    "@cloudcommerce/passport": "^0.29.0"
+    "@cloudcommerce/feeds": "^0.30.0",
+    "@cloudcommerce/firebase": "^0.30.0",
+    "@cloudcommerce/passport": "^0.30.0"
   }
 }

package/ecomplus-stores/barra-doce/functions/ssr/package.json

@@ -17,14 +17,14 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@cloudcommerce/api": "^0.29.0",
-    "@cloudcommerce/firebase": "^0.29.0",
-    "@cloudcommerce/ssr": "^0.29.0"
+    "@cloudcommerce/api": "^0.30.0",
+    "@cloudcommerce/firebase": "^0.30.0",
+    "@cloudcommerce/ssr": "^0.30.0"
   },
   "devDependencies": {
-    "@cloudcommerce/i18n": "^0.29.0",
-    "@cloudcommerce/storefront": "^0.29.0",
-    "@cloudcommerce/types": "^0.29.0",
+    "@cloudcommerce/i18n": "^0.30.0",
+    "@cloudcommerce/storefront": "^0.30.0",
+    "@cloudcommerce/types": "^0.30.0",
     "@fontsource/croissant-one": "^5.0.9",
     "@iconify-json/mingcute": "^1.1.9"
   }

package/ecomplus-stores/barra-doce/functions/with-apps/package.json

@@ -15,8 +15,8 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@cloudcommerce/events": "^0.29.0",
-    "@cloudcommerce/firebase": "^0.29.0",
-    "@cloudcommerce/modules": "^0.29.0"
+    "@cloudcommerce/events": "^0.30.0",
+    "@cloudcommerce/firebase": "^0.30.0",
+    "@cloudcommerce/modules": "^0.30.0"
   }
 }

package/ecomplus-stores/barra-doce/package.json

@@ -23,9 +23,9 @@
     "url": "https://github.com/ecomplus/cloud-commerce/issues"
   },
   "dependencies": {
-    "@cloudcommerce/cli": "^0.29.0"
+    "@cloudcommerce/cli": "^0.30.0"
   },
   "devDependencies": {
-    "@cloudcommerce/eslint": "^0.29.0"
+    "@cloudcommerce/eslint": "^0.30.0"
   }
 }

package/ecomplus-stores/monocard/functions/many/package.json

@@ -15,8 +15,8 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@cloudcommerce/feeds": "^0.29.0",
-    "@cloudcommerce/firebase": "^0.29.0",
-    "@cloudcommerce/passport": "^0.29.0"
+    "@cloudcommerce/feeds": "^0.30.0",
+    "@cloudcommerce/firebase": "^0.30.0",
+    "@cloudcommerce/passport": "^0.30.0"
   }
 }

package/ecomplus-stores/monocard/functions/ssr/package.json

@@ -17,15 +17,15 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@cloudcommerce/api": "^0.29.0",
-    "@cloudcommerce/firebase": "^0.29.0",
-    "@cloudcommerce/ssr": "^0.29.0",
+    "@cloudcommerce/api": "^0.30.0",
+    "@cloudcommerce/firebase": "^0.30.0",
+    "@cloudcommerce/ssr": "^0.30.0",
     "@vueuse/motion": "2.0.0-beta.22"
   },
   "devDependencies": {
-    "@cloudcommerce/i18n": "^0.29.0",
-    "@cloudcommerce/storefront": "^0.29.0",
-    "@cloudcommerce/types": "^0.29.0",
+    "@cloudcommerce/i18n": "^0.30.0",
+    "@cloudcommerce/storefront": "^0.30.0",
+    "@cloudcommerce/types": "^0.30.0",
     "@fontsource-variable/inter": "^5.0.8",
     "@iconify-json/ri": "^1.1.8",
     "@iconify-json/wpf": "^1.1.4",

package/ecomplus-stores/monocard/functions/with-apps/package.json

@@ -15,8 +15,8 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@cloudcommerce/events": "^0.29.0",
-    "@cloudcommerce/firebase": "^0.29.0",
-    "@cloudcommerce/modules": "^0.29.0"
+    "@cloudcommerce/events": "^0.30.0",
+    "@cloudcommerce/firebase": "^0.30.0",
+    "@cloudcommerce/modules": "^0.30.0"
   }
 }

package/ecomplus-stores/monocard/package.json

@@ -23,9 +23,9 @@
     "url": "https://github.com/ecomplus/cloud-commerce/issues"
   },
   "dependencies": {
-    "@cloudcommerce/cli": "^0.29.0"
+    "@cloudcommerce/cli": "^0.30.0"
   },
   "devDependencies": {
-    "@cloudcommerce/eslint": "^0.29.0"
+    "@cloudcommerce/eslint": "^0.30.0"
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloudcommerce",
   "type": "module",
-  "version": "0.30.0",
+  "version": "0.31.0",
   "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>",
@@ -25,12 +25,12 @@
     "standard-version": "^9.5.0",
     "ts-node": "^10.9.1",
     "turbo": "^1.10.16",
-    "typescript": "~5.0.4",
+    "typescript": "~5.2.2",
     "uglify-js": "^3.17.4",
     "vite": "^4.5.0",
     "vitest": "^0.34.6",
     "zx": "^7.2.3",
-    "@cloudcommerce/eslint": "0.30.0"
+    "@cloudcommerce/eslint": "0.31.0"
   },
   "scripts": {
     "fix-install": "bash scripts/pre-install.sh && pnpm i",

package/packages/api/lib/api.d.ts

@@ -59,7 +59,7 @@ declare const api: {
             _id: import("../types.d").ResourceId;
         };
     }>;
-    put: <E_1 extends import("../types.d").ResourceAndFind | `products/${string}/${string}` | `categories/${string}/${string}` | `brands/${string}/${string}` | `collections/${string}/${string}` | `grids/${string}/${string}` | `carts/${string}/${string}` | `orders/${string}/${string}` | `customers/${string}/${string}` | `stores/${string}/${string}` | `applications/${string}/${string}` | `authentications/${string}/${string}` | `products/${string}:${string}/${string}` | `categories/${string}:${string}/${string}` | `brands/${string}:${string}/${string}` | `collections/${string}:${string}/${string}` | `grids/${string}:${string}/${string}` | `carts/${string}:${string}/${string}` | `orders/${string}:${string}/${string}` | `customers/${string}:${string}/${string}` | `stores/${string}:${string}/${string}` | `applications/${string}:${string}/${string}` | `authentications/${string}:${string}/${string}` | `slugs/${string}` | ("search/v1" | `search/v1?${string}` | "search/_els" | `search/_els?${string}`) | ("events/products" | "events/categories" | "events/brands" | "events/collections" | "events/grids" | "events/carts" | "events/orders" | "events/customers" | "events/stores" | "events/applications" | "events/authentications" | `events/products/${string}` | `events/categories/${string}` | `events/brands/${string}` | `events/collections/${string}` | `events/grids/${string}` | `events/carts/${string}` | `events/orders/${string}` | `events/customers/${string}` | `events/stores/${string}` | `events/applications/${string}` | `events/authentications/${string}` | "events/me") | "login" | "authenticate" | "ask-auth-callback" | "check-username" | "$aggregate/products" | "$aggregate/categories" | "$aggregate/brands" | "$aggregate/collections" | "$aggregate/grids" | "$aggregate/carts" | "$aggregate/orders" | "$aggregate/customers" | "schemas/products" | "schemas/categories" | "schemas/brands" | "schemas/collections" | "schemas/grids" | "schemas/carts" | "schemas/orders" | "schemas/customers" | "schemas/stores" | "schemas/applications" | "schemas/authentications", C_1 extends AbstractedConfig>(endpoint: E_1, body: RequestBody<{
+    put: <E_1 extends import("../types.d").ResourceAndFind | `products/${import("../types.d").ResourceId}/${string}` | `categories/${import("../types.d").ResourceId}/${string}` | `brands/${import("../types.d").ResourceId}/${string}` | `collections/${import("../types.d").ResourceId}/${string}` | `grids/${import("../types.d").ResourceId}/${string}` | `carts/${import("../types.d").ResourceId}/${string}` | `orders/${import("../types.d").ResourceId}/${string}` | `customers/${import("../types.d").ResourceId}/${string}` | `stores/${import("../types.d").ResourceId}/${string}` | `applications/${import("../types.d").ResourceId}/${string}` | `authentications/${import("../types.d").ResourceId}/${string}` | `products/${string}:${string}/${string}` | `categories/${string}:${string}/${string}` | `brands/${string}:${string}/${string}` | `collections/${string}:${string}/${string}` | `grids/${string}:${string}/${string}` | `carts/${string}:${string}/${string}` | `orders/${string}:${string}/${string}` | `customers/${string}:${string}/${string}` | `stores/${string}:${string}/${string}` | `applications/${string}:${string}/${string}` | `authentications/${string}:${string}/${string}` | `slugs/${string}` | ("search/v1" | `search/v1?${string}` | "search/_els" | `search/_els?${string}`) | ("events/products" | "events/categories" | "events/brands" | "events/collections" | "events/grids" | "events/carts" | "events/orders" | "events/customers" | "events/stores" | "events/applications" | "events/authentications" | `events/products/${import("../types.d").ResourceId}` | `events/categories/${import("../types.d").ResourceId}` | `events/brands/${import("../types.d").ResourceId}` | `events/collections/${import("../types.d").ResourceId}` | `events/grids/${import("../types.d").ResourceId}` | `events/carts/${import("../types.d").ResourceId}` | `events/orders/${import("../types.d").ResourceId}` | `events/customers/${import("../types.d").ResourceId}` | `events/stores/${import("../types.d").ResourceId}` | `events/applications/${import("../types.d").ResourceId}` | `events/authentications/${import("../types.d").ResourceId}` | "events/me") | "login" | "authenticate" | "ask-auth-callback" | "check-username" | "$aggregate/products" | "$aggregate/categories" | "$aggregate/brands" | "$aggregate/collections" | "$aggregate/grids" | "$aggregate/carts" | "$aggregate/orders" | "$aggregate/customers" | "schemas/products" | "schemas/categories" | "schemas/brands" | "schemas/collections" | "schemas/grids" | "schemas/carts" | "schemas/orders" | "schemas/customers" | "schemas/stores" | "schemas/applications" | "schemas/authentications", C_1 extends AbstractedConfig>(endpoint: E_1, body: RequestBody<{
         endpoint: E_1;
         method: 'put';
     }>, config?: C_1 | undefined) => Promise<Response & {
@@ -103,7 +103,7 @@ declare const post: <E extends Endpoint, C extends AbstractedConfig>(endpoint: E
         _id: import("../types.d").ResourceId;
     };
 }>;
-declare const put: <E extends import("../types.d").ResourceAndFind | `products/${string}/${string}` | `categories/${string}/${string}` | `brands/${string}/${string}` | `collections/${string}/${string}` | `grids/${string}/${string}` | `carts/${string}/${string}` | `orders/${string}/${string}` | `customers/${string}/${string}` | `stores/${string}/${string}` | `applications/${string}/${string}` | `authentications/${string}/${string}` | `products/${string}:${string}/${string}` | `categories/${string}:${string}/${string}` | `brands/${string}:${string}/${string}` | `collections/${string}:${string}/${string}` | `grids/${string}:${string}/${string}` | `carts/${string}:${string}/${string}` | `orders/${string}:${string}/${string}` | `customers/${string}:${string}/${string}` | `stores/${string}:${string}/${string}` | `applications/${string}:${string}/${string}` | `authentications/${string}:${string}/${string}` | `slugs/${string}` | ("search/v1" | `search/v1?${string}` | "search/_els" | `search/_els?${string}`) | ("events/products" | "events/categories" | "events/brands" | "events/collections" | "events/grids" | "events/carts" | "events/orders" | "events/customers" | "events/stores" | "events/applications" | "events/authentications" | `events/products/${string}` | `events/categories/${string}` | `events/brands/${string}` | `events/collections/${string}` | `events/grids/${string}` | `events/carts/${string}` | `events/orders/${string}` | `events/customers/${string}` | `events/stores/${string}` | `events/applications/${string}` | `events/authentications/${string}` | "events/me") | "login" | "authenticate" | "ask-auth-callback" | "check-username" | "$aggregate/products" | "$aggregate/categories" | "$aggregate/brands" | "$aggregate/collections" | "$aggregate/grids" | "$aggregate/carts" | "$aggregate/orders" | "$aggregate/customers" | "schemas/products" | "schemas/categories" | "schemas/brands" | "schemas/collections" | "schemas/grids" | "schemas/carts" | "schemas/orders" | "schemas/customers" | "schemas/stores" | "schemas/applications" | "schemas/authentications", C extends AbstractedConfig>(endpoint: E, body: RequestBody<{
+declare const put: <E extends import("../types.d").ResourceAndFind | `products/${import("../types.d").ResourceId}/${string}` | `categories/${import("../types.d").ResourceId}/${string}` | `brands/${import("../types.d").ResourceId}/${string}` | `collections/${import("../types.d").ResourceId}/${string}` | `grids/${import("../types.d").ResourceId}/${string}` | `carts/${import("../types.d").ResourceId}/${string}` | `orders/${import("../types.d").ResourceId}/${string}` | `customers/${import("../types.d").ResourceId}/${string}` | `stores/${import("../types.d").ResourceId}/${string}` | `applications/${import("../types.d").ResourceId}/${string}` | `authentications/${import("../types.d").ResourceId}/${string}` | `products/${string}:${string}/${string}` | `categories/${string}:${string}/${string}` | `brands/${string}:${string}/${string}` | `collections/${string}:${string}/${string}` | `grids/${string}:${string}/${string}` | `carts/${string}:${string}/${string}` | `orders/${string}:${string}/${string}` | `customers/${string}:${string}/${string}` | `stores/${string}:${string}/${string}` | `applications/${string}:${string}/${string}` | `authentications/${string}:${string}/${string}` | `slugs/${string}` | ("search/v1" | `search/v1?${string}` | "search/_els" | `search/_els?${string}`) | ("events/products" | "events/categories" | "events/brands" | "events/collections" | "events/grids" | "events/carts" | "events/orders" | "events/customers" | "events/stores" | "events/applications" | "events/authentications" | `events/products/${import("../types.d").ResourceId}` | `events/categories/${import("../types.d").ResourceId}` | `events/brands/${import("../types.d").ResourceId}` | `events/collections/${import("../types.d").ResourceId}` | `events/grids/${import("../types.d").ResourceId}` | `events/carts/${import("../types.d").ResourceId}` | `events/orders/${import("../types.d").ResourceId}` | `events/customers/${import("../types.d").ResourceId}` | `events/stores/${import("../types.d").ResourceId}` | `events/applications/${import("../types.d").ResourceId}` | `events/authentications/${import("../types.d").ResourceId}` | "events/me") | "login" | "authenticate" | "ask-auth-callback" | "check-username" | "$aggregate/products" | "$aggregate/categories" | "$aggregate/brands" | "$aggregate/collections" | "$aggregate/grids" | "$aggregate/carts" | "$aggregate/orders" | "$aggregate/customers" | "schemas/products" | "schemas/categories" | "schemas/brands" | "schemas/collections" | "schemas/grids" | "schemas/carts" | "schemas/orders" | "schemas/customers" | "schemas/stores" | "schemas/applications" | "schemas/authentications", C extends AbstractedConfig>(endpoint: E, body: RequestBody<{
     endpoint: E;
     method: 'put';
 }>, config?: C | undefined) => Promise<Response & {

package/packages/api/package.json

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

package/packages/apps/affilate-program/lib/events-to-affilate-program.js

@@ -99,11 +99,10 @@ const handleApiEvent = async ({
         logger.warn('Inactive customer');
         return null;
       }
-      if (!buyerCustomer.affiliate_code) {
-        return null;
-      }
-      const referralCustomer = (await api.get(`customers/${buyerCustomer.affiliate_code}`)).data;
-      if (referralCustomer.doc_number === buyerCustomer.doc_number) {
+      const affiliateCode = buyerCustomer.affiliate_code;
+      if (!affiliateCode) return null;
+      const referralCustomer = (await api.get(`customers/${affiliateCode}`)).data;
+      if (referralCustomer?.doc_number === buyerCustomer.doc_number) {
         logger.warn('Order placed by affiliate');
         return null;
       }

package/packages/apps/affilate-program/lib/events-to-affilate-program.js.map

@@ -1 +1 @@
-{"version":3,"file":"events-to-affilate-program.js","sourceRoot":"","sources":["../src/events-to-affilate-program.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"events-to-affilate-program.js","sourceRoot":"","sources":["../src/events-to-affilate-program.ts"],"names":[],"mappings":"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"}

package/packages/apps/affilate-program/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-affilate-program",
   "type": "module",
-  "version": "0.30.0",
+  "version": "0.31.0",
   "description": "E-Com Plus Cloud Commerce app for simple affiliate program",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/affilate-program/src/events-to-affilate-program.ts

@@ -86,7 +86,7 @@ const handleApiEvent: ApiEventHandler = async ({
   logger.info(`${isOrder ? 'Orders' : 'Customers'}`);
   try {
     if (isCustomer && appData.points_on_signup) {
-      const referralCustomer = (await api.get(`customers/${referralId}`)).data;
+      const referralCustomer = (await api.get(`customers/${referralId as ResourceId}`)).data;
       if (!referralCustomer?.enabled) {
         logger.warn('Inactive customer');
         return null;
@@ -118,18 +118,17 @@ const handleApiEvent: ApiEventHandler = async ({
       if (appData.min_subtotal_to_earn > orderSubtotal) {
         return null;
       }
-      const buyerCustomer = (await api.get(`customers/${buyerId}`)).data;
+      const buyerCustomer = (await api.get(`customers/${buyerId as ResourceId}`)).data;
 
       if (!buyerCustomer?.enabled) {
         logger.warn('Inactive customer');
         return null;
       }
 
-      if (!buyerCustomer.affiliate_code) {
-        return null;
-      }
-      const referralCustomer = (await api.get(`customers/${buyerCustomer.affiliate_code}`)).data;
-      if (referralCustomer.doc_number === buyerCustomer.doc_number) {
+      const affiliateCode = buyerCustomer.affiliate_code as ResourceId | undefined;
+      if (!affiliateCode) return null;
+      const referralCustomer = (await api.get(`customers/${affiliateCode}`)).data;
+      if (referralCustomer?.doc_number === buyerCustomer.doc_number) {
         logger.warn('Order placed by affiliate');
         return null;
       }

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

@@ -1,2 +1,3 @@
 import type { AppModuleBody } from '@cloudcommerce/types';
+import '@cloudcommerce/firebase/lib/init';
 export declare const calculateShipping: (modBody: AppModuleBody) => Promise<any>;

package/packages/apps/correios/lib/correios.js

@@ -1,4 +1,5 @@
-import handleCalculateShipping from '../lib-mjs/calculate-correios.mjs';
+import '@cloudcommerce/firebase/lib/init';
+import handleCalculateShipping from '../lib-mjs/calculate-shipping.mjs';
 
 export const calculateShipping = async (modBody) => {
   return handleCalculateShipping(modBody);

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

@@ -1 +1 @@
-{"version":3,"file":"correios.js","sourceRoot":"","sources":["../src/correios.ts"],"names":[],"mappings":"AAEA,OAAO,uBAAuB,MAAM,mCAAmC,CAAC;AAExE,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EAAE,OAAsB,EAAE,EAAE;IAChE,OAAO,uBAAuB,CAAC,OAAO,CAAC,CAAC;AAC1C,CAAC,CAAC"}
+{"version":3,"file":"correios.js","sourceRoot":"","sources":["../src/correios.ts"],"names":[],"mappings":"AAEA,OAAO,kCAAkC,CAAC;AAC1C,OAAO,uBAAuB,MAAM,mCAAmC,CAAC;AAExE,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EAAE,OAAsB,EAAE,EAAE;IAChE,OAAO,uBAAuB,CAAC,OAAO,CAAC,CAAC;AAC1C,CAAC,CAAC"}