@paroicms/server 1.11.0 → 1.12.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/README.md +6 -2
- package/ddl/main.ddl.sql +2 -2
- package/dist/common/serve-html-or.d.ts +3 -3
- package/dist/common/serve-html-or.js +28 -24
- package/dist/common/serve-html-or.js.map +1 -1
- package/dist/express/http-helpers.d.ts +7 -4
- package/dist/express/http-helpers.js +40 -22
- package/dist/express/http-helpers.js.map +1 -1
- package/dist/helpers/url.helpers.d.ts +31 -0
- package/dist/helpers/url.helpers.js +31 -1
- package/dist/helpers/url.helpers.js.map +1 -1
- package/dist/helpers/utils-helper.d.ts +1 -2
- package/dist/helpers/utils-helper.js +6 -14
- package/dist/helpers/utils-helper.js.map +1 -1
- package/dist/liquidjs-tools/liquidjs-rendering/rendering-context.js +1 -1
- package/dist/liquidjs-tools/liquidjs-rendering/rendering-context.js.map +1 -1
- package/dist/modules/app.controller.js +12 -8
- package/dist/modules/app.controller.js.map +1 -1
- package/dist/modules/core/account/account.resolver.d.ts +1 -1
- package/dist/modules/core/account/account.resolver.js +2 -2
- package/dist/modules/core/account/account.resolver.js.map +1 -1
- package/dist/modules/core/document/document.resolver.d.ts +1 -1
- package/dist/modules/core/document/document.resolver.js +1 -1
- package/dist/modules/core/document/document.resolver.js.map +1 -1
- package/dist/modules/core/media/media-upload.controller.js +18 -4
- package/dist/modules/core/media/media-upload.controller.js.map +1 -1
- package/dist/modules/core/media/media.d.ts +10 -13
- package/dist/modules/core/media/media.js +15 -19
- package/dist/modules/core/media/media.js.map +1 -1
- package/dist/modules/core/media/media.resolver.d.ts +1 -1
- package/dist/modules/core/media/media.resolver.js +14 -4
- package/dist/modules/core/media/media.resolver.js.map +1 -1
- package/dist/modules/core/unprotected/unprotected.resolver.js +4 -1
- package/dist/modules/core/unprotected/unprotected.resolver.js.map +1 -1
- package/dist/modules/public-api/mail/contact-form-mail.d.ts +1 -1
- package/dist/modules/public-api/mail/contact-form-mail.js.map +1 -1
- package/dist/modules/public-api/password-reset/password-reset.controller.d.ts +1 -1
- package/dist/modules/public-api/password-reset/password-reset.controller.js +1 -1
- package/dist/modules/public-api/password-reset/password-reset.controller.js.map +1 -1
- package/dist/modules/public-api/password-reset/password-reset.service.d.ts +1 -1
- package/dist/modules/public-api/password-reset/password-reset.service.js.map +1 -1
- package/dist/modules/public-api/public-api-controller.d.ts +3 -3
- package/dist/modules/public-api/public-api-controller.js +6 -6
- package/dist/modules/public-api/public-api-controller.js.map +1 -1
- package/dist/modules/public-site/media-serve/_media-serve-helpers.d.ts +5 -11
- package/dist/modules/public-site/media-serve/_media-serve-helpers.js +14 -21
- package/dist/modules/public-site/media-serve/_media-serve-helpers.js.map +1 -1
- package/dist/modules/public-site/media-serve/media-serve.controller.d.ts +3 -1
- package/dist/modules/public-site/media-serve/media-serve.controller.js +139 -57
- package/dist/modules/public-site/media-serve/media-serve.controller.js.map +1 -1
- package/dist/modules/public-site/public-site.controller.js +1 -1
- package/dist/modules/public-site/public-site.middleware.js +3 -5
- package/dist/modules/public-site/public-site.middleware.js.map +1 -1
- package/dist/modules/security/complexity-plugin.d.ts +1 -1
- package/dist/modules/security/complexity-plugin.js +1 -1
- package/dist/modules/security/complexity-plugin.js.map +1 -1
- package/dist/public-payload/make-image-available.d.ts +1 -1
- package/dist/public-payload/make-image-available.js +14 -8
- package/dist/public-payload/make-image-available.js.map +1 -1
- package/dist/site-context/create-site-context.js +7 -7
- package/dist/site-context/create-site-context.js.map +1 -1
- package/dist/site-context/db-init/db-init.d.ts +2 -1
- package/dist/site-context/db-init/db-init.js +3 -3
- package/dist/site-context/db-init/db-init.js.map +1 -1
- package/dist/site-context/db-init/ddl-migration.d.ts +4 -2
- package/dist/site-context/db-init/ddl-migration.js +62 -3
- package/dist/site-context/db-init/ddl-migration.js.map +1 -1
- package/dist/site-context/site-conf.js +13 -2
- package/dist/site-context/site-conf.js.map +1 -1
- package/dist/types.to.json +1 -1
- package/package.json +9 -9
|
@@ -21,6 +21,8 @@ const server_image_cache_engine_1 = require("@paroicms/server-image-cache-engine
|
|
|
21
21
|
const media_handles_helpers_1 = require("../../../common/media-handles.helpers");
|
|
22
22
|
const text_cache_1 = require("../../../common/text-cache");
|
|
23
23
|
const context_1 = require("../../../context");
|
|
24
|
+
const url_helpers_1 = require("../../../helpers/url.helpers");
|
|
25
|
+
const utils_helper_1 = require("../../../helpers/utils-helper");
|
|
24
26
|
const site_context_1 = require("../../../site-context/site-context");
|
|
25
27
|
const leaf_queries_1 = require("../leaf/leaf.queries");
|
|
26
28
|
const media_1 = require("./media");
|
|
@@ -39,8 +41,12 @@ let UploadMediaController = class UploadMediaController {
|
|
|
39
41
|
const leafSchema = (0, anywhere_lib_1.getLeafSchema)(siteContext.siteSchema, leafType);
|
|
40
42
|
const policyName = leafSchema.mediaPolicy ?? "default";
|
|
41
43
|
const mediaPolicy = siteContext.siteSchema.mediaPolicies[policyName];
|
|
42
|
-
const { buffer: binaryFile, mimetype: mediaType
|
|
43
|
-
const originalName = Buffer.from(file.originalname, "latin1").toString("utf8");
|
|
44
|
+
const { buffer: binaryFile, mimetype: mediaType } = file;
|
|
45
|
+
const originalName = (0, utils_helper_1.removeExtensionFromFileName)(Buffer.from(file.originalname, "latin1").toString("utf8"));
|
|
46
|
+
const weightB = binaryFile.byteLength;
|
|
47
|
+
if (file.size !== weightB) {
|
|
48
|
+
throw new common_1.BadRequestException(`file size mismatch (should be ${weightB}, actual ${file.size})`);
|
|
49
|
+
}
|
|
44
50
|
await checkMediaPolicy(siteContext, {
|
|
45
51
|
mediaPolicy,
|
|
46
52
|
mediaType,
|
|
@@ -79,12 +85,18 @@ let UploadMediaController = class UploadMediaController {
|
|
|
79
85
|
});
|
|
80
86
|
const result = {
|
|
81
87
|
uid: media.uid,
|
|
88
|
+
resourceVersion: media.resourceVersion,
|
|
82
89
|
mediaType: media.mediaType,
|
|
83
90
|
modifiedTs: media.modifiedTs.toISOString(),
|
|
84
91
|
weightB: media.weightB,
|
|
85
92
|
attachedData: media.attachedData,
|
|
86
93
|
originalName: media.originalName,
|
|
87
|
-
url: (0,
|
|
94
|
+
url: (0, url_helpers_1.makeUrlOfMediaFile)(siteContext, {
|
|
95
|
+
mediaUid: media.uid,
|
|
96
|
+
mediaType: media.mediaType,
|
|
97
|
+
originalName: media.originalName,
|
|
98
|
+
absoluteUrl: true,
|
|
99
|
+
}),
|
|
88
100
|
};
|
|
89
101
|
if (!originalImage || media.kind !== "image")
|
|
90
102
|
return result;
|
|
@@ -100,8 +112,10 @@ let UploadMediaController = class UploadMediaController {
|
|
|
100
112
|
},
|
|
101
113
|
variantName: context_1.thumbVariantName,
|
|
102
114
|
autoCrop: true,
|
|
115
|
+
versionedUrl: true,
|
|
103
116
|
absoluteUrl: true,
|
|
104
|
-
|
|
117
|
+
dependsOnUsedKey: "bo",
|
|
118
|
+
slug: (0, server_image_cache_engine_1.generateImageSlug)(media.originalName),
|
|
105
119
|
});
|
|
106
120
|
if (leafSchema.kind === "site") {
|
|
107
121
|
await siteContext.textCache.clearCache();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-upload.controller.js","sourceRoot":"","sources":["../../../../src/modules/core/media/media-upload.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CASwB;AACxB,+DAA2D;AAC3D,oEAA4E;AAC5E,yDAAoG;AAEpG,
|
|
1
|
+
{"version":3,"file":"media-upload.controller.js","sourceRoot":"","sources":["../../../../src/modules/core/media/media-upload.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,22 +1,19 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { type ImageRef, type VariantName } from "@paroicms/server-image-cache-engine";
|
|
3
3
|
import type { SiteContext } from "../../../site-context/site-context.types";
|
|
4
|
-
export
|
|
5
|
-
imageRef: ImageRef;
|
|
6
|
-
variantName: VariantName;
|
|
7
|
-
autoCrop?: boolean;
|
|
8
|
-
absoluteUrl: boolean;
|
|
9
|
-
dependsOnCacheKey: string;
|
|
10
|
-
}): {
|
|
4
|
+
export interface RegisteredImageVariant {
|
|
11
5
|
url: string;
|
|
12
6
|
width: number;
|
|
13
7
|
height: number;
|
|
14
8
|
mediaType: string;
|
|
15
|
-
}
|
|
16
|
-
export declare function
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
9
|
+
}
|
|
10
|
+
export declare function registerImageVariant(siteContext: Pick<SiteContext, "imageCache" | "siteUrl">, { imageRef, variantName, slug, autoCrop, versionedUrl, absoluteUrl, dependsOnUsedKey, }: {
|
|
11
|
+
imageRef: ImageRef;
|
|
12
|
+
variantName: VariantName;
|
|
13
|
+
slug?: string;
|
|
14
|
+
autoCrop?: boolean;
|
|
15
|
+
versionedUrl: boolean;
|
|
20
16
|
absoluteUrl: boolean;
|
|
21
|
-
|
|
17
|
+
dependsOnUsedKey: string;
|
|
18
|
+
}): RegisteredImageVariant;
|
|
22
19
|
export declare function createBoFaviconFrom(siteContext: SiteContext, binaryFile: Buffer): Promise<void>;
|
|
@@ -1,36 +1,32 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createBoFaviconFrom = exports.
|
|
3
|
+
exports.createBoFaviconFrom = exports.registerImageVariant = void 0;
|
|
4
4
|
const server_image_cache_engine_1 = require("@paroicms/server-image-cache-engine");
|
|
5
5
|
const media_handles_helpers_1 = require("../../../common/media-handles.helpers");
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
const url_helpers_1 = require("../../../helpers/url.helpers");
|
|
7
|
+
function registerImageVariant(siteContext, { imageRef, variantName, slug, autoCrop = false, versionedUrl, absoluteUrl, dependsOnUsedKey, }) {
|
|
8
|
+
const { width, height, completeVariantName, mediaType, resourceVersion } = siteContext.imageCache.makeImageAvailable({
|
|
8
9
|
imageRef,
|
|
9
10
|
variantName,
|
|
10
11
|
autoCrop,
|
|
11
|
-
|
|
12
|
+
dependsOnUsedKey,
|
|
13
|
+
slug,
|
|
12
14
|
});
|
|
13
|
-
const prefix = absoluteUrl ? siteContext.siteUrl : "";
|
|
14
15
|
return {
|
|
15
|
-
url:
|
|
16
|
+
url: (0, url_helpers_1.makeUrlOfImageVariant)(siteContext, {
|
|
17
|
+
mediaUid: imageRef.imageUid,
|
|
18
|
+
mediaType,
|
|
19
|
+
completeVariantName,
|
|
20
|
+
resourceVersion: versionedUrl ? resourceVersion : undefined,
|
|
21
|
+
slug,
|
|
22
|
+
absoluteUrl,
|
|
23
|
+
}),
|
|
16
24
|
width,
|
|
17
25
|
height,
|
|
18
|
-
mediaType
|
|
26
|
+
mediaType,
|
|
19
27
|
};
|
|
20
28
|
}
|
|
21
29
|
exports.registerImageVariant = registerImageVariant;
|
|
22
|
-
function makeMediaUrl(siteContext, media, { absoluteUrl }) {
|
|
23
|
-
const prefix = absoluteUrl ? siteContext.siteUrl : "";
|
|
24
|
-
return `${prefix}/medias/${media.uid}.${mediaTypeToFileExtension(media.mediaType)}`;
|
|
25
|
-
}
|
|
26
|
-
exports.makeMediaUrl = makeMediaUrl;
|
|
27
|
-
function mediaTypeToFileExtension(mediaType) {
|
|
28
|
-
const regexMatchArray = mediaType.match(/\w+\/([-+.\w]+)/);
|
|
29
|
-
if (!regexMatchArray) {
|
|
30
|
-
throw new Error("media extension is incorrect.");
|
|
31
|
-
}
|
|
32
|
-
return regexMatchArray[1];
|
|
33
|
-
}
|
|
34
30
|
async function createBoFaviconFrom(siteContext, binaryFile) {
|
|
35
31
|
const result = await (0, server_image_cache_engine_1.createDefaultBoFavicon)(binaryFile);
|
|
36
32
|
await siteContext.mediaStorage.addMedia({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media.js","sourceRoot":"","sources":["../../../../src/modules/core/media/media.ts"],"names":[],"mappings":";;;AAAA,mFAI6C;AAC7C,iFAAiF;
|
|
1
|
+
{"version":3,"file":"media.js","sourceRoot":"","sources":["../../../../src/modules/core/media/media.ts"],"names":[],"mappings":";;;AAAA,mFAI6C;AAC7C,iFAAiF;AACjF,8DAAqE;AAUrE,SAAgB,oBAAoB,CAClC,WAAwD,EACxD,EACE,QAAQ,EACR,WAAW,EACX,IAAI,EACJ,QAAQ,GAAG,KAAK,EAChB,YAAY,EACZ,WAAW,EACX,gBAAgB,GASjB;IAED,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,SAAS,EAAE,eAAe,EAAE,GACtE,WAAW,CAAC,UAAU,CAAC,kBAAkB,CAAC;QACxC,QAAQ;QACR,WAAW;QACX,QAAQ;QACR,gBAAgB;QAChB,IAAI;KACL,CAAC,CAAC;IAEL,OAAO;QACL,GAAG,EAAE,IAAA,mCAAqB,EAAC,WAAW,EAAE;YACtC,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,SAAS;YACT,mBAAmB;YACnB,eAAe,EAAE,YAAY,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS;YAC3D,IAAI;YACJ,WAAW;SACZ,CAAC;QACF,KAAK;QACL,MAAM;QACN,SAAS;KACV,CAAC;AACJ,CAAC;AA1CD,oDA0CC;AAEM,KAAK,UAAU,mBAAmB,CAAC,WAAwB,EAAE,UAAkB;IACpF,MAAM,MAAM,GAAG,MAAM,IAAA,kDAAsB,EAAC,UAAU,CAAC,CAAC;IACxD,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC;QACtC,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,MAAM,EAAE,IAAA,gDAAwB,GAAE;QAClC,KAAK,EAAE,MAAM;YACX,CAAC,CAAC;gBACE,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;aAC1B;YACH,CAAC,CAAC,SAAS;QACb,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,UAAU;KACvC,CAAC,CAAC;AACL,CAAC;AAjBD,kDAiBC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import { ReorderMediasInput, ResizeImageInput, ResizingImage, ThumbImagePropertiesObjectType } from "./media.schema";
|
|
1
2
|
import type { Image, Media } from "@paroicms/server-database-media-storage";
|
|
2
3
|
import type { GraphqlContext } from "../../graphql.types";
|
|
3
|
-
import { ReorderMediasInput, ResizeImageInput, ResizingImage, ThumbImagePropertiesObjectType } from "./media.schema";
|
|
4
4
|
export declare class MediaResolver {
|
|
5
5
|
medias({ fqdn }: GraphqlContext, galleryHandle: string): Promise<(Media | Image)[]>;
|
|
6
6
|
media({ fqdn }: GraphqlContext, handle: string): Promise<Media | Image | undefined>;
|
|
@@ -13,15 +13,16 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.MediaResolver = void 0;
|
|
16
|
+
const media_schema_1 = require("./media.schema");
|
|
16
17
|
const graphql_1 = require("@nestjs/graphql");
|
|
17
18
|
const common_1 = require("@nestjs/common");
|
|
18
19
|
const server_image_cache_engine_1 = require("@paroicms/server-image-cache-engine");
|
|
19
20
|
const media_handles_helpers_1 = require("../../../common/media-handles.helpers");
|
|
20
21
|
const text_cache_1 = require("../../../common/text-cache");
|
|
21
22
|
const context_1 = require("../../../context");
|
|
23
|
+
const url_helpers_1 = require("../../../helpers/url.helpers");
|
|
22
24
|
const site_context_1 = require("../../../site-context/site-context");
|
|
23
25
|
const media_1 = require("./media");
|
|
24
|
-
const media_schema_1 = require("./media.schema");
|
|
25
26
|
let MediaResolver = class MediaResolver {
|
|
26
27
|
async medias({ fqdn }, galleryHandle) {
|
|
27
28
|
const siteContext = await (0, site_context_1.getSiteContext)(fqdn);
|
|
@@ -73,7 +74,12 @@ let MediaResolver = class MediaResolver {
|
|
|
73
74
|
}
|
|
74
75
|
async url({ fqdn }, media) {
|
|
75
76
|
const siteContext = await (0, site_context_1.getSiteContext)(fqdn);
|
|
76
|
-
return (0,
|
|
77
|
+
return (0, url_helpers_1.makeUrlOfMediaFile)(siteContext, {
|
|
78
|
+
absoluteUrl: true,
|
|
79
|
+
mediaUid: media.uid,
|
|
80
|
+
mediaType: media.mediaType,
|
|
81
|
+
originalName: media.originalName,
|
|
82
|
+
});
|
|
77
83
|
}
|
|
78
84
|
async thumbImage({ fqdn }, media) {
|
|
79
85
|
if (media.kind !== "image")
|
|
@@ -88,8 +94,10 @@ let MediaResolver = class MediaResolver {
|
|
|
88
94
|
height: media.height,
|
|
89
95
|
},
|
|
90
96
|
variantName: context_1.thumbVariantName,
|
|
97
|
+
versionedUrl: true,
|
|
91
98
|
absoluteUrl: true,
|
|
92
|
-
|
|
99
|
+
dependsOnUsedKey: "bo",
|
|
100
|
+
slug: (0, server_image_cache_engine_1.generateImageSlug)(media.originalName),
|
|
93
101
|
});
|
|
94
102
|
return {
|
|
95
103
|
url: resized.url,
|
|
@@ -120,8 +128,10 @@ let MediaResolver = class MediaResolver {
|
|
|
120
128
|
mediaType: media.mediaType,
|
|
121
129
|
width: media.width,
|
|
122
130
|
},
|
|
131
|
+
versionedUrl: false,
|
|
123
132
|
absoluteUrl: true,
|
|
124
|
-
|
|
133
|
+
dependsOnUsedKey: "themeConf.fTextImages",
|
|
134
|
+
slug: (0, server_image_cache_engine_1.generateImageSlug)(media.originalName),
|
|
125
135
|
});
|
|
126
136
|
}
|
|
127
137
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/media/media.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"media.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/media/media.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,iDAMwB;AAExB,6CASyB;AAEzB,2CAAwE;AAExE,mFAAuF;AACvF,iFAAgF;AAChF,2DAAgF;AAChF,8CAAoD;AACpD,8DAAkE;AAClE,qEAAoE;AAEpE,mCAA+C;AAGxC,IAAM,aAAa,GAAnB,MAAM,aAAa;IAElB,AAAN,KAAK,CAAC,MAAM,CACC,EAAE,IAAI,EAAkB,EACQ,aAAqB;QAEhE,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,IAAI,CAAC,CAAC;QAC/C,OAAO,MAAM,WAAW,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;IAC7E,CAAC;IAGK,AAAN,KAAK,CAAC,KAAK,CACE,EAAE,IAAI,EAAkB,EACC,MAAc;QAElD,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,IAAI,CAAC,CAAC;QAC/C,OAAO,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAC7D,CAAC;IAGK,AAAN,KAAK,CAAC,aAAa,CACN,EAAE,IAAI,EAAkB,EACO,QAAgB;QAE1D,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;QACzE,IAAI,CAAC,KAAK;YAAE,MAAM,IAAI,0BAAiB,CAAC,gCAAgC,QAAQ,EAAE,CAAC,CAAC;QACpF,OAAO,KAAK,CAAC;IACf,CAAC;IAGK,AAAN,KAAK,CAAC,sBAAsB,CACf,EAAE,IAAI,EAAkB,EAEnC,GAAW,EAGX,aAAqB;QAErB,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;QAC/F,MAAM,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;QAEpE,MAAM,MAAM,GAAG,IAAA,+CAAuB,EAAC,aAAa,CAAC,CAAC;QACtD,IAAI,MAAM,KAAK,SAAS;YAAE,MAAM,IAAA,+CAAkC,EAAC,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAE5F,OAAO,aAAa,CAAC;IACvB,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW,CACJ,EAAE,IAAI,EAAkB,EAEnC,MAAc;QAEd,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAC3E,MAAM,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;QAEpE,MAAM,MAAM,GAAG,IAAA,+CAAuB,EAAC,MAAM,CAAC,CAAC;QAC/C,IAAI,MAAM,KAAK,SAAS;YAAE,MAAM,IAAA,+CAAkC,EAAC,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAE5F,OAAO,MAAM,CAAC;IAChB,CAAC;IAGK,AAAN,KAAK,CAAC,kBAAkB,CACX,EAAE,IAAI,EAAkB,EAEnC,QAAgB,EAEhB,MAAc;QAEd,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,IAAI,CAAC,CAAC;QAC/C,OAAO,MAAM,WAAW,CAAC,YAAY,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IACjF,CAAC;IAGK,AAAN,KAAK,CAAC,aAAa,CACN,EAAE,IAAI,EAAkB,EAEnC,KAAyB;QAEzB,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC;YAC1D,MAAM,EAAE,KAAK,CAAC,aAAa;YAC3B,SAAS,EAAE,KAAK,CAAC,SAAS;SAC3B,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,IAAA,+CAAuB,EAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAC5D,IAAI,MAAM,KAAK,SAAS;YAAE,MAAM,IAAA,+CAAkC,EAAC,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAE5F,OAAO,MAAM,CAAC;IAChB,CAAC;IAGK,AAAN,KAAK,CAAC,GAAG,CACI,EAAE,IAAI,EAAkB,EAEnC,KAAoB;QAEpB,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,IAAI,CAAC,CAAC;QAC/C,OAAO,IAAA,gCAAkB,EAAC,WAAW,EAAE;YACrC,WAAW,EAAE,IAAI;YACjB,QAAQ,EAAE,KAAK,CAAC,GAAG;YACnB,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,YAAY,EAAE,KAAK,CAAC,YAAY;SACjC,CAAC,CAAC;IACL,CAAC;IAGK,AAAN,KAAK,CAAC,UAAU,CACH,EAAE,IAAI,EAAkB,EAEnC,KAAoB;QAEpB,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;YAAE,OAAO;QACnC,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,IAAA,4BAAoB,EAAC,WAAW,EAAE;YAChD,QAAQ,EAAE,KAAK;YACf,QAAQ,EAAE;gBACR,QAAQ,EAAE,KAAK,CAAC,GAAG;gBACnB,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,MAAM,EAAE,KAAK,CAAC,MAAM;aACrB;YACD,WAAW,EAAE,0BAAgB;YAC7B,YAAY,EAAE,IAAI;YAClB,WAAW,EAAE,IAAI;YACjB,gBAAgB,EAAE,IAAI;YACtB,IAAI,EAAE,IAAA,6CAAiB,EAAC,KAAK,CAAC,YAAY,CAAC;SAC5C,CAAC,CAAC;QACH,OAAO;YACL,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,aAAa,EAAE,KAAK,CAAC,KAAK;YAC1B,cAAc,EAAE,KAAK,CAAC,MAAM;YAC5B,gBAAgB,EAAE,KAAK,CAAC,QAAQ;SACjC,CAAC;IACJ,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW,CACJ,EAAE,IAAI,EAAkB,EAEnC,EAAE,WAAW,EAAE,GAAG,EAAoB;QAEtC,IAAI,CAAC,IAAA,yCAAa,EAAC,WAAW,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,4BAAmB,CAAC,yBAAyB,WAAW,GAAG,CAAC,CAAC;QACzE,CAAC;QACD,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,IAAI,CAAC,CAAC;QAE/C,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;QAE/D,IAAI,CAAC,KAAK;YAAE,MAAM,IAAI,0BAAiB,CAAC,kBAAkB,GAAG,GAAG,CAAC,CAAC;QAClE,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;YAAE,MAAM,IAAI,4BAAmB,CAAC,UAAU,GAAG,mBAAmB,CAAC,CAAC;QAE5F,OAAO,IAAA,4BAAoB,EAAC,WAAW,EAAE;YACvC,WAAW;YACX,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE;gBACR,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,QAAQ,EAAE,KAAK,CAAC,GAAG;gBACnB,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,KAAK,EAAE,KAAK,CAAC,KAAK;aACnB;YACD,YAAY,EAAE,KAAK;YACnB,WAAW,EAAE,IAAI;YACjB,gBAAgB,EAAE,uBAAuB;YACzC,IAAI,EAAE,IAAA,6CAAiB,EAAC,KAAK,CAAC,YAAY,CAAC;SAC5C,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA9KY,sCAAa;AAElB;IADL,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,CAAC,8BAAe,CAAC,CAAC;IAE5B,WAAA,IAAA,iBAAO,GAAE,CAAA;IACT,WAAA,IAAA,cAAI,EAAC,eAAe,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,YAAE,EAAE,CAAC,CAAA;;;;2CAI3C;AAGK;IADL,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,8BAAe,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAE9C,WAAA,IAAA,iBAAO,GAAE,CAAA;IACT,WAAA,IAAA,cAAI,EAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,YAAE,EAAE,CAAC,CAAA;;;;0CAIpC;AAGK;IADL,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,8BAAe,CAAC;IAE1B,WAAA,IAAA,iBAAO,GAAE,CAAA;IACT,WAAA,IAAA,cAAI,EAAC,UAAU,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,CAAA;;;;kDAM1C;AAGK;IADL,IAAA,kBAAQ,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;IAEpB,WAAA,IAAA,iBAAO,GAAE,CAAA;IACT,WAAA,IAAA,cAAI,EAAC,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,YAAE,EAAE,CAAC,CAAA;IAG/B,WAAA,IAAA,cAAI,EAAC,eAAe,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,YAAE,EAAE,CAAC,CAAA;;;;2DAW3C;AAGK;IADL,IAAA,kBAAQ,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;IAEpB,WAAA,IAAA,iBAAO,GAAE,CAAA;IACT,WAAA,IAAA,cAAI,EAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,YAAE,EAAE,CAAC,CAAA;;;;gDAWpC;AAGK;IADL,IAAA,kBAAQ,EAAC,GAAG,EAAE,CAAC,8BAAe,CAAC;IAE7B,WAAA,IAAA,iBAAO,GAAE,CAAA;IACT,WAAA,IAAA,cAAI,EAAC,UAAU,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,YAAE,EAAE,CAAC,CAAA;IAEpC,WAAA,IAAA,cAAI,EAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,CAAA;;;;uDAKxC;AAGK;IADL,IAAA,kBAAQ,EAAC,GAAG,EAAE,CAAC,CAAC,8BAAe,CAAC,CAAC;IAE/B,WAAA,IAAA,iBAAO,GAAE,CAAA;IACT,WAAA,IAAA,cAAI,EAAC,OAAO,CAAC,CAAA;;6CACP,iCAAkB;;kDAY1B;AAGK;IADL,IAAA,sBAAY,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;IAExB,WAAA,IAAA,iBAAO,GAAE,CAAA;IACT,WAAA,IAAA,gBAAM,GAAE,CAAA;;;;wCAUV;AAGK;IADL,IAAA,sBAAY,EAAC,GAAG,EAAE,CAAC,6CAA8B,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAEpE,WAAA,IAAA,iBAAO,GAAE,CAAA;IACT,WAAA,IAAA,gBAAM,GAAE,CAAA;;;;+CA4BV;AAGK;IADL,IAAA,kBAAQ,EAAC,GAAG,EAAE,CAAC,4BAAa,CAAC;IAE3B,WAAA,IAAA,iBAAO,GAAE,CAAA;IACT,WAAA,IAAA,cAAI,EAAC,OAAO,CAAC,CAAA;;6CACQ,+BAAgB;;gDA0BvC;wBA7KU,aAAa;IADzB,IAAA,kBAAQ,EAAC,GAAG,EAAE,CAAC,8BAAe,CAAC;GACnB,aAAa,CA8KzB"}
|
|
@@ -14,6 +14,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.UnprotectedResolver = void 0;
|
|
16
16
|
const graphql_1 = require("@nestjs/graphql");
|
|
17
|
+
const server_image_cache_engine_1 = require("@paroicms/server-image-cache-engine");
|
|
17
18
|
const media_handles_helpers_1 = require("../../../common/media-handles.helpers");
|
|
18
19
|
const context_1 = require("../../../context");
|
|
19
20
|
const site_context_1 = require("../../../site-context/site-context");
|
|
@@ -93,8 +94,10 @@ async function makeFaviconThumbReady(siteContext, { handle, variantName }) {
|
|
|
93
94
|
height: media.height,
|
|
94
95
|
},
|
|
95
96
|
variantName,
|
|
97
|
+
versionedUrl: true,
|
|
96
98
|
absoluteUrl: true,
|
|
97
|
-
|
|
99
|
+
dependsOnUsedKey: "bo",
|
|
100
|
+
slug: (0, server_image_cache_engine_1.generateImageSlug)(media.originalName),
|
|
98
101
|
});
|
|
99
102
|
return {
|
|
100
103
|
url: registered.url,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unprotected.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/unprotected/unprotected.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAyE;
|
|
1
|
+
{"version":3,"file":"unprotected.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/unprotected/unprotected.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { SiteContext } from "../../../site-context/site-context.types";
|
|
2
1
|
import { SendMailInput } from "./mail.dto";
|
|
2
|
+
import type { SiteContext } from "../../../site-context/site-context.types";
|
|
3
3
|
export interface SendMailResponseType {
|
|
4
4
|
success: boolean;
|
|
5
5
|
message?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contact-form-mail.js","sourceRoot":"","sources":["../../../../src/modules/public-api/mail/contact-form-mail.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"contact-form-mail.js","sourceRoot":"","sources":["../../../../src/modules/public-api/mail/contact-form-mail.ts"],"names":[],"mappings":";;;;;;AAGA,2CAA4E;AAC5E,oEAA2D;AAC3D,yDAAmD;AACnD,4DAA+B;AAC/B,oEAA+D;AAC/D,4EAAiE;AACjE,8CAAuD;AAEvD,+EAA0E;AAQnE,KAAK,UAAU,mBAAmB,CACvC,WAAwF,EACxF,KAAoB;IAEpB,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,GAAG,KAAK,CAAC;IACpE,IAAI,YAAgC,CAAC;IAErC,IAAI,CAAC;QACH,YAAY,GAAG,IAAA,mCAAa,EAC1B,MAAM,IAAA,uCAAiB,EAAC,WAAW,EAAE,EAAE,SAAS,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CACtF,CAAC;QACF,IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,KAAK,CAAC,KAAK,WAAW,CAAC,IAAI,sCAAsC,CAAC,CAAC;QAEhG,IAAI,iBAAO,CAAC,eAAe,IAAI,CAAC,iBAAO,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;YACjE,MAAM,yBAAyB,CAC7B,WAAW,EACX,kBAAkB,EAClB,iBAAO,CAAC,eAAe,CAAC,SAAS,CAClC,CAAC;QACJ,CAAC;QAED,MAAM,SAAS,GAAG,oBAAU,CAAC,SAAS,CAAC;YACrC,GAAG,EAAE,uBAAuB;YAC5B,IAAI,EAAE,KAAK,CAAC,IAAI;SACjB,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,oBAAU,CAAC,SAAS,CAAC;YACvC,GAAG,EAAE,yBAAyB;YAC9B,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,IAAI,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC;SACzB,CAAC,CAAC;QAEH,MAAM,IAAA,2BAAQ,EACZ;YACE,EAAE,EAAE,YAAY;YAChB,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;YACxB,OAAO,EAAE,GAAG,OAAO,IAAI,SAAS,IAAI,WAAW,EAAE;YACjD,IAAI,EAAE,MAAM,oBAAU,CAAC,SAAS,CAAC;gBAC/B,GAAG,EAAE,oBAAoB;gBACzB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,IAAI,EAAE,CAAC,IAAA,yBAAU,EAAC,IAAI,CAAC,CAAC;aACzB,CAAC;KACL,oBAAU,CAAC,SAAS,CAAC;gBAChB,GAAG,EAAE,qBAAqB;gBAC1B,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,IAAI,EAAE,CAAC,IAAA,yBAAU,EAAC,KAAK,CAAC,CAAC;aAC1B,CAAC;KACL,IAAA,yBAAU,EAAC,OAAO,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,MAAM;SAC/C,EACD,EAAE,MAAM,EAAE,WAAW,CAAC,OAAO,EAAE,CAChC,CAAC;QAEF,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,YAAY,4BAAmB;YAAE,MAAM,GAAG,CAAC;QAClD,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,sBAAsB,IAAA,wBAAS,EAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAClE,OAAO;YACL,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,YAAY;gBACnB,CAAC,CAAC,oBAAU,CAAC,SAAS,CAAC;oBACnB,GAAG,EAAE,6BAA6B;oBAClC,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,IAAI,EAAE,CAAC,YAAY,CAAC;iBACrB,CAAC;gBACJ,CAAC,CAAC,oBAAU,CAAC,SAAS,CAAC;oBACnB,GAAG,EAAE,0BAA0B;oBAC/B,IAAI,EAAE,KAAK,CAAC,IAAI;iBACjB,CAAC;YACN,WAAW,EAAE,KAAK;SACnB,CAAC;IACJ,CAAC;AACH,CAAC;AAxED,kDAwEC;AAeD,KAAK,UAAU,yBAAyB,CACtC,WAAsC,EACtC,kBAAsC,EACtC,yBAAiC;IAEjC,IAAI,CAAC,kBAAkB;QAAE,MAAM,IAAI,4BAAmB,CAAC,4BAA4B,CAAC,CAAC;IACrF,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;IAC1E,CAAC;IACD,MAAM,GAAG,GAAG,0DAA0D,yBAAyB,aAAa,kBAAkB,EAAE,CAAC;IACjI,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,EAAE;QAChC,MAAM,EAAE,MAAM;KACf,CAAC,CAAC;IACH,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;QACpD,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAC7D,CAAC;IACD,MAAM,OAAO,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAsC,CAAC;IAC7E,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACrB,MAAM,IAAI,4BAAmB,CAAC,4BAA4B,CAAC,CAAC;IAC9D,CAAC;IACD,IAAI,OAAO,CAAC,QAAQ,KAAK,WAAW,CAAC,IAAI,EAAE,CAAC;QAC1C,MAAM,IAAI,8BAAqB,EAAE,CAAC;IACpC,CAAC;AACH,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { Request } from "express";
|
|
2
1
|
import { CheckPasswordResetDto, SetAccountPasswordDto } from "./password-reset.dto";
|
|
2
|
+
import type { Request } from "express";
|
|
3
3
|
import { PasswordResetService } from "./password-reset.service";
|
|
4
4
|
export declare class PasswordResetController {
|
|
5
5
|
private readonly passwordResetService;
|
|
@@ -13,10 +13,10 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.PasswordResetController = void 0;
|
|
16
|
+
const password_reset_dto_1 = require("./password-reset.dto");
|
|
16
17
|
const common_1 = require("@nestjs/common");
|
|
17
18
|
const site_context_1 = require("../../../site-context/site-context");
|
|
18
19
|
const class_validator_options_1 = require("../class-validator-options");
|
|
19
|
-
const password_reset_dto_1 = require("./password-reset.dto");
|
|
20
20
|
const password_reset_service_1 = require("./password-reset.service");
|
|
21
21
|
let PasswordResetController = class PasswordResetController {
|
|
22
22
|
passwordResetService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"password-reset.controller.js","sourceRoot":"","sources":["../../../../src/modules/public-api/password-reset/password-reset.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"password-reset.controller.js","sourceRoot":"","sources":["../../../../src/modules/public-api/password-reset/password-reset.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,6DAAoF;AAEpF,2CASwB;AAExB,qEAAoE;AACpE,wEAAmE;AACnE,qEAAgE;AAIzD,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAEe;IADjD,YACiD,oBAA0C;QAA1C,yBAAoB,GAApB,oBAAoB,CAAsB;IACxF,CAAC;IAIE,AAAN,KAAK,CAAC,kBAAkB,CAAQ,GAAY,EAAU,UAAiC;QACrF,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvD,MAAM,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAC9E,CAAC;IAIK,AAAN,KAAK,CAAC,kBAAkB,CAAQ,GAAY,EAAU,UAAiC;QACrF,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvD,OAAO,MAAM,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IACrF,CAAC;CACF,CAAA;AAlBY,0DAAuB;AAO5B;IAFL,IAAA,aAAI,EAAC,sBAAsB,CAAC;IAC5B,IAAA,iBAAQ,EAAC,GAAG,CAAC;IACY,WAAA,IAAA,YAAG,GAAE,CAAA;IAAgB,WAAA,IAAA,aAAI,GAAE,CAAA;;6CAAa,0CAAqB;;iEAGtF;AAIK;IAFL,IAAA,aAAI,EAAC,sBAAsB,CAAC;IAC5B,IAAA,iBAAQ,EAAC,GAAG,CAAC;IACY,WAAA,IAAA,YAAG,GAAE,CAAA;IAAgB,WAAA,IAAA,aAAI,GAAE,CAAA;;6CAAa,0CAAqB;;iEAGtF;kCAjBU,uBAAuB;IAFnC,IAAA,mBAAU,EAAC,QAAQ,CAAC;IACpB,IAAA,iBAAQ,EAAC,IAAI,uBAAc,CAAC,+CAAqB,CAAC,CAAC;IAG/C,WAAA,IAAA,eAAM,EAAC,6CAAoB,CAAC,CAAA;qCAAwC,6CAAoB;GAFhF,uBAAuB,CAkBnC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { SiteContext } from "../../../site-context/site-context.types";
|
|
2
1
|
import { CheckPasswordResetDto, SetAccountPasswordDto } from "./password-reset.dto";
|
|
2
|
+
import type { SiteContext } from "../../../site-context/site-context.types";
|
|
3
3
|
export interface PasswordResetInfo {
|
|
4
4
|
authorized: true;
|
|
5
5
|
name?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"password-reset.service.js","sourceRoot":"","sources":["../../../../src/modules/public-api/password-reset/password-reset.service.ts"],"names":[],"mappings":";;;;;;;;;
|
|
1
|
+
{"version":3,"file":"password-reset.service.js","sourceRoot":"","sources":["../../../../src/modules/public-api/password-reset/password-reset.service.ts"],"names":[],"mappings":";;;;;;;;;AAGA,2CAAoF;AACpF,oFAAuE;AAEvE,oEAAiE;AAS1D,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,KAAK,CAAC,kBAAkB,CAAC,WAAwB,EAAE,UAAiC;QAClF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;QAE1E,IAAI,OAAO,CAAC,kBAAkB,KAAK,UAAU,CAAC,UAAU,EAAE,CAAC;YACzD,MAAM,IAAI,4BAAmB,CAAC,qBAAqB,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,IAAA,qCAAY,EAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAE7D,MAAM,WAAW,CAAC,MAAM;aACrB,kBAAkB,EAAE;aACpB,MAAM,CAAC,WAAW,CAAC;aACnB,GAAG,CAAC,EAAE,YAAY,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC;aAC/C,KAAK,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;aACrC,OAAO,EAAE,CAAC;IACf,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,WAAwB,EACxB,UAAiC;QAOjC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;QAE1E,IAAI,OAAO,CAAC,kBAAkB,KAAK,UAAU,CAAC,UAAU,EAAE,CAAC;YACzD,OAAO;gBACL,UAAU,EAAE,KAAK;aAClB,CAAC;QACJ,CAAC;QAED,OAAO;YACL,UAAU,EAAE,IAAI;YAChB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,IAAI,EAAE,OAAO,CAAC,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,WAAwB,EAAE,EAAU;QACpD,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,aAAa,CAAC,6BAAa,CAAC,CAAC,OAAO,CAAC;YAC5E,KAAK,EAAE;gBACL,EAAE;aACH;SACF,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,0BAAiB,CAAC,8BAA8B,EAAE,GAAG,CAAC,CAAC;QACnE,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;CACF,CAAA;AAtDY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;GACA,oBAAoB,CAsDhC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
+
import { SendMailInput } from "./mail/mail.dto";
|
|
2
|
+
import { PartialsParamsInput } from "./partials/partials-params.dto";
|
|
3
|
+
import { SearchTextOptionsInput } from "./search-text/search-text.dto";
|
|
1
4
|
import { type Tracker } from "@paroicms/server-lib";
|
|
2
5
|
import type { Request, Response } from "express";
|
|
3
6
|
import type { SiteContext } from "../../site-context/site-context.types";
|
|
4
7
|
import { type SendMailResponseType } from "./mail/contact-form-mail";
|
|
5
|
-
import { SendMailInput } from "./mail/mail.dto";
|
|
6
|
-
import { PartialsParamsInput } from "./partials/partials-params.dto";
|
|
7
|
-
import { SearchTextOptionsInput } from "./search-text/search-text.dto";
|
|
8
8
|
import { type SearchTextOptions } from "./search-text/search-text.queries";
|
|
9
9
|
interface HealthCheckType {
|
|
10
10
|
status: string;
|
|
@@ -13,6 +13,9 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.searchAndRender = exports.PublicApiController = void 0;
|
|
16
|
+
const mail_dto_1 = require("./mail/mail.dto");
|
|
17
|
+
const partials_params_dto_1 = require("./partials/partials-params.dto");
|
|
18
|
+
const search_text_dto_1 = require("./search-text/search-text.dto");
|
|
16
19
|
const common_1 = require("@nestjs/common");
|
|
17
20
|
const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
|
|
18
21
|
const anywhere_lib_1 = require("@paroicms/anywhere-lib");
|
|
@@ -29,9 +32,6 @@ const site_payload_1 = require("../../public-payload/site-payload");
|
|
|
29
32
|
const site_context_1 = require("../../site-context/site-context");
|
|
30
33
|
const class_validator_options_1 = require("./class-validator-options");
|
|
31
34
|
const contact_form_mail_1 = require("./mail/contact-form-mail");
|
|
32
|
-
const mail_dto_1 = require("./mail/mail.dto");
|
|
33
|
-
const partials_params_dto_1 = require("./partials/partials-params.dto");
|
|
34
|
-
const search_text_dto_1 = require("./search-text/search-text.dto");
|
|
35
35
|
const search_text_queries_1 = require("./search-text/search-text.queries");
|
|
36
36
|
let PublicApiController = class PublicApiController {
|
|
37
37
|
healthCheck() {
|
|
@@ -45,11 +45,11 @@ let PublicApiController = class PublicApiController {
|
|
|
45
45
|
const flaggedWithLeafId = (0, anywhere_lib_1.isDef)(flaggedWithId) ? (0, utils_helper_1.toLeafId)(flaggedWithId) : undefined;
|
|
46
46
|
const cacheKey = (0, text_cache_1.makeCacheKey)({ kind: "api", url: req.url });
|
|
47
47
|
const tracker = (0, server_lib_1.createTracker)();
|
|
48
|
-
const serveOr = (0, serve_html_or_1.
|
|
48
|
+
const serveOr = (0, serve_html_or_1.serveTextFromCacheOr)(siteContext, tracker, {
|
|
49
49
|
cacheKey,
|
|
50
50
|
req,
|
|
51
51
|
res,
|
|
52
|
-
contentType: "text/plain",
|
|
52
|
+
contentType: "text/plain; charset=utf-8",
|
|
53
53
|
});
|
|
54
54
|
if (!(await serveOr.serveFromCache())) {
|
|
55
55
|
const { html, dependencyKeys } = await renderChildPages(siteContext, tracker, {
|
|
@@ -72,7 +72,7 @@ let PublicApiController = class PublicApiController {
|
|
|
72
72
|
const siteContext = await (0, site_context_1.getSiteContext)(req.hostname);
|
|
73
73
|
const cacheKey = (0, text_cache_1.makeCacheKey)({ kind: "api", url: req.url });
|
|
74
74
|
const tracker = (0, server_lib_1.createTracker)();
|
|
75
|
-
const serveOr = (0, serve_html_or_1.
|
|
75
|
+
const serveOr = (0, serve_html_or_1.serveTextFromCacheOr)(siteContext, tracker, {
|
|
76
76
|
cacheKey,
|
|
77
77
|
req,
|
|
78
78
|
res,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public-api-controller.js","sourceRoot":"","sources":["../../../src/modules/public-api/public-api-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"public-api-controller.js","sourceRoot":"","sources":["../../../src/modules/public-api/public-api-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,5 @@
|
|
|
1
|
-
import type
|
|
2
|
-
export
|
|
3
|
-
|
|
4
|
-
variantName
|
|
5
|
-
}
|
|
6
|
-
export declare function parseMediaName(param: string): ParsedMediaName | undefined;
|
|
7
|
-
export declare function makeMediaName({ mediaUid, variantSize, mediaType, }: {
|
|
8
|
-
mediaUid: string;
|
|
9
|
-
variantSize?: `${number}x${number}`;
|
|
10
|
-
mediaType: string;
|
|
11
|
-
}): string;
|
|
1
|
+
import { type CompleteVariantName } from "@paroicms/server-image-cache-engine";
|
|
2
|
+
export declare function parseNameAndExt(nameAndExt: string): {
|
|
3
|
+
slug: string;
|
|
4
|
+
variantName: CompleteVariantName;
|
|
5
|
+
} | undefined;
|
|
@@ -1,26 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
3
|
+
exports.parseNameAndExt = void 0;
|
|
4
|
+
const server_image_cache_engine_1 = require("@paroicms/server-image-cache-engine");
|
|
5
|
+
function parseNameAndExt(nameAndExt) {
|
|
6
|
+
const extIndex = nameAndExt.lastIndexOf(".");
|
|
7
|
+
if (extIndex === -1)
|
|
7
8
|
return;
|
|
8
|
-
const
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
return `${mediaUid}${variantSize ? `-${variantSize}` : ""}.${mediaTypeToFileExtension(mediaType)}`;
|
|
17
|
-
}
|
|
18
|
-
exports.makeMediaName = makeMediaName;
|
|
19
|
-
function mediaTypeToFileExtension(mediaType) {
|
|
20
|
-
const regexMatchArray = mediaType.match(/\w+\/([-+.\w]+)/);
|
|
21
|
-
if (!regexMatchArray) {
|
|
22
|
-
throw new Error("media extension is incorrect.");
|
|
23
|
-
}
|
|
24
|
-
return regexMatchArray[1];
|
|
9
|
+
const name = nameAndExt.slice(0, extIndex);
|
|
10
|
+
const match = name.match(/^(.+)-([0-9]+x[0-9]+)$/);
|
|
11
|
+
if (!match)
|
|
12
|
+
return;
|
|
13
|
+
const [, slug, variantName] = match;
|
|
14
|
+
if (!(0, server_image_cache_engine_1.isCompleteVariantName)(variantName))
|
|
15
|
+
return;
|
|
16
|
+
return { slug, variantName };
|
|
25
17
|
}
|
|
18
|
+
exports.parseNameAndExt = parseNameAndExt;
|
|
26
19
|
//# sourceMappingURL=_media-serve-helpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_media-serve-helpers.js","sourceRoot":"","sources":["../../../../src/modules/public-site/media-serve/_media-serve-helpers.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"_media-serve-helpers.js","sourceRoot":"","sources":["../../../../src/modules/public-site/media-serve/_media-serve-helpers.ts"],"names":[],"mappings":";;;AAAA,mFAG6C;AAE7C,SAAgB,eAAe,CAC7B,UAAkB;IAElB,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC7C,IAAI,QAAQ,KAAK,CAAC,CAAC;QAAE,OAAO;IAC5B,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;IACnD,IAAI,CAAC,KAAK;QAAE,OAAO;IACnB,MAAM,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC;IACpC,IAAI,CAAC,IAAA,iDAAqB,EAAC,WAAW,CAAC;QAAE,OAAO;IAChD,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;AAC/B,CAAC;AAXD,0CAWC"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import type { Request, Response } from "express";
|
|
2
2
|
export declare class MediaServeController {
|
|
3
|
-
|
|
3
|
+
serveFile(mediaUid: string, nameAndExt: string, res: Response, req: Request): Promise<void>;
|
|
4
|
+
serveVersionedImage(mediaUid: string, resourceVersion: string, nameAndExt: string, res: Response, req: Request): Promise<void>;
|
|
5
|
+
serveUnversionedImage(mediaUid: string, nameAndExt: string, res: Response, req: Request): Promise<void>;
|
|
4
6
|
}
|