@paroicms/server 1.58.2 → 1.59.0
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/dist/context.d.ts
CHANGED
|
@@ -8,6 +8,7 @@ export declare const appConf: import("@paroicms/connector").AppConf;
|
|
|
8
8
|
export declare const platformLog: import("@paroicms/internal-server-lib").PlatformLog;
|
|
9
9
|
export declare const thumbRealSize: ImageSize;
|
|
10
10
|
export declare let siteConfs: Map<string, SiteConf>;
|
|
11
|
+
export declare const httpRedirections: import("@paroicms/connector/typeonly/configuration-types").JsonOfHttpRedirection[];
|
|
11
12
|
export declare function initCommonSchemaLib(val: CommonSchemaLibrary): void;
|
|
12
13
|
export declare function getCommonSchemaLib(): CommonSchemaLibrary;
|
|
13
14
|
export declare const jwtSecret: string;
|
package/dist/context.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var _a;
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.simpleI18n = exports.platformAuthUrl = exports.platformJwtSecret = exports.jwtExpiresIn = exports.jwtSecret = exports.siteConfs = exports.thumbRealSize = exports.platformLog = exports.appConf = exports.appName = exports.appVersion = exports.packageDir = exports.dbAnyLanguage = void 0;
|
|
4
|
+
exports.simpleI18n = exports.platformAuthUrl = exports.platformJwtSecret = exports.jwtExpiresIn = exports.jwtSecret = exports.httpRedirections = exports.siteConfs = exports.thumbRealSize = exports.platformLog = exports.appConf = exports.appName = exports.appVersion = exports.packageDir = exports.dbAnyLanguage = void 0;
|
|
5
5
|
exports.initCommonSchemaLib = initCommonSchemaLib;
|
|
6
6
|
exports.getCommonSchemaLib = getCommonSchemaLib;
|
|
7
7
|
exports.initializeContext = initializeContext;
|
|
@@ -20,6 +20,7 @@ exports.platformLog = (0, internal_server_lib_1.createPlatformLog)({
|
|
|
20
20
|
reportMessage: true,
|
|
21
21
|
});
|
|
22
22
|
exports.thumbRealSize = "x200x";
|
|
23
|
+
exports.httpRedirections = [...(exports.appConf.httpRedirections ?? [])];
|
|
23
24
|
let commonSchemaLib;
|
|
24
25
|
function initCommonSchemaLib(val) {
|
|
25
26
|
commonSchemaLib = val;
|
|
@@ -53,5 +54,27 @@ async function initializeContext(siteConfsVal) {
|
|
|
53
54
|
languages: connector_1.supportedLanguages,
|
|
54
55
|
appLog: exports.platformLog,
|
|
55
56
|
});
|
|
57
|
+
for (const siteConf of exports.siteConfs.values()) {
|
|
58
|
+
if (!siteConf.redirectWww)
|
|
59
|
+
continue;
|
|
60
|
+
const tokens = siteConf.fqdn.split(".");
|
|
61
|
+
if (tokens.length < 2 || tokens[tokens.length - 1] === "localhost")
|
|
62
|
+
continue;
|
|
63
|
+
if (tokens.length === 2) {
|
|
64
|
+
exports.httpRedirections.push({
|
|
65
|
+
fromFqdn: `www.${siteConf.fqdn}`,
|
|
66
|
+
toFqdn: siteConf.fqdn,
|
|
67
|
+
toProtocol: exports.appConf.publicProtocol,
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
else if (tokens.length === 3 && siteConf.fqdn.startsWith("www.")) {
|
|
71
|
+
exports.httpRedirections.push({
|
|
72
|
+
fromFqdn: siteConf.fqdn.substring(4),
|
|
73
|
+
toFqdn: siteConf.fqdn,
|
|
74
|
+
toProtocol: exports.appConf.publicProtocol,
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
exports.platformLog.debug(`Added redirection from www.${siteConf.fqdn} to ${siteConf.fqdn}`);
|
|
78
|
+
}
|
|
56
79
|
}
|
|
57
80
|
//# sourceMappingURL=context.js.map
|
package/dist/context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,12 +12,15 @@ const internal_server_lib_1 = require("@paroicms/internal-server-lib");
|
|
|
12
12
|
const serve_text_or_1 = require("../../common/serve-text-or");
|
|
13
13
|
const text_cache_1 = require("../../common/text-cache");
|
|
14
14
|
const tracker_report_1 = require("../../common/tracker-report");
|
|
15
|
+
const context_1 = require("../../context");
|
|
15
16
|
const http_helpers_1 = require("../../express/http-helpers");
|
|
16
17
|
const site_context_1 = require("../../site-context/site-context");
|
|
17
18
|
const public_route_parser_1 = require("./public-route/public-route-parser");
|
|
18
19
|
const serve_document_1 = require("./serve-document/serve-document");
|
|
19
20
|
let PublicSiteMiddleware = class PublicSiteMiddleware {
|
|
20
21
|
async use(req, res, next) {
|
|
22
|
+
if (answerHttpRedirect(req, res))
|
|
23
|
+
return;
|
|
21
24
|
if (req.url.startsWith("/auth")) {
|
|
22
25
|
next();
|
|
23
26
|
return;
|
|
@@ -65,4 +68,14 @@ async function serveDocument(siteContext, req, res, parsedRoute, tracker) {
|
|
|
65
68
|
}
|
|
66
69
|
await serveOr.putInCacheAndServe(generated.html, generated.dependencyKeys);
|
|
67
70
|
}
|
|
71
|
+
function answerHttpRedirect(req, res) {
|
|
72
|
+
for (const entry of context_1.httpRedirections) {
|
|
73
|
+
if (entry.fromFqdn === req.hostname) {
|
|
74
|
+
const redirectUrl = `${entry.toProtocol ?? req.protocol}://${entry.toFqdn}${req.originalUrl}`;
|
|
75
|
+
res.redirect(301, redirectUrl);
|
|
76
|
+
return true;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
return false;
|
|
80
|
+
}
|
|
68
81
|
//# sourceMappingURL=public-site.middleware.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public-site.middleware.js","sourceRoot":"","sources":["../../../src/modules/public-site/public-site.middleware.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAiE;AACjE,uEAA4E;AAE5E,8DAAiF;AACjF,wDAAuD;AACvD,gEAAqE;AACrE,6DAA8D;AAC9D,kEAAiE;AAEjE,4EAA8F;AAC9F,oEAAuE;AAGhE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,KAAK,CAAC,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;QACvD,IAAI,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,IAAI,EAAE,CAAC;YACP,OAAO;QACT,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvD,MAAM,WAAW,GAAG,IAAA,sCAAgB,EAAC,WAAW,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;QAC3D,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,IAAI,EAAE,CAAC;YACP,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,IAAA,mCAAa,GAAE,CAAC;QAChC,MAAM,aAAa,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACjE,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,IAAA,uCAAsB,EAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAC5F,CAAC;CACF,CAAA;
|
|
1
|
+
{"version":3,"file":"public-site.middleware.js","sourceRoot":"","sources":["../../../src/modules/public-site/public-site.middleware.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@paroicms/server",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.59.0",
|
|
4
4
|
"description": "The ParoiCMS server",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cms",
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
"@paroicms/server-image-cache-engine": "1.14.6",
|
|
53
53
|
"@paroicms/internal-server-lib": "1.8.7",
|
|
54
54
|
"@paroicms/server-text-cache-system": "1.8.7",
|
|
55
|
-
"@paroicms/connector": "0.
|
|
55
|
+
"@paroicms/connector": "0.13.0",
|
|
56
56
|
"@types/express": "*",
|
|
57
57
|
"bcrypt": "~5.1.1",
|
|
58
58
|
"class-transformer": "~0.5.1",
|