cloudcommerce 2.3.3 → 2.3.4
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 +2 -0
- package/ecomplus-stores/barradoce/functions/many/package.json +1 -1
- package/ecomplus-stores/barradoce/functions/ssr/package.json +1 -1
- package/ecomplus-stores/barradoce/functions/with-apps/package.json +1 -1
- 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/package.json +1 -1
- 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/package.json +1 -1
- package/packages/passport/package.json +1 -1
- package/packages/ssr/package.json +1 -1
- package/packages/storefront/package.json +1 -1
- package/packages/storefront/src/lib/scripts/decap-cms.ts +31 -7
- package/packages/test-base/package.json +1 -1
- package/packages/types/package.json +1 -1
- package/pnpm-workspace.yaml +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,8 @@
|
|
|
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.3.4](https://github.com/ecomplus/cloud-commerce/compare/v2.3.3...v2.3.4) (2024-02-09)
|
|
6
|
+
|
|
5
7
|
### [2.3.3](https://github.com/ecomplus/cloud-commerce/compare/v2.3.2...v2.3.3) (2024-02-09)
|
|
6
8
|
|
|
7
9
|
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cloudcommerce",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "2.3.
|
|
4
|
+
"version": "2.3.4",
|
|
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>",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"vite": "^5.0.11",
|
|
37
37
|
"vitest": "^1.2.2",
|
|
38
38
|
"zx": "^7.2.3",
|
|
39
|
-
"@cloudcommerce/eslint": "2.3.
|
|
39
|
+
"@cloudcommerce/eslint": "2.3.4"
|
|
40
40
|
},
|
|
41
41
|
"scripts": {
|
|
42
42
|
"fix-install": "bash scripts/pre-install.sh && pnpm i",
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import Deepmerge from '@fastify/deepmerge';
|
|
2
|
+
import afetch from '../../helpers/afetch';
|
|
2
3
|
import getCmsConfig from '../../decap-cms/get-cms-config';
|
|
3
4
|
import genPreviewContainer from '../../decap-cms/gen-preview-container';
|
|
4
5
|
|
|
@@ -30,7 +31,7 @@ const initCmsWithPreview = () => {
|
|
|
30
31
|
});
|
|
31
32
|
};
|
|
32
33
|
|
|
33
|
-
const
|
|
34
|
+
const authAndInitCms = async () => {
|
|
34
35
|
if (import.meta.env.DEV) {
|
|
35
36
|
cmsConfig.local_backend = true;
|
|
36
37
|
cmsConfig.backend = { name: 'git-gateway' };
|
|
@@ -43,11 +44,11 @@ const initCmsAuth = () => {
|
|
|
43
44
|
ECOM_STORE_ID,
|
|
44
45
|
CMS_SSO_URL = 'https://app.e-com.plus/pages/login?api_version=2',
|
|
45
46
|
} = window;
|
|
46
|
-
|
|
47
|
+
let token = sessionStorage.getItem('cms_token');
|
|
47
48
|
const searchParams = new URLSearchParams(location.search);
|
|
48
49
|
const ssoToken = searchParams.get('sso_token') || searchParams.get('access_token');
|
|
49
50
|
if (!cmsConfig.backend?.base_url) {
|
|
50
|
-
if (!
|
|
51
|
+
if (!token && !ssoToken && CMS_SSO_URL) {
|
|
51
52
|
const url = new URL(CMS_SSO_URL);
|
|
52
53
|
url.searchParams.set('sso_store_id', `${ECOM_STORE_ID}`);
|
|
53
54
|
url.searchParams.set('sso_redirect', location.href);
|
|
@@ -72,9 +73,32 @@ const initCmsAuth = () => {
|
|
|
72
73
|
},
|
|
73
74
|
...cmsConfig.backend,
|
|
74
75
|
};
|
|
76
|
+
if (cmsConfig.backend.api_root?.startsWith('https://ecomplus.app/')) {
|
|
77
|
+
const res = await afetch('https://ecomplus.app/api/github-installation', {
|
|
78
|
+
headers: {
|
|
79
|
+
'X-Store-ID': `${ECOM_STORE_ID}`,
|
|
80
|
+
Authorization: `Bearer ${ssoToken}`,
|
|
81
|
+
},
|
|
82
|
+
});
|
|
83
|
+
if (res.ok) {
|
|
84
|
+
const { installations } = await res.json();
|
|
85
|
+
if (Array.isArray(installations)) {
|
|
86
|
+
const { repo } = cmsConfig.backend;
|
|
87
|
+
const installation = repo !== '_owner/_name'
|
|
88
|
+
? installations.find(({ repository }) => repository === repo)
|
|
89
|
+
: installations[0];
|
|
90
|
+
if (installation?.gh_token && installation.gh_token.charAt(0) !== '*') {
|
|
91
|
+
// Consume GitHub REST API directly
|
|
92
|
+
token = installation.gh_token;
|
|
93
|
+
delete cmsConfig.backend.api_root;
|
|
94
|
+
cmsConfig.backend.name = 'github';
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
}
|
|
75
99
|
}
|
|
76
|
-
if (
|
|
77
|
-
initCmsWithPreview();
|
|
100
|
+
if (token) {
|
|
101
|
+
if (!window.opener) initCmsWithPreview();
|
|
78
102
|
// Ref.: https://github.com/decaporg/decap-cms/blob/e93c94f1ce707719dfb7750af82b17c38b461831/packages/decap-cms-lib-auth/src/netlify-auth.js#L46
|
|
79
103
|
// E.g.: https://github.com/Herohtar/netlify-cms-oauth-firebase/blob/master/functions/index.js#L9-L25
|
|
80
104
|
const self = window.opener || window;
|
|
@@ -82,7 +106,7 @@ const initCmsAuth = () => {
|
|
|
82
106
|
self.postMessage('authorizing:github', '*');
|
|
83
107
|
self.postMessage(
|
|
84
108
|
`authorization:github:success:${JSON.stringify({
|
|
85
|
-
|
|
109
|
+
token,
|
|
86
110
|
provider: cmsConfig.backend.name,
|
|
87
111
|
})}`,
|
|
88
112
|
cmsConfig.backend.base_url,
|
|
@@ -112,6 +136,6 @@ if (!import.meta.env.SSR) {
|
|
|
112
136
|
(window as any).CMS_MANUAL_INIT = true;
|
|
113
137
|
const cmsScript = document.createElement('script');
|
|
114
138
|
cmsScript.src = 'https://unpkg.com/decap-cms@^3.0.0/dist/decap-cms.js';
|
|
115
|
-
cmsScript.onload =
|
|
139
|
+
cmsScript.onload = authAndInitCms;
|
|
116
140
|
document.body.appendChild(cmsScript);
|
|
117
141
|
}
|
package/pnpm-workspace.yaml
CHANGED