@paroicms/server 1.59.0 → 1.59.2

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,7 +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
+ export declare const httpRedirections: Map<string, import("@paroicms/connector/typeonly/configuration-types").JsonOfHttpRedirection>;
12
12
  export declare function initCommonSchemaLib(val: CommonSchemaLibrary): void;
13
13
  export declare function getCommonSchemaLib(): CommonSchemaLibrary;
14
14
  export declare const jwtSecret: string;
package/dist/context.js CHANGED
@@ -20,7 +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
+ exports.httpRedirections = new Map((exports.appConf.httpRedirections ?? []).map((item) => [item.fromFqdn, item]));
24
24
  let commonSchemaLib;
25
25
  function initCommonSchemaLib(val) {
26
26
  commonSchemaLib = val;
@@ -45,7 +45,12 @@ exports.platformJwtSecret = exports.appConf.googleAuth
45
45
  ? (0, internal_server_lib_1.getJwtSecretSync)((0, node_path_1.join)(platformDataDir, "jwt-secret-pl.txt"))
46
46
  : undefined;
47
47
  exports.platformAuthUrl = exports.appConf.googleAuth && !exports.appConf.googleAuth.disabled
48
- ? `${exports.appConf.publicProtocol}://${exports.appConf.googleAuth.fqdn}${exports.appConf.publicPort === 80 ? "" : `:${exports.appConf.publicPort}`}/auth`
48
+ ? (0, public_server_lib_1.makeUrl)({
49
+ protocol: exports.appConf.publicProtocol,
50
+ fqdn: exports.appConf.googleAuth.fqdn,
51
+ port: exports.appConf.publicPort,
52
+ path: "/auth",
53
+ })
49
54
  : undefined;
50
55
  async function initializeContext(siteConfsVal) {
51
56
  exports.siteConfs = siteConfsVal;
@@ -60,21 +65,27 @@ async function initializeContext(siteConfsVal) {
60
65
  const tokens = siteConf.fqdn.split(".");
61
66
  if (tokens.length < 2 || tokens[tokens.length - 1] === "localhost")
62
67
  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}`);
68
+ const fromFqdn = tokens.length === 2
69
+ ? `www.${siteConf.fqdn}`
70
+ : tokens.length === 3 && siteConf.fqdn.startsWith("www.")
71
+ ? siteConf.fqdn.substring(4)
72
+ : undefined;
73
+ if (!fromFqdn || exports.httpRedirections.has(fromFqdn))
74
+ continue;
75
+ exports.httpRedirections.set(fromFqdn, {
76
+ fromFqdn,
77
+ to: (0, public_server_lib_1.makeUrl)({
78
+ protocol: exports.appConf.publicProtocol,
79
+ fqdn: siteConf.fqdn,
80
+ port: exports.appConf.publicPort,
81
+ }),
82
+ });
83
+ }
84
+ if (exports.httpRedirections.size > 0) {
85
+ exports.platformLog.info(`HTTP 301 redirections:\n - ${Array.from(exports.httpRedirections.values())
86
+ .sort((a, b) => a.fromFqdn.localeCompare(b.fromFqdn))
87
+ .map((entry) => `${entry.fromFqdn} → ${entry.to}`)
88
+ .join("\n - ")}`);
78
89
  }
79
90
  }
80
91
  //# sourceMappingURL=context.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"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"}
@@ -3,4 +3,4 @@ import type { SiteContext } from "../../../site-context/site-context.types";
3
3
  export declare function injectHeadTagsLiquidJsFilter(rawDocValues: any, { ctx, siteContext }: {
4
4
  ctx: Context;
5
5
  siteContext: SiteContext;
6
- }): "" | Promise<string>;
6
+ }): Promise<string> | "";
@@ -5,5 +5,5 @@ import type { SiteContext } from "../../../site-context/site-context.types";
5
5
  export declare function injectOpenGraphTagsLiquidJsFilter(values: unknown, { ctx, siteContext }: {
6
6
  ctx: Context;
7
7
  siteContext: SiteContext;
8
- }): "" | Promise<string>;
8
+ }): Promise<string> | "";
9
9
  export declare function generateOpenGraphTags(siteContext: SiteContext, renderingContext: RenderingContext, { description, title, imageUid, url, type, siteName, locale }: Partial<OgValues>): Promise<string>;
@@ -52,9 +52,9 @@ let OAuth2ClientController = class OAuth2ClientController {
52
52
  const siteConf = context_1.siteConfs.get(redirectTo);
53
53
  if (!siteConf)
54
54
  throw new common_1.BadRequestException("Site not found");
55
- return (0, public_server_lib_1.getBoUrl)({
56
- publicProtocol: context_1.appConf.publicProtocol,
57
- boPort: context_1.appConf.boPort,
55
+ return (0, public_server_lib_1.makeUrl)({
56
+ protocol: context_1.appConf.publicProtocol,
57
+ port: context_1.appConf.boPort,
58
58
  fqdn: siteConf.fqdn,
59
59
  });
60
60
  }
@@ -1 +1 @@
1
- {"version":3,"file":"oauth2-client.controller.js","sourceRoot":"","sources":["../../../src/modules/public-site/oauth2-client.controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"oauth2-client.controller.js","sourceRoot":"","sources":["../../../src/modules/public-site/oauth2-client.controller.ts"],"names":[],"mappings":"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"}
@@ -34,7 +34,7 @@ async function getUrlOfDocument(siteContext, tracker, documentId, options = {})
34
34
  throw new Error(`invalid url data for document "${language}:${leafId}"`);
35
35
  }
36
36
  const urlData = formatUrlData(row, depth);
37
- url = makeUrl(siteContext, urlData, language);
37
+ url = makeDocumentUrl(siteContext, urlData, language);
38
38
  dependencyKeys = makeUrlDependencyKeys(urlData, language);
39
39
  }
40
40
  await siteContext.textCache.setCacheValue({
@@ -99,7 +99,7 @@ function formatUrlData(row, depth) {
99
99
  function getHomeUrl(siteContext, language) {
100
100
  return siteContext.siteSchema.isMultilingual ? `/${language}` : "/";
101
101
  }
102
- function makeUrl(siteContext, urlData, language) {
102
+ function makeDocumentUrl(siteContext, urlData, language) {
103
103
  const { siteSchema } = siteContext;
104
104
  const urlParts = siteSchema.isMultilingual ? [language] : [];
105
105
  let parent = (0, internal_anywhere_lib_1.getDocumentTypeByName)(siteSchema, "home");
@@ -1 +1 @@
1
- {"version":3,"file":"make-url.js","sourceRoot":"","sources":["../../../../src/modules/public-site/public-route/make-url.ts"],"names":[],"mappings":";;AAiCA,4CA+CC;AA0ED,gCAEC;AA5JD,oEAAsF;AACtF,mDAAuD;AACvD,2EAAwE;AAGxE,2DAAkF;AAElF,+DAA4D;AA0BrD,KAAK,UAAU,gBAAgB,CACpC,WAAwB,EACxB,OAAgB,EAChB,UAA2B,EAC3B,UAAiD,EAAE;IAEnD,MAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,WAAW,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;IAChF,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAChF,IAAI,UAAU,EAAE,CAAC;QACf,IAAI,CAAC,OAAO,CAAC,uBAAuB;YAAE,OAAO,UAAU,CAAC,KAAK,CAAC;QAC9D,OAAO;YACL,GAAG,EAAE,UAAU,CAAC,KAAK;YACrB,cAAc,EAAE,MAAM,WAAW,CAAC,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,OAAO,CAAC;SACjF,CAAC;IACJ,CAAC;IAED,IAAI,cAAwB,CAAC;IAC7B,IAAI,GAAW,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC;IAExC,MAAM,KAAK,GAAG,MAAM,IAAA,2BAAY,EAAC,WAAW,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/D,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;QAChB,GAAG,GAAG,UAAU,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QACxC,cAAc,GAAG,EAAE,CAAC;IACtB,CAAC;SAAM,CAAC;QACN,MAAM,KAAK,GAAG,aAAa,CAAC,WAAW,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QAC5D,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,KAAK,CAAC,UAAU,EAAO,CAAC;QAC5C,OAAO,CAAC,WAAW,CAAC,4BAAgB,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QACxD,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,IAAI,KAAK,CAAC,kCAAkC,QAAQ,IAAI,MAAM,GAAG,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC1C,GAAG,GAAG,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC9C,cAAc,GAAG,qBAAqB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CACvC;QACE,QAAQ;QACR,KAAK,EAAE,GAAG;QACV,cAAc;KACf,EACD,OAAO,CACR,CAAC;IAEF,OAAO,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;AACzE,CAAC;AAED,SAAS,aAAa,CAAC,WAAwB,EAAE,SAA0B,EAAE,KAAa;IACxF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;IAEvC,IAAI,GAAG,GAAG,KAAK,CAAC;IAChB,MAAM,KAAK,GAAG,WAAW,CAAC,EAAE;SACzB,kBAAkB,EAAE;SACpB,SAAS,CAAC,IAAI,GAAG,KAAK,EAAE,KAAK,GAAG,EAAE,CAAC;SACnC,SAAS,CAAC,IAAI,GAAG,WAAW,EAAE,WAAW,GAAG,EAAE,CAAC;SAC/C,SAAS,CAAC,IAAI,GAAG,aAAa,EAAE,aAAa,GAAG,EAAE,CAAC;SACnD,SAAS,CAAC,IAAI,GAAG,cAAc,EAAE,cAAc,GAAG,EAAE,CAAC;SACrD,SAAS,CAAC,IAAI,GAAG,OAAO,EAAE,OAAO,GAAG,EAAE,CAAC;SACvC,IAAI,CAAC,QAAQ,EAAE,IAAI,GAAG,EAAE,CAAC;SACzB,SAAS,CAAC,WAAW,EAAE,IAAI,GAAG,EAAE,EAAE,IAAI,GAAG,cAAc,GAAG,YAAY,GAAG,mBAAmB,EAAE;QAC7F,QAAQ;KACT,CAAC;SACD,QAAQ,CACP,YAAY,EACZ,IAAI,GAAG,EAAE,EACT,IAAI,GAAG,cAAc,GAAG,gBAAgB,GAAG,YAAY,GAAG,OAAO,CAClE;SACA,QAAQ,CAAC,IAAI,GAAG,eAAe,EAAE,EAAE,MAAM,EAAE,CAAC;SAC5C,QAAQ,CAAC,IAAI,GAAG,0BAA0B,CAAC,CAAC;IAE/C,IAAI,IAAI,GAAG,GAAG,CAAC;IACf,OAAO,IAAI,GAAG,CAAC,EAAE,CAAC;QAChB,GAAG,GAAG,IAAI,GAAG,CAAC,CAAC;QACf,KAAK;aACF,SAAS,CAAC,IAAI,GAAG,KAAK,EAAE,KAAK,GAAG,EAAE,CAAC;aACnC,SAAS,CAAC,IAAI,GAAG,WAAW,EAAE,WAAW,GAAG,EAAE,CAAC;aAC/C,SAAS,CAAC,IAAI,GAAG,aAAa,EAAE,aAAa,GAAG,EAAE,CAAC;aACnD,SAAS,CAAC,IAAI,GAAG,cAAc,EAAE,cAAc,GAAG,EAAE,CAAC;aACrD,SAAS,CAAC,IAAI,GAAG,OAAO,EAAE,OAAO,GAAG,EAAE,CAAC;aACvC,SAAS,CAAC,QAAQ,EAAE,IAAI,GAAG,EAAE,EAAE,IAAI,GAAG,UAAU,IAAI,WAAW,CAAC;aAChE,SAAS,CACR,WAAW,EACX,IAAI,GAAG,EAAE,EACT,IAAI,GAAG,cAAc,GAAG,YAAY,GAAG,mBAAmB,EAC1D;YACE,QAAQ;SACT,CACF;aACA,QAAQ,CACP,YAAY,EACZ,IAAI,GAAG,EAAE,EACT,IAAI,GAAG,cAAc,GAAG,gBAAgB,GAAG,YAAY,GAAG,OAAO,CAClE;aACA,QAAQ,CAAC,IAAI,GAAG,0BAA0B,CAAC,CAAC;QAE/C,IAAI,GAAG,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAI,IAAI,yBAAyB,EAAE;QAChD,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM;KAC/C,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,aAAa,CAAC,GAAQ,EAAE,KAAa;IAC5C,MAAM,KAAK,GAAG,IAAI,GAAG,EAAuB,CAAC;IAC7C,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC;QACtC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE;YACb,MAAM,EAAE,IAAA,4BAAM,EAAC,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;YAC/B,QAAQ,EAAE,IAAA,4BAAM,EAAC,GAAG,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC;YACvC,UAAU,EAAE,IAAA,4BAAM,EAAC,GAAG,CAAC,aAAa,GAAG,EAAE,CAAC,CAAC;YAC3C,IAAI,EAAE,IAAA,mCAAa,EAAC,GAAG,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;YACtC,WAAW,EAAE,IAAA,6BAAO,EAAC,GAAG,CAAC,cAAc,GAAG,EAAE,CAAC,CAAC;SAC/C,CAAC,CAAC;IACL,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;AAC1B,CAAC;AAED,SAAgB,UAAU,CAAC,WAA4C,EAAE,QAAgB;IACvF,OAAO,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;AACtE,CAAC;AAED,SAAS,OAAO,CACd,WAA4C,EAC5C,OAAgB,EAChB,QAAgB;IAEhB,MAAM,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC;IACnC,MAAM,QAAQ,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7D,IAAI,MAAM,GAAG,IAAA,6CAAqB,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAEvD,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,OAAO,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC;QAC9C,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,GAAG,GAAG,CAAC,CAAC;QAClE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC9C,MAAM,IAAI,KAAK,CACb,4CAA4C,IAAI,CAAC,QAAQ,+BAA+B,MAAM,CAAC,QAAQ,GAAG,CAC3G,CAAC;QACJ,CAAC;QACD,MAAM,OAAO,GAAG,IAAA,6CAAqB,EAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEjE,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;YAC3B,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC;YAC1C,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,MAAM,IAAI,KAAK,CAAC,oBAAoB,QAAQ,wBAAwB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YAC3F,CAAC;YACD,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,IAAI,OAAO,CAAC,KAAK,KAAK,mBAAmB,EAAE,CAAC;gBAC1C,QAAQ,CAAC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC,CAAC;YACjD,CAAC;iBAAM,IAAI,OAAO,CAAC,KAAK,KAAK,iCAAiC,EAAE,CAAC;gBAC/D,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;gBAE7B,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;gBAClE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;gBACnE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;gBAC9D,QAAQ,CAAC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC,CAAC;YACjD,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,OAAO,OAAO,CAAC,QAAQ,gCAAgC,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC;YAC3F,CAAC;QACH,CAAC;QAED,MAAM,GAAG,OAAO,CAAC;IACnB,CAAC;IACD,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;AAClC,CAAC;AAED,SAAS,yBAAyB,CAAC,IAAiB;IAClD,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC;AACzE,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAgB,EAAE,QAAgB;IAC/D,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACrD,IAAA,mCAAsB,EAAC;QACrB,UAAU,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE;QAC7C,SAAS,EAAE,MAAM;KAClB,CAAC,CACH,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"make-url.js","sourceRoot":"","sources":["../../../../src/modules/public-site/public-route/make-url.ts"],"names":[],"mappings":"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"}
@@ -69,13 +69,11 @@ async function serveDocument(siteContext, req, res, parsedRoute, tracker) {
69
69
  await serveOr.putInCacheAndServe(generated.html, generated.dependencyKeys);
70
70
  }
71
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;
72
+ const entry = context_1.httpRedirections.get(req.hostname);
73
+ if (!entry)
74
+ return false;
75
+ const redirectUrl = `${entry.to}${req.originalUrl}`;
76
+ res.redirect(301, redirectUrl);
77
+ return true;
80
78
  }
81
79
  //# 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":"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"}
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.59.0",
3
+ "version": "1.59.2",
4
4
  "description": "The ParoiCMS server",
5
5
  "keywords": [
6
6
  "cms",
@@ -44,15 +44,15 @@
44
44
  "@nestjs/platform-express": "~10.3.10",
45
45
  "@nestjs/throttler": "~6.1.0",
46
46
  "@paroi/data-formatters-lib": "~0.4.0",
47
- "@paroicms/internal-anywhere-lib": "1.18.8",
48
- "@paroicms/bo": "1.45.1",
49
- "@paroicms/public-anywhere-lib": "0.8.2",
50
- "@paroicms/public-server-lib": "0.16.2",
51
- "@paroicms/server-database-media-storage": "1.9.7",
52
- "@paroicms/server-image-cache-engine": "1.14.6",
53
- "@paroicms/internal-server-lib": "1.8.7",
54
- "@paroicms/server-text-cache-system": "1.8.7",
55
- "@paroicms/connector": "0.13.0",
47
+ "@paroicms/internal-anywhere-lib": "1.18.9",
48
+ "@paroicms/bo": "1.45.2",
49
+ "@paroicms/public-anywhere-lib": "0.8.3",
50
+ "@paroicms/public-server-lib": "0.16.4",
51
+ "@paroicms/server-database-media-storage": "1.9.9",
52
+ "@paroicms/server-image-cache-engine": "1.14.8",
53
+ "@paroicms/internal-server-lib": "1.8.9",
54
+ "@paroicms/server-text-cache-system": "1.8.9",
55
+ "@paroicms/connector": "0.13.2",
56
56
  "@types/express": "*",
57
57
  "bcrypt": "~5.1.1",
58
58
  "class-transformer": "~0.5.1",
@@ -81,7 +81,7 @@
81
81
  "pino-pretty": "~11.2.2",
82
82
  "rimraf": "~6.0.1",
83
83
  "source-map-support": "~0.5.21",
84
- "typescript": "~5.5.4",
84
+ "typescript": "~5.6.3",
85
85
  "vitest": "~2.0.5"
86
86
  },
87
87
  "peerDependencies": {