qumra-engine 2.0.66 → 2.0.68
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.
|
@@ -18,7 +18,6 @@ const prepareDataMiddleware = (req, res, next) => {
|
|
|
18
18
|
//{ themeVersionId: req.session.themeId }
|
|
19
19
|
let themePath = "";
|
|
20
20
|
const params = new URLSearchParams();
|
|
21
|
-
console.log("🚀 ~ prepareDataMiddleware ~ req.session:", req.session);
|
|
22
21
|
if (req.session?.theme) {
|
|
23
22
|
params.set("theme", req.session.theme);
|
|
24
23
|
}
|
|
@@ -32,7 +31,6 @@ const prepareDataMiddleware = (req, res, next) => {
|
|
|
32
31
|
params.set("themeWidget", String(res.locals.themeWidget));
|
|
33
32
|
}
|
|
34
33
|
themePath = params.toString() ? `?${params.toString()}` : "";
|
|
35
|
-
console.log("🚀 ~ prepareDataMiddleware ~ themePath:", themePath);
|
|
36
34
|
let api = "";
|
|
37
35
|
if (res.locals.preview && res.locals.themeWidget) {
|
|
38
36
|
api = `https://store-gate.qumra.cloud/render/preview-widget${themePath}`;
|
|
@@ -55,6 +53,22 @@ const prepareDataMiddleware = (req, res, next) => {
|
|
|
55
53
|
.then((engineResponse) => {
|
|
56
54
|
// axios لا يستخدم .ok ولا .json()
|
|
57
55
|
// البيانات موجودة مباشرة في engineResponse.data
|
|
56
|
+
const data = engineResponse.data?.data;
|
|
57
|
+
if (!res.locals.isIframe) {
|
|
58
|
+
const backendUrl = data.globals?.app?.url;
|
|
59
|
+
const expectedHost = typeof backendUrl === "string"
|
|
60
|
+
? new URL(backendUrl).host
|
|
61
|
+
: backendUrl?.host;
|
|
62
|
+
console.log("🚀 ~ prepareDataMiddleware ~ expectedHost:", expectedHost);
|
|
63
|
+
console.log("🚀 ~ prepareDataMiddleware ~ data.globals?.app.url:", data.globals?.app.url);
|
|
64
|
+
console.log("🚀 ~ prepareDataMiddleware ~ data.globals?.app.url:", parsedUrl);
|
|
65
|
+
console.log("🚀 ~ prepareDataMiddleware ~ parsedUrl.host:", parsedUrl.host);
|
|
66
|
+
if (parsedUrl.host !== expectedHost) {
|
|
67
|
+
console.log("🚀 ~ prepareDataMiddleware ~ parsedUrl.host:", parsedUrl.host);
|
|
68
|
+
//redirect to expected host
|
|
69
|
+
return res.redirect(301, `${data.globals?.app?.url}${parsedUrl.pathname}`);
|
|
70
|
+
}
|
|
71
|
+
}
|
|
58
72
|
res.locals.render = engineResponse.data?.data;
|
|
59
73
|
next();
|
|
60
74
|
})
|
package/dist/middleware.js
CHANGED
|
@@ -31,6 +31,7 @@ const startEngine = async ({ mode, getRender, setRender, port = 3000, themesRepo
|
|
|
31
31
|
const isIframe = req.query.iframe === "1" || req.headers["sec-fetch-dest"] === "iframe";
|
|
32
32
|
if (isIframe) {
|
|
33
33
|
console.log("🚀 هذا الطلب جاي من iframe");
|
|
34
|
+
res.locals.isIframe = true;
|
|
34
35
|
}
|
|
35
36
|
next();
|
|
36
37
|
});
|