cloudcommerce 2.0.2 → 2.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +8 -0
- package/action.yml +6 -6
- package/ecomplus-stores/barra-doce/.github/workflows/build-and-deploy.yml +41 -0
- package/ecomplus-stores/barra-doce/functions/many/package.json +3 -3
- package/ecomplus-stores/barra-doce/functions/ssr/astro.config.mjs +2 -1
- package/ecomplus-stores/barra-doce/functions/ssr/package.json +6 -8
- package/ecomplus-stores/barra-doce/functions/ssr/src/assets/style.css +1 -4
- package/ecomplus-stores/barra-doce/functions/ssr/src/layouts/Base.astro +0 -1
- package/ecomplus-stores/barra-doce/functions/with-apps/package.json +3 -3
- package/ecomplus-stores/barra-doce/package.json +2 -2
- package/ecomplus-stores/tia-sonia/.github/workflows/build-and-deploy.yml +46 -10
- package/package.json +2 -2
- package/packages/api/package.json +1 -1
- package/packages/apps/affiliate-program/package.json +1 -1
- package/packages/apps/correios/package.json +1 -1
- package/packages/apps/custom-payment/package.json +1 -1
- package/packages/apps/custom-shipping/package.json +1 -1
- package/packages/apps/datafrete/package.json +1 -1
- package/packages/apps/discounts/package.json +1 -1
- package/packages/apps/emails/package.json +1 -1
- package/packages/apps/fb-conversions/package.json +1 -1
- package/packages/apps/flash-courier/package.json +1 -1
- package/packages/apps/frenet/package.json +1 -1
- package/packages/apps/galaxpay/package.json +1 -1
- package/packages/apps/google-analytics/package.json +1 -1
- package/packages/apps/jadlog/package.json +1 -1
- package/packages/apps/loyalty-points/package.json +1 -1
- package/packages/apps/mandae/package.json +1 -1
- package/packages/apps/melhor-envio/package.json +1 -1
- package/packages/apps/mercadopago/package.json +1 -1
- package/packages/apps/pagarme/package.json +1 -1
- package/packages/apps/pagarme-v5/package.json +1 -1
- package/packages/apps/paghiper/package.json +1 -1
- package/packages/apps/pix/package.json +1 -1
- package/packages/apps/tiny-erp/package.json +1 -1
- package/packages/apps/webhooks/package.json +1 -1
- package/packages/cli/package.json +1 -1
- package/packages/config/package.json +1 -1
- package/packages/emails/lib/index.js +6 -4
- package/packages/emails/lib/index.js.map +1 -1
- package/packages/emails/package.json +1 -1
- package/packages/emails/src/index.ts +6 -6
- package/packages/eslint/package.json +1 -1
- package/packages/events/package.json +1 -1
- package/packages/feeds/package.json +1 -1
- package/packages/firebase/package.json +1 -1
- package/packages/i18n/package.json +1 -1
- package/packages/modules/lib/firebase/handle-module.js.map +1 -1
- package/packages/modules/package.json +1 -1
- package/packages/modules/src/firebase/handle-module.ts +2 -1
- package/packages/passport/package.json +1 -1
- package/packages/ssr/lib/lib/cron-ssr-save-views.js +17 -6
- package/packages/ssr/lib/lib/cron-ssr-save-views.js.map +1 -1
- package/packages/ssr/package.json +1 -1
- package/packages/ssr/src/lib/cron-ssr-save-views.ts +18 -7
- package/packages/storefront/package.json +1 -1
- package/packages/test-base/package.json +1 -1
- package/packages/types/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,14 @@
|
|
|
2
2
|
|
|
3
3
|
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.
|
|
4
4
|
|
|
5
|
+
### [2.0.3](https://github.com/ecomplus/cloud-commerce/compare/v2.0.2...v2.0.3) (2024-01-09)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* **emails:** Using contact email from settings as default sender if `MAIL_SENDER` env not set ([b843a35](https://github.com/ecomplus/cloud-commerce/commit/b843a3550a3d4cf3f4c3daaae83e397b975639f2))
|
|
11
|
+
* **ssr:** Prevent rejection and proper debug API errors on cron save views ([f8f9bdd](https://github.com/ecomplus/cloud-commerce/commit/f8f9bddd0f166f9a2bf6657d1a51210d6ce44296))
|
|
12
|
+
|
|
5
13
|
### [2.0.2](https://github.com/ecomplus/cloud-commerce/compare/v2.0.1...v2.0.2) (2024-01-08)
|
|
6
14
|
|
|
7
15
|
|
package/action.yml
CHANGED
|
@@ -19,20 +19,20 @@ inputs:
|
|
|
19
19
|
deploy-codebase:
|
|
20
20
|
description: 'Specific Firebase Functions codebase for partial deploy'
|
|
21
21
|
mail-sender:
|
|
22
|
-
description: 'Emails: sender email'
|
|
22
|
+
description: 'Emails: sender email (default from settings contact email)'
|
|
23
23
|
mail-sender-name:
|
|
24
24
|
description: 'Emails: sender name (default is store name)'
|
|
25
25
|
mail-reply-to:
|
|
26
26
|
description: 'Emails: Reply email'
|
|
27
|
-
smpt-host:
|
|
27
|
+
smpt-host:
|
|
28
28
|
description: 'Emails: SMTP hostname'
|
|
29
|
-
smpt-port:
|
|
29
|
+
smpt-port:
|
|
30
30
|
description: 'Emails: SMTP port number'
|
|
31
|
-
smpt-user:
|
|
31
|
+
smpt-user:
|
|
32
32
|
description: 'Emails: SMTP username'
|
|
33
|
-
smpt-pass:
|
|
33
|
+
smpt-pass:
|
|
34
34
|
description: 'Emails: SMTP password'
|
|
35
|
-
bunnynet-api-key:
|
|
35
|
+
bunnynet-api-key:
|
|
36
36
|
description: 'bunny.net API key (additional CDN layer)'
|
|
37
37
|
sendgrid-api-key:
|
|
38
38
|
description: 'App: SendGrid API key'
|
|
@@ -22,6 +22,7 @@ jobs:
|
|
|
22
22
|
name: Cloud Commerce build and deploy
|
|
23
23
|
runs-on: ubuntu-latest
|
|
24
24
|
if: |
|
|
25
|
+
github.event.head_commit.message != 'Initial commit' &&
|
|
25
26
|
!contains(github.event.head_commit.message, '[skip ci]')
|
|
26
27
|
steps:
|
|
27
28
|
- uses: actions/checkout@v4
|
|
@@ -34,3 +35,43 @@ jobs:
|
|
|
34
35
|
ecom-authentication-id: ${{ secrets.ECOM_AUTHENTICATION_ID }}
|
|
35
36
|
ecom-api-key: ${{ secrets.ECOM_API_KEY }}
|
|
36
37
|
ecom-store-id: ${{ secrets.ECOM_STORE_ID }}
|
|
38
|
+
# deploy-codebase: with-apps
|
|
39
|
+
mail-sender: ${{ secrets.MAIL_SENDER }}
|
|
40
|
+
mail-sender-name: ${{ secrets.MAIL_SENDER_NAME }}
|
|
41
|
+
mail-reply-to: ${{ secrets.MAIL_REPLY_TO }}
|
|
42
|
+
smpt-host: ${{ secrets.SMPT_HOST }}
|
|
43
|
+
smpt-port: ${{ secrets.SMPT_PORT }}
|
|
44
|
+
smpt-user: ${{ secrets.SMPT_USER }}
|
|
45
|
+
smpt-pass: ${{ secrets.SMPT_PASS }}
|
|
46
|
+
bunnynet-api-key: ${{ secrets.BUNNYNET_API_KEY }}
|
|
47
|
+
sendgrid-api-key: ${{ secrets.SENDGRID_API_KEY }}
|
|
48
|
+
tinyerp-token: ${{ secrets.TINYERP_TOKEN }}
|
|
49
|
+
galaxpay-partner-id: ${{ secrets.GALAXPAY_PARTNER_ID }}
|
|
50
|
+
galaxpay-partner-hash: ${{ secrets.GALAXPAY_PARTNER_HASH }}
|
|
51
|
+
datafrete-operator-token: ${{ secrets.DATAFRETE_OPERATOR_TOKEN }}
|
|
52
|
+
mercadopago-token: ${{ secrets.MERCADOPAGO_TOKEN }}
|
|
53
|
+
frenet-token: ${{ secrets.FRENET_TOKEN }}
|
|
54
|
+
galaxpay-id: ${{ secrets.GALAXPAY_ID }}
|
|
55
|
+
galaxpay-hash: ${{ secrets.GALAXPAY_HASH }}
|
|
56
|
+
ga-measurement-id: ${{ secrets.GA_MEASUREMENT_ID }}
|
|
57
|
+
ga-api-secret: ${{ secrets.GA_API_SECRET }}
|
|
58
|
+
infinitepay-id: ${{ secrets.INFINITEPAY_ID }}
|
|
59
|
+
infinitepay-secret: ${{ secrets.INFINITEPAY_SECRET }}
|
|
60
|
+
fb-pixel-id: ${{ secrets.FB_PIXEL_ID }}
|
|
61
|
+
fb-graph-token: ${{ secrets.FB_GRAPH_TOKEN }}
|
|
62
|
+
jadlog-contract-token: ${{ secrets.JADLOG_CONTRACT_TOKEN }}
|
|
63
|
+
pagarme-encrypt-key: ${{ secrets.PAGARME_ENCRYPT_KEY }}
|
|
64
|
+
pagarme-token: ${{ secrets.PAGARME_TOKEN }}
|
|
65
|
+
pagarme-partner-id: ${{ secrets.PAGARME_PARTNER_ID }}
|
|
66
|
+
paghiper-token: ${{ secrets.PAGHIPER_TOKEN }}
|
|
67
|
+
pix-credentials: ${{ secrets.PIX_CREDENTIALS }}
|
|
68
|
+
flashcourier-contract: ${{ secrets.FLASHCOURIER_CONTRACT }}
|
|
69
|
+
webhooks-token: ${{ secrets.WEBHOOKS_TOKEN }}
|
|
70
|
+
mandae-token: ${{ secrets.MANDAE_TOKEN }}
|
|
71
|
+
correios-user: ${{ secrets.CORREIOS_USER }}
|
|
72
|
+
correios-access-code: ${{ secrets.CORREIOS_ACCESS_CODE }}
|
|
73
|
+
correios-postcard-number: ${{ secrets.CORREIOS_POSTCARD_NUMBER }}
|
|
74
|
+
pagarmev5-api-token: ${{ secrets.PAGARMEV5_API_TOKEN }}
|
|
75
|
+
pagarmev5-public-key: ${{ secrets.PAGARMEV5_PUBLIC_KEY }}
|
|
76
|
+
tiktok-pixel-id: ${{ secrets.TIKTOK_PIXEL_ID }}
|
|
77
|
+
tiktok-access-token: ${{ secrets.TIKTOK_ACCESS_TOKEN }}
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
},
|
|
16
16
|
"main": "index.js",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@cloudcommerce/feeds": "^2.0.
|
|
19
|
-
"@cloudcommerce/firebase": "^2.0.
|
|
20
|
-
"@cloudcommerce/passport": "^2.0.
|
|
18
|
+
"@cloudcommerce/feeds": "^2.0.2",
|
|
19
|
+
"@cloudcommerce/firebase": "^2.0.2",
|
|
20
|
+
"@cloudcommerce/passport": "^2.0.2"
|
|
21
21
|
}
|
|
22
22
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { defineConfig } from 'astro/config';
|
|
2
2
|
import { astroConfig } from '@cloudcommerce/storefront/astro.config.mjs';
|
|
3
|
-
import { FontaineTransform } from 'fontaine';
|
|
4
3
|
|
|
4
|
+
/*
|
|
5
5
|
const fontaineTransform = FontaineTransform.vite({
|
|
6
6
|
fallbacks: ['Inter', 'Arial'],
|
|
7
7
|
resolvePath: (id) => new URL(`./public${id}`, import.meta.url),
|
|
@@ -15,5 +15,6 @@ fontaineTransform.transform = async (src, id) => {
|
|
|
15
15
|
return r;
|
|
16
16
|
};
|
|
17
17
|
astroConfig.vite.plugins.push(fontaineTransform);
|
|
18
|
+
*/
|
|
18
19
|
|
|
19
20
|
export default defineConfig(astroConfig);
|
|
@@ -17,18 +17,16 @@
|
|
|
17
17
|
},
|
|
18
18
|
"main": "index.js",
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@cloudcommerce/api": "^2.0.
|
|
21
|
-
"@cloudcommerce/firebase": "^2.0.
|
|
22
|
-
"@cloudcommerce/ssr": "^2.0.
|
|
20
|
+
"@cloudcommerce/api": "^2.0.2",
|
|
21
|
+
"@cloudcommerce/firebase": "^2.0.2",
|
|
22
|
+
"@cloudcommerce/ssr": "^2.0.2",
|
|
23
23
|
"@headlessui/vue": "^1.7.16"
|
|
24
24
|
},
|
|
25
25
|
"devDependencies": {
|
|
26
|
-
"@cloudcommerce/i18n": "^2.0.
|
|
27
|
-
"@cloudcommerce/storefront": "^2.0.
|
|
28
|
-
"@cloudcommerce/types": "^2.0.
|
|
29
|
-
"@fontsource/league-spartan": "^5.0.18",
|
|
26
|
+
"@cloudcommerce/i18n": "^2.0.2",
|
|
27
|
+
"@cloudcommerce/storefront": "^2.0.2",
|
|
28
|
+
"@cloudcommerce/types": "^2.0.2",
|
|
30
29
|
"@iconify-json/mingcute": "^1.1.15",
|
|
31
|
-
"fontaine": "^0.4.1",
|
|
32
30
|
"photoswipe": "^5.4.3"
|
|
33
31
|
}
|
|
34
32
|
}
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
:root {
|
|
2
|
-
--font-brand: "League Spartan", "League Spartan fallback";
|
|
3
|
-
}
|
|
4
1
|
html {
|
|
5
2
|
scroll-behavior: smooth;
|
|
6
3
|
}
|
|
@@ -54,7 +51,7 @@ a, button, button > *, [role=button], [role=button] > * {
|
|
|
54
51
|
}
|
|
55
52
|
|
|
56
53
|
.ui-text-brand, .ui-title {
|
|
57
|
-
@apply font-brand font-
|
|
54
|
+
@apply font-brand font-extrabold not-italic;
|
|
58
55
|
}
|
|
59
56
|
.ui-title {
|
|
60
57
|
@apply text-3xl xl:text-5xl;
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
},
|
|
16
16
|
"main": "index.js",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@cloudcommerce/events": "^2.0.
|
|
19
|
-
"@cloudcommerce/firebase": "^2.0.
|
|
20
|
-
"@cloudcommerce/modules": "^2.0.
|
|
18
|
+
"@cloudcommerce/events": "^2.0.2",
|
|
19
|
+
"@cloudcommerce/firebase": "^2.0.2",
|
|
20
|
+
"@cloudcommerce/modules": "^2.0.2"
|
|
21
21
|
}
|
|
22
22
|
}
|
|
@@ -23,9 +23,9 @@
|
|
|
23
23
|
"url": "https://github.com/ecomplus/cloud-commerce/issues"
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@cloudcommerce/cli": "^2.0.
|
|
26
|
+
"@cloudcommerce/cli": "^2.0.2"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
|
-
"@cloudcommerce/eslint": "^2.0.
|
|
29
|
+
"@cloudcommerce/eslint": "^2.0.2"
|
|
30
30
|
}
|
|
31
31
|
}
|
|
@@ -6,10 +6,6 @@ on:
|
|
|
6
6
|
- main
|
|
7
7
|
paths:
|
|
8
8
|
- 'functions/**'
|
|
9
|
-
- 'public/**'
|
|
10
|
-
- 'src/**'
|
|
11
|
-
- 'content/**'
|
|
12
|
-
- 'template/**'
|
|
13
9
|
- 'package-lock.json'
|
|
14
10
|
- '.firebaserc'
|
|
15
11
|
- '.ecomplus/**'
|
|
@@ -17,11 +13,8 @@ on:
|
|
|
17
13
|
- '.github/workflows/build-and-deploy.yml'
|
|
18
14
|
pull_request:
|
|
19
15
|
paths:
|
|
20
|
-
- 'functions/**'
|
|
21
|
-
- '
|
|
22
|
-
- 'src/**'
|
|
23
|
-
- 'content/**'
|
|
24
|
-
- 'template/**'
|
|
16
|
+
- 'functions/ssr/**'
|
|
17
|
+
- '.firebaserc'
|
|
25
18
|
- 'package-lock.json'
|
|
26
19
|
|
|
27
20
|
jobs:
|
|
@@ -29,9 +22,12 @@ jobs:
|
|
|
29
22
|
name: Cloud Commerce build and deploy
|
|
30
23
|
runs-on: ubuntu-latest
|
|
31
24
|
if: |
|
|
25
|
+
github.event.head_commit.message != 'Initial commit' &&
|
|
32
26
|
!contains(github.event.head_commit.message, '[skip ci]')
|
|
33
27
|
steps:
|
|
34
|
-
- uses: actions/checkout@
|
|
28
|
+
- uses: actions/checkout@v4
|
|
29
|
+
with:
|
|
30
|
+
fetch-depth: 0
|
|
35
31
|
- uses: ecomplus/cloud-commerce@main
|
|
36
32
|
with:
|
|
37
33
|
github-token: ${{ secrets.GITHUB_TOKEN }}
|
|
@@ -39,3 +35,43 @@ jobs:
|
|
|
39
35
|
ecom-authentication-id: ${{ secrets.ECOM_AUTHENTICATION_ID }}
|
|
40
36
|
ecom-api-key: ${{ secrets.ECOM_API_KEY }}
|
|
41
37
|
ecom-store-id: ${{ secrets.ECOM_STORE_ID }}
|
|
38
|
+
# deploy-codebase: with-apps
|
|
39
|
+
mail-sender: ${{ secrets.MAIL_SENDER }}
|
|
40
|
+
mail-sender-name: ${{ secrets.MAIL_SENDER_NAME }}
|
|
41
|
+
mail-reply-to: ${{ secrets.MAIL_REPLY_TO }}
|
|
42
|
+
smpt-host: ${{ secrets.SMPT_HOST }}
|
|
43
|
+
smpt-port: ${{ secrets.SMPT_PORT }}
|
|
44
|
+
smpt-user: ${{ secrets.SMPT_USER }}
|
|
45
|
+
smpt-pass: ${{ secrets.SMPT_PASS }}
|
|
46
|
+
bunnynet-api-key: ${{ secrets.BUNNYNET_API_KEY }}
|
|
47
|
+
sendgrid-api-key: ${{ secrets.SENDGRID_API_KEY }}
|
|
48
|
+
tinyerp-token: ${{ secrets.TINYERP_TOKEN }}
|
|
49
|
+
galaxpay-partner-id: ${{ secrets.GALAXPAY_PARTNER_ID }}
|
|
50
|
+
galaxpay-partner-hash: ${{ secrets.GALAXPAY_PARTNER_HASH }}
|
|
51
|
+
datafrete-operator-token: ${{ secrets.DATAFRETE_OPERATOR_TOKEN }}
|
|
52
|
+
mercadopago-token: ${{ secrets.MERCADOPAGO_TOKEN }}
|
|
53
|
+
frenet-token: ${{ secrets.FRENET_TOKEN }}
|
|
54
|
+
galaxpay-id: ${{ secrets.GALAXPAY_ID }}
|
|
55
|
+
galaxpay-hash: ${{ secrets.GALAXPAY_HASH }}
|
|
56
|
+
ga-measurement-id: ${{ secrets.GA_MEASUREMENT_ID }}
|
|
57
|
+
ga-api-secret: ${{ secrets.GA_API_SECRET }}
|
|
58
|
+
infinitepay-id: ${{ secrets.INFINITEPAY_ID }}
|
|
59
|
+
infinitepay-secret: ${{ secrets.INFINITEPAY_SECRET }}
|
|
60
|
+
fb-pixel-id: ${{ secrets.FB_PIXEL_ID }}
|
|
61
|
+
fb-graph-token: ${{ secrets.FB_GRAPH_TOKEN }}
|
|
62
|
+
jadlog-contract-token: ${{ secrets.JADLOG_CONTRACT_TOKEN }}
|
|
63
|
+
pagarme-encrypt-key: ${{ secrets.PAGARME_ENCRYPT_KEY }}
|
|
64
|
+
pagarme-token: ${{ secrets.PAGARME_TOKEN }}
|
|
65
|
+
pagarme-partner-id: ${{ secrets.PAGARME_PARTNER_ID }}
|
|
66
|
+
paghiper-token: ${{ secrets.PAGHIPER_TOKEN }}
|
|
67
|
+
pix-credentials: ${{ secrets.PIX_CREDENTIALS }}
|
|
68
|
+
flashcourier-contract: ${{ secrets.FLASHCOURIER_CONTRACT }}
|
|
69
|
+
webhooks-token: ${{ secrets.WEBHOOKS_TOKEN }}
|
|
70
|
+
mandae-token: ${{ secrets.MANDAE_TOKEN }}
|
|
71
|
+
correios-user: ${{ secrets.CORREIOS_USER }}
|
|
72
|
+
correios-access-code: ${{ secrets.CORREIOS_ACCESS_CODE }}
|
|
73
|
+
correios-postcard-number: ${{ secrets.CORREIOS_POSTCARD_NUMBER }}
|
|
74
|
+
pagarmev5-api-token: ${{ secrets.PAGARMEV5_API_TOKEN }}
|
|
75
|
+
pagarmev5-public-key: ${{ secrets.PAGARMEV5_PUBLIC_KEY }}
|
|
76
|
+
tiktok-pixel-id: ${{ secrets.TIKTOK_PIXEL_ID }}
|
|
77
|
+
tiktok-access-token: ${{ secrets.TIKTOK_ACCESS_TOKEN }}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cloudcommerce",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "2.0.
|
|
4
|
+
"version": "2.0.3",
|
|
5
5
|
"description": "Open fair-code headless commerce platform: API-first, microservices based, event driven and cloud native",
|
|
6
6
|
"main": "packages/api/lib/index.js",
|
|
7
7
|
"author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"vite": "^5.0.11",
|
|
31
31
|
"vitest": "^1.1.3",
|
|
32
32
|
"zx": "^7.2.3",
|
|
33
|
-
"@cloudcommerce/eslint": "2.0.
|
|
33
|
+
"@cloudcommerce/eslint": "2.0.3"
|
|
34
34
|
},
|
|
35
35
|
"scripts": {
|
|
36
36
|
"fix-install": "bash scripts/pre-install.sh && pnpm i",
|
|
@@ -15,10 +15,12 @@ const sendEmail = (emailData) => {
|
|
|
15
15
|
templateData, templateId, template, to, subject, cc, sender, bcc, text, html,
|
|
16
16
|
} = emailData;
|
|
17
17
|
const { settingsContent } = config.get();
|
|
18
|
+
const senderEmail = MAIL_SENDER || settingsContent.email;
|
|
19
|
+
const senderName = MAIL_SENDER_NAME || settingsContent.name;
|
|
18
20
|
if (!templateId && !template && !html) {
|
|
19
21
|
throw new Error('TemplateId, template or html not found');
|
|
20
22
|
}
|
|
21
|
-
if (!
|
|
23
|
+
if (!senderEmail) {
|
|
22
24
|
throw new Error('Sender email not configured');
|
|
23
25
|
}
|
|
24
26
|
const emailHeaders = {
|
|
@@ -28,13 +30,13 @@ const sendEmail = (emailData) => {
|
|
|
28
30
|
sender,
|
|
29
31
|
bcc,
|
|
30
32
|
from: {
|
|
31
|
-
name:
|
|
32
|
-
email:
|
|
33
|
+
name: senderName,
|
|
34
|
+
email: senderEmail,
|
|
33
35
|
},
|
|
34
36
|
};
|
|
35
37
|
if (MAIL_REPLY_TO) {
|
|
36
38
|
emailHeaders.replyTo = {
|
|
37
|
-
name:
|
|
39
|
+
name: senderName,
|
|
38
40
|
email: MAIL_REPLY_TO,
|
|
39
41
|
};
|
|
40
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAOA,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,aAAa,EAAE,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,iBAAiB,MAAM,4BAA4B,CAAC;AAE3D,0CAA0C;AAC1C,IAAI,UAAkC,CAAC;AAEvC,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAAE,EAAE;IAC3C,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,MAAM,CAAC;AACxC,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAChB,SAWC,EACD,EAAE;IACF,MAAM,EACJ,WAAW,EACX,gBAAgB,EAChB,aAAa,EACb,SAAS,EACT,SAAS,EACT,SAAS,EACT,SAAS,EACT,QAAQ,EACR,gBAAgB,GACjB,GAAG,OAAO,CAAC,GAAG,CAAC;IAEhB,MAAM,EACJ,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,EAAE,EACF,OAAO,EACP,EAAE,EACF,MAAM,EACN,GAAG,EACH,IAAI,EACJ,IAAI,GACL,GAAG,SAAS,CAAC;IAEd,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,12 +56,13 @@ const sendEmail = (
|
|
|
56
56
|
} = emailData;
|
|
57
57
|
|
|
58
58
|
const { settingsContent } = config.get();
|
|
59
|
+
const senderEmail = MAIL_SENDER || settingsContent.email;
|
|
60
|
+
const senderName = MAIL_SENDER_NAME || settingsContent.name;
|
|
59
61
|
|
|
60
62
|
if (!templateId && !template && !html) {
|
|
61
63
|
throw new Error('TemplateId, template or html not found');
|
|
62
64
|
}
|
|
63
|
-
|
|
64
|
-
if (!MAIL_SENDER) {
|
|
65
|
+
if (!senderEmail) {
|
|
65
66
|
throw new Error('Sender email not configured');
|
|
66
67
|
}
|
|
67
68
|
|
|
@@ -72,14 +73,13 @@ const sendEmail = (
|
|
|
72
73
|
sender,
|
|
73
74
|
bcc,
|
|
74
75
|
from: {
|
|
75
|
-
name:
|
|
76
|
-
email:
|
|
76
|
+
name: senderName,
|
|
77
|
+
email: senderEmail,
|
|
77
78
|
},
|
|
78
79
|
};
|
|
79
|
-
|
|
80
80
|
if (MAIL_REPLY_TO) {
|
|
81
81
|
emailHeaders.replyTo = {
|
|
82
|
-
name:
|
|
82
|
+
name: senderName,
|
|
83
83
|
email: MAIL_REPLY_TO,
|
|
84
84
|
};
|
|
85
85
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handle-module.js","sourceRoot":"","sources":["../../src/firebase/handle-module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"handle-module.js","sourceRoot":"","sources":["../../src/firebase/handle-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import type { Request, Response } from 'firebase-functions';
|
|
2
2
|
import type { Applications, AppModuleName, AppModuleBody } from '@cloudcommerce/types';
|
|
3
|
+
import type { ApiError, ApiConfig } from '@cloudcommerce/api';
|
|
3
4
|
import logger from 'firebase-functions/logger';
|
|
4
5
|
import Ajv, { ValidateFunction } from 'ajv';
|
|
5
6
|
import addFormats from 'ajv-formats';
|
|
6
|
-
import api
|
|
7
|
+
import api from '@cloudcommerce/api';
|
|
7
8
|
import config from '@cloudcommerce/firebase/lib/config';
|
|
8
9
|
import {
|
|
9
10
|
ajv,
|
|
@@ -14,12 +14,17 @@ const saveViews = async () => {
|
|
|
14
14
|
const { countUnsaved } = doc.data();
|
|
15
15
|
if (countUnsaved > 0) {
|
|
16
16
|
const productId = doc.id;
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
17
|
+
try {
|
|
18
|
+
const { views } = (await api.get(`products/${productId}`)).data;
|
|
19
|
+
await api.patch(`products/${productId}`, {
|
|
20
|
+
views: countUnsaved + (views || 0),
|
|
21
|
+
});
|
|
22
|
+
doc.ref.delete();
|
|
23
|
+
} catch (err) {
|
|
24
|
+
error(err);
|
|
25
|
+
break;
|
|
26
|
+
}
|
|
21
27
|
}
|
|
22
|
-
doc.ref.delete();
|
|
23
28
|
}
|
|
24
29
|
if (process.env.BUNNYNET_API_KEY) {
|
|
25
30
|
try {
|
|
@@ -45,7 +50,13 @@ const saveViews = async () => {
|
|
|
45
50
|
}
|
|
46
51
|
}
|
|
47
52
|
} catch (err) {
|
|
48
|
-
|
|
53
|
+
if (typeof err.toJSON === 'function') {
|
|
54
|
+
const _err = new Error('Cant purge bunny.net cache');
|
|
55
|
+
_err.info = err.toJSON();
|
|
56
|
+
error(_err);
|
|
57
|
+
} else {
|
|
58
|
+
error(err);
|
|
59
|
+
}
|
|
49
60
|
}
|
|
50
61
|
}
|
|
51
62
|
const pageViewsQuery = db.collection('ssrPageViews')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron-ssr-save-views.js","sourceRoot":"","sources":["../../src/lib/cron-ssr-save-views.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAClD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,oBAAoB,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,+CAA+C,CAAC;AAEjF,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE;IAC3B,qCAAqC;IACrC,MAAM,EAAE,GAAG,YAAY,EAAE,CAAC;IAC1B,MAAM,oBAAoB,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC;SAChE,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,oBAAoB,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACzD,MAAM,GAAG,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC,IAAI,EAA8B,CAAC;QAChE,IAAI,YAAY,GAAG,CAAC,EAAE;YACpB,MAAM,SAAS,GAAG,GAAG,CAAC,EAA6B,CAAC;YACpD,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,YAAY,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"cron-ssr-save-views.js","sourceRoot":"","sources":["../../src/lib/cron-ssr-save-views.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,12 +14,17 @@ const saveViews = async () => {
|
|
|
14
14
|
const { countUnsaved } = doc.data() as { countUnsaved: number };
|
|
15
15
|
if (countUnsaved > 0) {
|
|
16
16
|
const productId = doc.id as string & { length: 24 };
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
17
|
+
try {
|
|
18
|
+
const { views } = (await api.get(`products/${productId}`)).data;
|
|
19
|
+
await api.patch(`products/${productId}`, {
|
|
20
|
+
views: countUnsaved + (views || 0),
|
|
21
|
+
});
|
|
22
|
+
doc.ref.delete();
|
|
23
|
+
} catch (err) {
|
|
24
|
+
error(err);
|
|
25
|
+
break;
|
|
26
|
+
}
|
|
21
27
|
}
|
|
22
|
-
doc.ref.delete();
|
|
23
28
|
}
|
|
24
29
|
if (process.env.BUNNYNET_API_KEY) {
|
|
25
30
|
try {
|
|
@@ -44,8 +49,14 @@ const saveViews = async () => {
|
|
|
44
49
|
purgedUrls.push(url);
|
|
45
50
|
}
|
|
46
51
|
}
|
|
47
|
-
} catch (err) {
|
|
48
|
-
|
|
52
|
+
} catch (err: any) {
|
|
53
|
+
if (typeof err.toJSON === 'function') {
|
|
54
|
+
const _err: any = new Error('Cant purge bunny.net cache');
|
|
55
|
+
_err.info = err.toJSON();
|
|
56
|
+
error(_err);
|
|
57
|
+
} else {
|
|
58
|
+
error(err);
|
|
59
|
+
}
|
|
49
60
|
}
|
|
50
61
|
}
|
|
51
62
|
const pageViewsQuery = db.collection('ssrPageViews')
|