@paroicms/server 1.16.0 → 1.17.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/ddl/main.ddl.sql +8 -6
- package/dist/common/child-ordering-query.d.ts +1 -1
- package/dist/common/child-ordering-query.js.map +1 -1
- package/dist/common/text-cache.d.ts +9 -2
- package/dist/common/text-cache.js +26 -3
- package/dist/common/text-cache.js.map +1 -1
- package/dist/context.d.ts +1 -4
- package/dist/context.js +16 -6
- package/dist/context.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/modules/core/account/account.queries.js +11 -11
- package/dist/modules/core/account/account.queries.js.map +1 -1
- package/dist/modules/core/document/load-documents.queries.d.ts +5 -5
- package/dist/modules/core/document/load-documents.queries.js +9 -9
- package/dist/modules/core/document/load-documents.queries.js.map +1 -1
- package/dist/modules/core/document/save-documents.queries.js +50 -37
- package/dist/modules/core/document/save-documents.queries.js.map +1 -1
- package/dist/modules/core/fields/load-fields.queries.d.ts +2 -2
- package/dist/modules/core/fields/load-fields.queries.js +2 -2
- package/dist/modules/core/fields/load-fields.queries.js.map +1 -1
- package/dist/modules/core/fields/save-fields.queries.d.ts +1 -1
- package/dist/modules/core/fields/save-fields.queries.js +3 -3
- package/dist/modules/core/fields/save-fields.queries.js.map +1 -1
- package/dist/modules/core/leaf/leaf.queries.d.ts +12 -8
- package/dist/modules/core/leaf/leaf.queries.js +60 -11
- package/dist/modules/core/leaf/leaf.queries.js.map +1 -1
- package/dist/modules/core/leaf/leaf.resolver.js +5 -3
- package/dist/modules/core/leaf/leaf.resolver.js.map +1 -1
- package/dist/modules/core/leaf-item/leaf-item.queries.d.ts +1 -1
- package/dist/modules/core/leaf-item/leaf-item.queries.js +12 -12
- package/dist/modules/core/leaf-item/leaf-item.queries.js.map +1 -1
- package/dist/modules/core/media/media-upload.controller.js +1 -1
- package/dist/modules/core/media/media-upload.controller.js.map +1 -1
- package/dist/modules/core/part/part.queries.d.ts +2 -2
- package/dist/modules/core/part/part.queries.js +15 -15
- package/dist/modules/core/part/part.queries.js.map +1 -1
- package/dist/modules/core/section/section-wrap.resolver.js +2 -2
- package/dist/modules/core/section/section-wrap.resolver.js.map +1 -1
- package/dist/modules/core/section/section.queries.d.ts +4 -4
- package/dist/modules/core/section/section.queries.js +7 -7
- package/dist/modules/core/section/section.queries.js.map +1 -1
- package/dist/modules/core/section/section.resolver.js +1 -1
- package/dist/modules/core/section/section.resolver.js.map +1 -1
- package/dist/modules/core/term-flag/term-flag.queries.js +3 -3
- package/dist/modules/core/term-flag/term-flag.queries.js.map +1 -1
- package/dist/modules/core/unprotected/unprotected.resolver.js +3 -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.service.js +2 -2
- package/dist/modules/public-api/password-reset/password-reset.service.js.map +1 -1
- package/dist/modules/public-api/search-text/search-text.queries.js +1 -1
- package/dist/modules/public-api/search-text/search-text.queries.js.map +1 -1
- package/dist/modules/public-site/public-route/make-url.js +1 -1
- package/dist/modules/public-site/public-route/make-url.js.map +1 -1
- package/dist/modules/public-site/public-route/raw-document-payload.js +1 -1
- package/dist/modules/public-site/public-route/raw-document-payload.js.map +1 -1
- package/dist/public-payload/excerpt.queries.js +1 -1
- package/dist/public-payload/excerpt.queries.js.map +1 -1
- package/dist/public-payload/get-siblings.queries.js +2 -2
- package/dist/public-payload/get-siblings.queries.js.map +1 -1
- package/dist/public-payload/page-values.queries.js +2 -2
- package/dist/public-payload/page-values.queries.js.map +1 -1
- package/dist/public-payload/parts.queries.js +3 -3
- package/dist/public-payload/parts.queries.js.map +1 -1
- package/dist/public-payload/taxonomies.queries.js +1 -1
- package/dist/public-payload/taxonomies.queries.js.map +1 -1
- package/dist/public-payload/translations.queries.js +1 -1
- package/dist/public-payload/translations.queries.js.map +1 -1
- package/dist/site-context/create-site-context.js +78 -45
- package/dist/site-context/create-site-context.js.map +1 -1
- package/dist/site-context/db-init/db-init.d.ts +2 -3
- package/dist/site-context/db-init/db-init.js +20 -14
- package/dist/site-context/db-init/db-init.js.map +1 -1
- package/dist/site-context/db-init/ddl-migration.d.ts +3 -7
- package/dist/site-context/db-init/ddl-migration.js +11 -13
- package/dist/site-context/db-init/ddl-migration.js.map +1 -1
- package/dist/site-context/db-init/init-routing-points.d.ts +1 -1
- package/dist/site-context/db-init/init-routing-points.js +11 -11
- package/dist/site-context/db-init/init-routing-points.js.map +1 -1
- package/dist/site-context/site-context.js +1 -1
- package/dist/site-context/site-context.js.map +1 -1
- package/dist/site-context/site-context.types.d.ts +1 -1
- package/dist/types.to.json +1 -1
- package/package.json +10 -10
package/ddl/main.ddl.sql
CHANGED
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
PRAGMA journal_mode = TRUNCATE;
|
|
2
2
|
PRAGMA foreign_keys = 1;
|
|
3
3
|
|
|
4
|
-
create table
|
|
5
|
-
dbSchema varchar(100) not null
|
|
6
|
-
|
|
4
|
+
create table PaMetadata (
|
|
5
|
+
dbSchema varchar(100) not null,
|
|
6
|
+
k varchar(100) not null,
|
|
7
|
+
val varchar(250) not null,
|
|
8
|
+
primary key (dbSchema, k)
|
|
7
9
|
);
|
|
8
10
|
|
|
9
|
-
insert into
|
|
11
|
+
insert into PaMetadata (dbSchema, k, val) values ('main', 'dbSchemaVersion', '7');
|
|
10
12
|
|
|
11
13
|
create table PaAccount (
|
|
12
14
|
id integer not null primary key autoincrement,
|
|
@@ -27,7 +29,7 @@ create table PaLeaf (
|
|
|
27
29
|
unique (parentId, relativeId)
|
|
28
30
|
);
|
|
29
31
|
|
|
30
|
-
create index
|
|
32
|
+
create index PaLeaf_leafType_idx on PaLeaf (leafType);
|
|
31
33
|
|
|
32
34
|
create table PaLeafItem (
|
|
33
35
|
leafId integer not null primary key references PaLeaf (id) on delete cascade,
|
|
@@ -35,7 +37,7 @@ create table PaLeafItem (
|
|
|
35
37
|
itemNum integer
|
|
36
38
|
);
|
|
37
39
|
|
|
38
|
-
create index
|
|
40
|
+
create index PaLeafItem_listName_idx on PaLeafItem (listName);
|
|
39
41
|
|
|
40
42
|
create table PaTermFlag (
|
|
41
43
|
termId integer not null references PaLeaf (id) on delete cascade,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { type ChildOrdering, type DocumentSchema, type OrderByItem } from "@paroicms/anywhere-lib";
|
|
2
2
|
import type { SelectQueryBuilder } from "typeorm";
|
|
3
3
|
import type { SiteContext } from "../site-context/site-context.types";
|
|
4
|
-
export declare function applyChildOrderingOnQuery(siteContext: Pick<SiteContext, "
|
|
4
|
+
export declare function applyChildOrderingOnQuery(siteContext: Pick<SiteContext, "cn" | "siteSchema">, options: {
|
|
5
5
|
query: SelectQueryBuilder<any>;
|
|
6
6
|
parentDocumentType: DocumentSchema;
|
|
7
7
|
childOrdering?: ChildOrdering;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child-ordering-query.js","sourceRoot":"","sources":["../../src/common/child-ordering-query.ts"],"names":[],"mappings":";;;AAAA,yDAMgC;AAEhC,wCAAuC;AAGvC,SAAgB,yBAAyB,CACvC,
|
|
1
|
+
{"version":3,"file":"child-ordering-query.js","sourceRoot":"","sources":["../../src/common/child-ordering-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,7 @@ export declare function makeCacheKey(options: {
|
|
|
29
29
|
kind: "api";
|
|
30
30
|
url: string;
|
|
31
31
|
}): string;
|
|
32
|
-
export declare function invalidateDocumentInCache(siteContext: Pick<SiteContext, "
|
|
32
|
+
export declare function invalidateDocumentInCache(siteContext: Pick<SiteContext, "cn" | "textCache" | "siteSchema">, options: {
|
|
33
33
|
parentOf: ParsedSectionId;
|
|
34
34
|
} | {
|
|
35
35
|
documentId: ParsedSectionId;
|
|
@@ -39,6 +39,9 @@ export declare function invalidateDocumentInCache(siteContext: Pick<SiteContext,
|
|
|
39
39
|
fully: true;
|
|
40
40
|
parentId: ParsedSectionId | undefined;
|
|
41
41
|
}): Promise<void>;
|
|
42
|
+
export declare function invalidateLeafInCache(siteContext: Pick<SiteContext, "textCache" | "cn" | "siteSchema">, { leafId }: {
|
|
43
|
+
leafId: string;
|
|
44
|
+
}): Promise<void>;
|
|
42
45
|
export declare function invalidateDocumentRelationCache(siteContext: Pick<SiteContext, "textCache">, options: {
|
|
43
46
|
documentId: ParsedSectionId;
|
|
44
47
|
relation: "children";
|
|
@@ -47,7 +50,11 @@ export declare function invalidateDocumentRelationCache(siteContext: Pick<SiteCo
|
|
|
47
50
|
relation: "flagged";
|
|
48
51
|
taxonomyLeafType: string;
|
|
49
52
|
}): Promise<void>;
|
|
50
|
-
export declare function
|
|
53
|
+
export declare function depKeysOfLeafRelationCache(siteContext: Pick<SiteContext, "cn" | "siteSchema">, options: {
|
|
54
|
+
parentOfLeafId: string;
|
|
55
|
+
relation: "children";
|
|
56
|
+
}): Promise<string[]>;
|
|
57
|
+
export declare function invalidateMultipleDocumentsInCache(siteContext: Pick<SiteContext, "cn" | "textCache" | "siteSchema">, options: {
|
|
51
58
|
leafId: string;
|
|
52
59
|
parentIds?: ParsedSectionId[];
|
|
53
60
|
fully?: boolean;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.invalidateMultipleDocumentsInCache = exports.invalidateDocumentRelationCache = exports.invalidateDocumentInCache = exports.makeCacheKey = exports.makeCacheDependencyKey = void 0;
|
|
3
|
+
exports.invalidateMultipleDocumentsInCache = exports.depKeysOfLeafRelationCache = exports.invalidateDocumentRelationCache = exports.invalidateLeafInCache = exports.invalidateDocumentInCache = exports.makeCacheKey = exports.makeCacheDependencyKey = void 0;
|
|
4
4
|
const anywhere_lib_1 = require("@paroicms/anywhere-lib");
|
|
5
5
|
const load_documents_queries_1 = require("../modules/core/document/load-documents.queries");
|
|
6
6
|
function makeCacheDependencyKey(options) {
|
|
@@ -33,7 +33,6 @@ function makeCacheKey(options) {
|
|
|
33
33
|
}
|
|
34
34
|
exports.makeCacheKey = makeCacheKey;
|
|
35
35
|
async function invalidateDocumentInCache(siteContext, options) {
|
|
36
|
-
const dependencyKeys = [];
|
|
37
36
|
const documentId = "documentId" in options
|
|
38
37
|
? options.documentId
|
|
39
38
|
: await (0, load_documents_queries_1.getParentSectionIdOf)(siteContext, options.parentOf);
|
|
@@ -41,7 +40,10 @@ async function invalidateDocumentInCache(siteContext, options) {
|
|
|
41
40
|
return;
|
|
42
41
|
const fully = "fully" in options && options.fully;
|
|
43
42
|
const withSlug = ("perimeter" in options && options.perimeter === "slug") || fully;
|
|
44
|
-
dependencyKeys
|
|
43
|
+
const dependencyKeys = [
|
|
44
|
+
makeCacheDependencyKey({ documentId }),
|
|
45
|
+
makeCacheDependencyKey({ leafId: documentId.leafId }),
|
|
46
|
+
];
|
|
45
47
|
if (withSlug) {
|
|
46
48
|
dependencyKeys.push(makeCacheDependencyKey({ documentId, perimeter: "slug" }));
|
|
47
49
|
}
|
|
@@ -55,10 +57,31 @@ async function invalidateDocumentInCache(siteContext, options) {
|
|
|
55
57
|
await siteContext.textCache.invalidate(dependencyKeys);
|
|
56
58
|
}
|
|
57
59
|
exports.invalidateDocumentInCache = invalidateDocumentInCache;
|
|
60
|
+
async function invalidateLeafInCache(siteContext, { leafId }) {
|
|
61
|
+
const langs = siteContext.siteSchema.langs;
|
|
62
|
+
const documentIds = langs.map((lang) => ({ lang, leafId }));
|
|
63
|
+
const dependencyKeys = documentIds.map((documentId) => makeCacheDependencyKey({ documentId }));
|
|
64
|
+
dependencyKeys.push(...documentIds.map((documentId) => makeCacheDependencyKey({ leafId: documentId.leafId })));
|
|
65
|
+
const parentLeafId = await (0, load_documents_queries_1.getParentLeafIdOf)(siteContext, leafId);
|
|
66
|
+
if (parentLeafId) {
|
|
67
|
+
const parentDocumentIds = siteContext.siteSchema.langs.map((lang) => ({ lang, leafId }));
|
|
68
|
+
dependencyKeys.push(...parentDocumentIds.map((documentId) => makeCacheDependencyKey({ documentId, relation: "children" })));
|
|
69
|
+
}
|
|
70
|
+
await siteContext.textCache.invalidate(dependencyKeys);
|
|
71
|
+
}
|
|
72
|
+
exports.invalidateLeafInCache = invalidateLeafInCache;
|
|
58
73
|
async function invalidateDocumentRelationCache(siteContext, options) {
|
|
59
74
|
await siteContext.textCache.invalidate([makeCacheDependencyKey(options)]);
|
|
60
75
|
}
|
|
61
76
|
exports.invalidateDocumentRelationCache = invalidateDocumentRelationCache;
|
|
77
|
+
async function depKeysOfLeafRelationCache(siteContext, options) {
|
|
78
|
+
const leafId = await (0, load_documents_queries_1.getParentLeafIdOf)(siteContext, options.parentOfLeafId);
|
|
79
|
+
if (leafId === undefined)
|
|
80
|
+
return [];
|
|
81
|
+
const documentIds = siteContext.siteSchema.langs.map((lang) => ({ lang, leafId }));
|
|
82
|
+
return documentIds.map((documentId) => makeCacheDependencyKey({ documentId, relation: "children" }));
|
|
83
|
+
}
|
|
84
|
+
exports.depKeysOfLeafRelationCache = depKeysOfLeafRelationCache;
|
|
62
85
|
async function invalidateMultipleDocumentsInCache(siteContext, options) {
|
|
63
86
|
const langs = siteContext.siteSchema.langs;
|
|
64
87
|
const leafId = "leafId" in options
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"text-cache.js","sourceRoot":"","sources":["../../src/common/text-cache.ts"],"names":[],"mappings":";;;AAAA,yDAA+E;AAC/E,4FAIyD;AAGzD,SAAgB,sBAAsB,CACpC,OAIsB;IAEtB,IAAI,QAAQ,IAAI,OAAO,EAAE,CAAC;QACxB,IAAI,UAAU,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC5D,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;YAC7C,OAAO,KAAK,MAAM,YAAY,gBAAgB,EAAE,CAAC;QACnD,CAAC;QACD,OAAO,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,SAAS,GAAG,IAAA,8BAAe,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACtD,IAAI,UAAU,IAAI,OAAO;QAAE,OAAO,GAAG,SAAS,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;IACrE,IAAI,OAAO,CAAC,SAAS;QAAE,OAAO,GAAG,SAAS,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAClE,OAAO,SAAS,CAAC;AACnB,CAAC;AAnBD,wDAmBC;AAMD,SAAgB,YAAY,CAAC,OAK5B;IACC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAClD,IAAI,IAAI,KAAK,MAAM;QAAE,OAAO,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC;IAC7C,IAAI,IAAI,KAAK,KAAK;QAAE,OAAO,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC;IAC5C,IAAI,IAAI,KAAK,UAAU;QAAE,OAAO,GAAG,IAAI,IAAI,MAAM,EAAE,CAAC;IACpD,IAAI,UAAU;QAAE,OAAO,GAAG,IAAI,IAAI,IAAA,8BAAe,EAAC,UAAU,CAAC,EAAE,CAAC;IAChE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;AACvC,CAAC;AAZD,oCAYC;AAEM,KAAK,UAAU,yBAAyB,CAC7C,
|
|
1
|
+
{"version":3,"file":"text-cache.js","sourceRoot":"","sources":["../../src/common/text-cache.ts"],"names":[],"mappings":";;;AAAA,yDAA+E;AAC/E,4FAIyD;AAGzD,SAAgB,sBAAsB,CACpC,OAIsB;IAEtB,IAAI,QAAQ,IAAI,OAAO,EAAE,CAAC;QACxB,IAAI,UAAU,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC5D,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;YAC7C,OAAO,KAAK,MAAM,YAAY,gBAAgB,EAAE,CAAC;QACnD,CAAC;QACD,OAAO,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,SAAS,GAAG,IAAA,8BAAe,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACtD,IAAI,UAAU,IAAI,OAAO;QAAE,OAAO,GAAG,SAAS,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;IACrE,IAAI,OAAO,CAAC,SAAS;QAAE,OAAO,GAAG,SAAS,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAClE,OAAO,SAAS,CAAC;AACnB,CAAC;AAnBD,wDAmBC;AAMD,SAAgB,YAAY,CAAC,OAK5B;IACC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAClD,IAAI,IAAI,KAAK,MAAM;QAAE,OAAO,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC;IAC7C,IAAI,IAAI,KAAK,KAAK;QAAE,OAAO,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC;IAC5C,IAAI,IAAI,KAAK,UAAU;QAAE,OAAO,GAAG,IAAI,IAAI,MAAM,EAAE,CAAC;IACpD,IAAI,UAAU;QAAE,OAAO,GAAG,IAAI,IAAI,IAAA,8BAAe,EAAC,UAAU,CAAC,EAAE,CAAC;IAChE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;AACvC,CAAC;AAZD,oCAYC;AAEM,KAAK,UAAU,yBAAyB,CAC7C,WAAiE,EACjE,OAGuF;IAEvF,MAAM,UAAU,GACd,YAAY,IAAI,OAAO;QACrB,CAAC,CAAC,OAAO,CAAC,UAAU;QACpB,CAAC,CAAC,MAAM,IAAA,6CAAoB,EAAC,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAChE,IAAI,CAAC,UAAU;QAAE,OAAO;IAExB,MAAM,KAAK,GAAG,OAAO,IAAI,OAAO,IAAI,OAAO,CAAC,KAAK,CAAC;IAClD,MAAM,QAAQ,GAAG,CAAC,WAAW,IAAI,OAAO,IAAI,OAAO,CAAC,SAAS,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC;IAEnF,MAAM,cAAc,GAAG;QACrB,sBAAsB,CAAC,EAAE,UAAU,EAAE,CAAC;QACtC,sBAAsB,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC;KACtD,CAAC;IACF,IAAI,QAAQ,EAAE,CAAC;QACb,cAAc,CAAC,IAAI,CAAC,sBAAsB,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IACjF,CAAC;IACD,IAAI,KAAK,EAAE,CAAC;QACV,cAAc,CAAC,IAAI,CAAC,sBAAsB,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IACpF,CAAC;IAED,MAAM,QAAQ,GACZ,UAAU,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,IAAA,6CAAoB,EAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IACjG,IAAI,QAAQ,EAAE,CAAC;QACb,cAAc,CAAC,IAAI,CAAC,sBAAsB,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IAC9F,CAAC;IAED,MAAM,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;AACzD,CAAC;AAlCD,8DAkCC;AAEM,KAAK,UAAU,qBAAqB,CACzC,WAAiE,EACjE,EAAE,MAAM,EAAsB;IAE9B,MAAM,KAAK,GAAG,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC;IAC3C,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IAE5D,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,sBAAsB,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IAC/F,cAAc,CAAC,IAAI,CACjB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,sBAAsB,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAC1F,CAAC;IAEF,MAAM,YAAY,GAAG,MAAM,IAAA,0CAAiB,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAClE,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,iBAAiB,GAAG,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACzF,cAAc,CAAC,IAAI,CACjB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CACtC,sBAAsB,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAC7D,CACF,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;AACzD,CAAC;AAvBD,sDAuBC;AAEM,KAAK,UAAU,+BAA+B,CACnD,WAA2C,EAC3C,OAEqE;IAErE,MAAM,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AAC5E,CAAC;AAPD,0EAOC;AAEM,KAAK,UAAU,0BAA0B,CAC9C,WAAmD,EACnD,OAAyD;IAEzD,MAAM,MAAM,GAAG,MAAM,IAAA,0CAAiB,EAAC,WAAW,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IAC5E,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IAEpC,MAAM,WAAW,GAAG,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IACnF,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CACpC,sBAAsB,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAC7D,CAAC;AACJ,CAAC;AAXD,gEAWC;AAEM,KAAK,UAAU,kCAAkC,CACtD,WAAiE,EACjE,OAE+C;IAE/C,MAAM,KAAK,GAAG,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC;IAE3C,MAAM,MAAM,GACV,QAAQ,IAAI,OAAO;QACjB,CAAC,CAAC,OAAO,CAAC,MAAM;QAChB,CAAC,CAAC,MAAM,IAAA,0CAAiB,EAAC,WAAW,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IACnE,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO;IAEjC,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IAE5D,MAAM,cAAc,GAAG,CAAC,sBAAsB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IAC5D,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,cAAc,CAAC,IAAI,CAAC,sBAAsB,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;QAC5D,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YAClB,cAAc,CAAC,IAAI,CACjB,sBAAsB,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,EACzD,sBAAsB,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAC7D,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,SAAS,GACb,WAAW,IAAI,OAAO,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS;QACvD,CAAC,CAAC,OAAO,CAAC,SAAS;QACnB,CAAC,CAAC,MAAM,IAAA,+CAAsB,EAAC,WAAW,EAAE;YACxC,KAAK;YACL,MAAM;SACP,CAAC,CAAC;IACT,cAAc,CAAC,IAAI,CACjB,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC5B,sBAAsB,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CACvE,CACF,CAAC;IAEF,MAAM,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;AACzD,CAAC;AAzCD,gFAyCC"}
|
package/dist/context.d.ts
CHANGED
|
@@ -9,9 +9,6 @@ export declare const appVersion: any, appName: any;
|
|
|
9
9
|
export declare const typeValidator: import("@typeonly/validator").TypeOnlyValidator;
|
|
10
10
|
export declare const appConf: Configuration;
|
|
11
11
|
export declare const platformLog: import("./share/pino-app-log").PlatformLog;
|
|
12
|
-
export declare const boAppVersion: {
|
|
13
|
-
version: any;
|
|
14
|
-
};
|
|
15
12
|
export declare const publicPort: number;
|
|
16
13
|
export declare const boPublicPort: number;
|
|
17
14
|
export declare const langs: string[];
|
|
@@ -24,7 +21,7 @@ export declare function initSiteSchemaLib(val: SiteSchemaLibrary): void;
|
|
|
24
21
|
export declare function getSiteSchemaLib(): SiteSchemaLibrary;
|
|
25
22
|
export declare const jwtSecret: string;
|
|
26
23
|
export declare const jwtExpiresIn = "180d";
|
|
27
|
-
export declare const platformJwtSecret: string;
|
|
24
|
+
export declare const platformJwtSecret: string | undefined;
|
|
28
25
|
export declare const platformAuthUrl: string | undefined;
|
|
29
26
|
export declare let simpleI18n: SimpleTranslator;
|
|
30
27
|
export declare function initializeContext(siteConfsVal: Map<string, SiteConf>): Promise<void>;
|
package/dist/context.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var _a;
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.initializeContext = exports.simpleI18n = exports.platformAuthUrl = exports.platformJwtSecret = exports.jwtExpiresIn = exports.jwtSecret = exports.getSiteSchemaLib = exports.initSiteSchemaLib = exports.siteConfs = exports.thumbVariantName = exports.langLabels = exports.langs = exports.boPublicPort = exports.publicPort = exports.
|
|
4
|
+
exports.initializeContext = exports.simpleI18n = exports.platformAuthUrl = exports.platformJwtSecret = exports.jwtExpiresIn = exports.jwtSecret = exports.getSiteSchemaLib = exports.initSiteSchemaLib = exports.siteConfs = exports.thumbVariantName = exports.langLabels = exports.langs = exports.boPublicPort = exports.publicPort = exports.platformLog = exports.appConf = exports.typeValidator = exports.appName = exports.appVersion = exports.packageDir = exports.dbAnyLang = void 0;
|
|
5
5
|
const validator_1 = require("@typeonly/validator");
|
|
6
|
+
const node_fs_1 = require("node:fs");
|
|
6
7
|
const node_path_1 = require("node:path");
|
|
7
8
|
const configuration_helpers_1 = require("./helpers/configuration.helpers");
|
|
8
9
|
const jwt_secret_helpers_1 = require("./helpers/jwt-secret.helpers");
|
|
@@ -21,9 +22,6 @@ exports.appConf = (0, read_configuration_1.readConfigFileSync)({
|
|
|
21
22
|
defaultFileName: "config.json",
|
|
22
23
|
});
|
|
23
24
|
exports.platformLog = (0, pino_app_log_1.createPlatformLog)(exports.appConf.log);
|
|
24
|
-
exports.boAppVersion = {
|
|
25
|
-
version: exports.appVersion,
|
|
26
|
-
};
|
|
27
25
|
exports.publicPort = exports.appConf.thisServer.publicPort ?? exports.appConf.thisServer.port;
|
|
28
26
|
exports.boPublicPort = exports.appConf.thisServer.boPublicPort ?? exports.publicPort;
|
|
29
27
|
exports.langs = ["en", "fr"];
|
|
@@ -44,9 +42,21 @@ function getSiteSchemaLib() {
|
|
|
44
42
|
return siteSchemaLib;
|
|
45
43
|
}
|
|
46
44
|
exports.getSiteSchemaLib = getSiteSchemaLib;
|
|
47
|
-
|
|
45
|
+
const platformDataDir = (0, configuration_helpers_1.isMultiSiteConfiguration)(exports.appConf)
|
|
46
|
+
? exports.appConf.platform.dataDir
|
|
47
|
+
: exports.appConf.singleSite.dataDir;
|
|
48
|
+
exports.jwtSecret = (0, jwt_secret_helpers_1.getJwtSecretSync)((0, node_path_1.join)(platformDataDir, "jwt-secret.txt"));
|
|
48
49
|
exports.jwtExpiresIn = "180d";
|
|
49
|
-
|
|
50
|
+
const oldFile = (0, node_path_1.join)(platformDataDir, "platform-jwt-secret.txt");
|
|
51
|
+
if ((0, node_fs_1.existsSync)(oldFile)) {
|
|
52
|
+
if (exports.appConf.googleAuth)
|
|
53
|
+
(0, node_fs_1.renameSync)(oldFile, (0, node_path_1.join)(platformDataDir, "jwt-secret-pl.txt"));
|
|
54
|
+
else
|
|
55
|
+
(0, node_fs_1.unlinkSync)(oldFile);
|
|
56
|
+
}
|
|
57
|
+
exports.platformJwtSecret = exports.appConf.googleAuth
|
|
58
|
+
? (0, jwt_secret_helpers_1.getJwtSecretSync)((0, node_path_1.join)(platformDataDir, "jwt-secret-pl.txt"))
|
|
59
|
+
: undefined;
|
|
50
60
|
const protocol = exports.appConf.thisServer.https ? "https" : "http";
|
|
51
61
|
exports.platformAuthUrl = exports.appConf.googleAuth && !exports.appConf.googleAuth.disabled
|
|
52
62
|
? `${protocol}://${exports.appConf.googleAuth.fqdn}${exports.publicPort !== 80 ? `:${exports.publicPort}` : ""}/auth`
|
package/dist/context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":";;;;AACA,mDAAsD;AACtD,yCAA0C;AAC1C,2EAA2E;AAC3E,qEAAgE;AAChE,uDAAsF;AACtF,uDAAyD;AACzD,mEAAgE;AAKnD,QAAA,SAAS,GAAG,GAAG,CAAC;AAEhB,QAAA,UAAU,GAAG,IAAA,mBAAO,EAAC,SAAS,CAAC,CAAC;AAChC,KAAyC,OAAO,CAAC,IAAA,gBAAI,EAAC,kBAAU,EAAE,cAAc,CAAC,CAAC,EAAvE,kBAAU,eAAQ,eAAO,WAA+C;AAEnF,QAAA,aAAa,GAAG,IAAA,2BAAe,EAAC;IAC3C,MAAM,EAAE,OAAO,CAAC,IAAA,gBAAI,EAAC,kBAAU,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;CAC3D,CAAC,CAAC;AAEU,QAAA,OAAO,GAAG,IAAA,uCAAkB,EAAgB;IACvD,aAAa,EAAb,qBAAa;IACb,QAAQ,EAAE,eAAe;IACzB,eAAe,EAAE,aAAa;CAC/B,CAAC,CAAC;AACU,QAAA,WAAW,GAAG,IAAA,gCAAiB,EAAC,eAAO,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -55,7 +55,7 @@ async function start(options = {}) {
|
|
|
55
55
|
await Promise.all([stopCron(), (0, maintenance_task_1.unloadAllActiveSites)(), app.close()]);
|
|
56
56
|
},
|
|
57
57
|
});
|
|
58
|
-
context_1.platformLog.info(`
|
|
58
|
+
context_1.platformLog.info(`ParoiCMS is up and running on port '${context_1.appConf.thisServer.port}', it serves:${getListOfSiteUrls()
|
|
59
59
|
.map((url) => `\n- ${url}`)
|
|
60
60
|
.join("")}`);
|
|
61
61
|
if (context_1.publicPort !== context_1.appConf.thisServer.port) {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,uCAA2C;AAC3C,+DAAuF;AACvF,mFAA0E;AAC1E,qDAA8D;AAC9D,8DAAsC;AACtC,sDAA8B;AAC9B,uCAQmB;AACnB,qEAIsC;AACtC,2EAA2E;AAC3E,qEAAuF;AACvF,qDAA8D;AAC9D,qDAAiD;AACjD,6DAAwD;AAExD,wDAAwF;AACxF,8DAAuE;AACvE,iFAA+E;AAQxE,KAAK,UAAU,KAAK,CAAC,UAAwB,EAAE;IACpD,IAAI,CAAC;QACH,MAAM,qBAAW,CAAC,UAAU,CAAC;QAC7B,IAAA,uCAAwB,GAAE,CAAC;QAE3B,IAAA,+CAAmB,EAAC,EAAE,GAAG,iBAAO,CAAC,cAAc,EAAE,MAAM,EAAE,qBAAW,EAAE,CAAC,CAAC;QACxE,MAAM,SAAS,GAAG,IAAA,gDAAwB,EAAC,iBAAO,CAAC;YACjD,CAAC,CAAC,MAAM,IAAA,6BAAiB,EAAC,iBAAO,CAAC,SAAS,EAAE,OAAO,CAAC,cAAc,CAAC;YACpE,CAAC,CAAC,MAAM,IAAA,qCAAyB,EAAC,iBAAO,CAAC,UAAU,CAAC,CAAC;QAExD,MAAM,IAAA,2BAAiB,EAAC,SAAS,CAAC,CAAC;QACnC,IAAA,2BAAiB,EAAC,MAAM,IAAA,gDAAuB,GAAE,CAAC,CAAC;QAEnD,MAAM,QAAQ,GAAG,IAAA,0BAAa,EAAC,kCAAe,EAAE;YAC9C,aAAa,EAAE,IAAA,oBAAO,EAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;YACpC,MAAM,EAAE,qBAAW;SACpB,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,IAAA,iBAAO,GAAE,CAAC;QAG7B,MAAM,GAAG,GAAG,MAAM,kBAAW,CAAC,MAAM,CAClC,sBAAS,EACT,IAAI,iCAAc,CAAC,UAAU,CAAC,EAC9B;YACE,MAAM,EAAE,IAAI,qCAAgB,EAAE;SAC/B,CACF,CAAC;QACF,GAAG,CAAC,GAAG,CAAC,IAAA,qBAAW,GAAE,CAAC,CAAC;QACvB,GAAG,CAAC,UAAU,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;QACnD,GAAG,CAAC,GAAG,CAAC,wCAAmB,CAAC,CAAC;QAC7B,GAAG,CAAC,GAAG,CAAC,iCAAY,CAAC,CAAC;QACtB,GAAG,CAAC,GAAG,CAAC,0CAAqB,CAAC,CAAC;QAE/B,IAAI,iBAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;YAChC,MAAM,GAAG,CAAC,MAAM,CAAC,iBAAO,CAAC,UAAU,CAAC,IAAI,EAAE,iBAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACzE,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,CAAC,MAAM,CAAC,iBAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC5C,CAAC;QAED,IAAA,+BAAoB,EAAC;YACnB,MAAM,EAAE,qBAAW;YACnB,SAAS,EAAE,KAAK,IAAI,EAAE;gBACpB,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,IAAA,uCAAoB,GAAE,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACvE,CAAC;SACF,CAAC,CAAC;QAEH,qBAAW,CAAC,IAAI,CACd,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,14 +9,14 @@ const jwt_secret_helpers_1 = require("../../../helpers/jwt-secret.helpers");
|
|
|
9
9
|
const special_account_helpers_1 = require("../../../helpers/special-account.helpers");
|
|
10
10
|
const account_model_1 = require("./account.model");
|
|
11
11
|
async function findAccountByIdAndEmail(siteContext, payload) {
|
|
12
|
-
const account = await siteContext.
|
|
12
|
+
const account = await siteContext.cn.getRepository(account_model_1.AccountEntity).findOne({ where: payload });
|
|
13
13
|
if (!account)
|
|
14
14
|
throw new common_1.NotFoundException();
|
|
15
15
|
return account;
|
|
16
16
|
}
|
|
17
17
|
exports.findAccountByIdAndEmail = findAccountByIdAndEmail;
|
|
18
18
|
async function findAccountByEmail(siteContext, email) {
|
|
19
|
-
return await siteContext.
|
|
19
|
+
return await siteContext.cn.getRepository(account_model_1.AccountEntity).findOne({
|
|
20
20
|
where: { email },
|
|
21
21
|
});
|
|
22
22
|
}
|
|
@@ -28,7 +28,7 @@ async function getAccount(siteContext, id) {
|
|
|
28
28
|
if (parsedPlatformAccountId) {
|
|
29
29
|
return (0, data_format_1.formatToAccountObjectType)((0, special_account_helpers_1.getPlatformAdminAccount)(parsedPlatformAccountId));
|
|
30
30
|
}
|
|
31
|
-
const account = await siteContext.
|
|
31
|
+
const account = await siteContext.cn.getRepository(account_model_1.AccountEntity).findOne({
|
|
32
32
|
where: { id },
|
|
33
33
|
select: { id: true, email: true, name: true, passwordResetToken: true },
|
|
34
34
|
});
|
|
@@ -44,7 +44,7 @@ async function getAuthenticatedAccount(siteContext, id) {
|
|
|
44
44
|
if (parsedPlatformAccountId) {
|
|
45
45
|
return (0, data_format_1.formatToAuthenticatedAccountObjectType)((0, special_account_helpers_1.getPlatformAdminAccount)(parsedPlatformAccountId));
|
|
46
46
|
}
|
|
47
|
-
const account = await siteContext.
|
|
47
|
+
const account = await siteContext.cn.getRepository(account_model_1.AccountEntity).findOne({
|
|
48
48
|
where: { id },
|
|
49
49
|
select: { id: true, preferences: true, email: true, name: true, passwordResetToken: true },
|
|
50
50
|
});
|
|
@@ -54,7 +54,7 @@ async function getAuthenticatedAccount(siteContext, id) {
|
|
|
54
54
|
}
|
|
55
55
|
exports.getAuthenticatedAccount = getAuthenticatedAccount;
|
|
56
56
|
async function getAllAccounts(siteContext) {
|
|
57
|
-
const accounts = await siteContext.
|
|
57
|
+
const accounts = await siteContext.cn.getRepository(account_model_1.AccountEntity).find({
|
|
58
58
|
select: { id: true, preferences: true, email: true, name: true, passwordResetToken: true },
|
|
59
59
|
});
|
|
60
60
|
const parsedAccounts = accounts.map((user) => (0, data_format_1.formatToAccountObjectType)(user));
|
|
@@ -62,7 +62,7 @@ async function getAllAccounts(siteContext) {
|
|
|
62
62
|
}
|
|
63
63
|
exports.getAllAccounts = getAllAccounts;
|
|
64
64
|
async function setAccountPreferences(siteContext, accountId, values) {
|
|
65
|
-
await siteContext.
|
|
65
|
+
await siteContext.cn.getRepository(account_model_1.AccountEntity).update(accountId, {
|
|
66
66
|
preferences: JSON.stringify(values),
|
|
67
67
|
});
|
|
68
68
|
}
|
|
@@ -71,7 +71,7 @@ async function createAccount(siteContext, payload) {
|
|
|
71
71
|
const account = await findAccountByEmail(siteContext, payload.email);
|
|
72
72
|
if (account)
|
|
73
73
|
throw new common_1.ConflictException("email already exists");
|
|
74
|
-
const newAccount = await siteContext.
|
|
74
|
+
const newAccount = await siteContext.cn
|
|
75
75
|
.getRepository(account_model_1.AccountEntity)
|
|
76
76
|
.save({ ...payload, preferences: JSON.stringify({ lang: payload.lang }) });
|
|
77
77
|
if (payload.accountType === "googleAccount") {
|
|
@@ -109,7 +109,7 @@ async function updateAccount(siteContext, accountId, payload) {
|
|
|
109
109
|
const account = await findAccountById(siteContext, accountId);
|
|
110
110
|
if (!account)
|
|
111
111
|
throw new common_1.NotFoundException("account don't exists");
|
|
112
|
-
await siteContext.
|
|
112
|
+
await siteContext.cn.getRepository(account_model_1.AccountEntity).update(account.id, payload);
|
|
113
113
|
return (0, data_format_1.formatToAccountObjectType)({
|
|
114
114
|
...account,
|
|
115
115
|
email: payload.email ?? account.email,
|
|
@@ -122,7 +122,7 @@ async function deleteAccount(siteContext, accountId) {
|
|
|
122
122
|
const account = await findAccountById(siteContext, accountId);
|
|
123
123
|
if (!account)
|
|
124
124
|
throw new common_1.NotFoundException("account don't exists");
|
|
125
|
-
await siteContext.
|
|
125
|
+
await siteContext.cn.getRepository(account_model_1.AccountEntity).delete(account.id);
|
|
126
126
|
}
|
|
127
127
|
exports.deleteAccount = deleteAccount;
|
|
128
128
|
async function resetAccountPassword(siteContext, accountId) {
|
|
@@ -134,13 +134,13 @@ async function resetAccountPassword(siteContext, accountId) {
|
|
|
134
134
|
}
|
|
135
135
|
exports.resetAccountPassword = resetAccountPassword;
|
|
136
136
|
function findAccountById(siteContext, id) {
|
|
137
|
-
return siteContext.
|
|
137
|
+
return siteContext.cn.getRepository(account_model_1.AccountEntity).findOne({
|
|
138
138
|
where: { id },
|
|
139
139
|
});
|
|
140
140
|
}
|
|
141
141
|
async function resetAccountToken(siteContext, account) {
|
|
142
142
|
const passwordResetToken = (0, jwt_secret_helpers_1.makeSecret)(60);
|
|
143
|
-
await siteContext.
|
|
143
|
+
await siteContext.cn
|
|
144
144
|
.getRepository(account_model_1.AccountEntity)
|
|
145
145
|
.update(account.id, { passwordHash: null, passwordResetToken });
|
|
146
146
|
const subject = context_1.simpleI18n.translate({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/account/account.queries.ts"],"names":[],"mappings":";;;AAAA,2CAAsE;AACtE,6DAGqC;AACrC,4EAAiE;AACjE,8CAA8C;AAC9C,4EAAiE;AACjE,sFAKkD;AAElD,mDAAgD;AAQzC,KAAK,UAAU,uBAAuB,CAC3C,WAAwB,EACxB,OAAsC;IAEtC,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"account.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/account/account.queries.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,16 +2,16 @@ import type { ParsedSectionId } from "@paroicms/anywhere-lib";
|
|
|
2
2
|
import type { SiteContext } from "../../../site-context/site-context.types";
|
|
3
3
|
import { DocumentEntity } from "./document.model";
|
|
4
4
|
import type { TermDocumentObjectType } from "./document.schema";
|
|
5
|
-
export declare function document({
|
|
5
|
+
export declare function document({ cn }: SiteContext, id: {
|
|
6
6
|
leafId: string;
|
|
7
7
|
lang: string;
|
|
8
8
|
}): Promise<DocumentEntity>;
|
|
9
9
|
export declare function getOneDocument(siteContext: SiteContext, id: ParsedSectionId): Promise<DocumentEntity>;
|
|
10
10
|
export declare function findOneDocument(siteContext: SiteContext, id: ParsedSectionId): Promise<DocumentEntity | undefined>;
|
|
11
|
-
export declare function findOneTermDocument({
|
|
12
|
-
export declare function getParentSectionIdOf(siteContext: Pick<SiteContext, "
|
|
13
|
-
export declare function getParentLeafIdOf(siteContext: Pick<SiteContext, "
|
|
14
|
-
export declare function getParentDocumentIdsOf(siteContext: Pick<SiteContext, "
|
|
11
|
+
export declare function findOneTermDocument({ cn }: SiteContext, { lang, leafId }: ParsedSectionId): Promise<TermDocumentObjectType | undefined>;
|
|
12
|
+
export declare function getParentSectionIdOf(siteContext: Pick<SiteContext, "cn">, { lang, leafId }: ParsedSectionId): Promise<ParsedSectionId | undefined>;
|
|
13
|
+
export declare function getParentLeafIdOf(siteContext: Pick<SiteContext, "cn">, leafId: string): Promise<string | undefined>;
|
|
14
|
+
export declare function getParentDocumentIdsOf(siteContext: Pick<SiteContext, "cn" | "siteSchema">, options: {
|
|
15
15
|
langs?: string[];
|
|
16
16
|
leafId: string;
|
|
17
17
|
}): Promise<ParsedSectionId[]>;
|
|
@@ -4,23 +4,23 @@ exports.getParentDocumentIdsOf = exports.getParentLeafIdOf = exports.getParentSe
|
|
|
4
4
|
const common_1 = require("@nestjs/common");
|
|
5
5
|
const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
|
|
6
6
|
const document_model_1 = require("./document.model");
|
|
7
|
-
async function document({
|
|
8
|
-
return await
|
|
7
|
+
async function document({ cn }, id) {
|
|
8
|
+
return await cn.getRepository(document_model_1.DocumentEntity).findOneOrFail({ where: id });
|
|
9
9
|
}
|
|
10
10
|
exports.document = document;
|
|
11
11
|
async function getOneDocument(siteContext, id) {
|
|
12
|
-
const document = await siteContext.
|
|
12
|
+
const document = await siteContext.cn.getRepository(document_model_1.DocumentEntity).findOne({ where: id });
|
|
13
13
|
if (!document)
|
|
14
14
|
throw new common_1.NotFoundException(`can't find document '${id.lang}:${id.leafId}'`);
|
|
15
15
|
return document;
|
|
16
16
|
}
|
|
17
17
|
exports.getOneDocument = getOneDocument;
|
|
18
18
|
async function findOneDocument(siteContext, id) {
|
|
19
|
-
return (
|
|
19
|
+
return (await siteContext.cn.getRepository(document_model_1.DocumentEntity).findOne({ where: id })) ?? undefined;
|
|
20
20
|
}
|
|
21
21
|
exports.findOneDocument = findOneDocument;
|
|
22
|
-
async function findOneTermDocument({
|
|
23
|
-
const rows = await
|
|
22
|
+
async function findOneTermDocument({ cn }, { lang, leafId }) {
|
|
23
|
+
const rows = await cn
|
|
24
24
|
.createQueryBuilder()
|
|
25
25
|
.select("d.title", "title")
|
|
26
26
|
.addSelect("d.lang", "lang")
|
|
@@ -67,7 +67,7 @@ function getSearchedItems(rows, lang) {
|
|
|
67
67
|
return result;
|
|
68
68
|
}
|
|
69
69
|
async function getParentSectionIdOf(siteContext, { lang, leafId }) {
|
|
70
|
-
const row = await siteContext.
|
|
70
|
+
const row = await siteContext.cn
|
|
71
71
|
.createQueryBuilder()
|
|
72
72
|
.select("l2.id", "parentId")
|
|
73
73
|
.from("PaLeaf", "l")
|
|
@@ -87,7 +87,7 @@ async function getParentSectionIdOf(siteContext, { lang, leafId }) {
|
|
|
87
87
|
}
|
|
88
88
|
exports.getParentSectionIdOf = getParentSectionIdOf;
|
|
89
89
|
async function getParentLeafIdOf(siteContext, leafId) {
|
|
90
|
-
const row = await siteContext.
|
|
90
|
+
const row = await siteContext.cn
|
|
91
91
|
.createQueryBuilder()
|
|
92
92
|
.select("l.parentId", "id")
|
|
93
93
|
.from("PaLeaf", "l")
|
|
@@ -100,7 +100,7 @@ async function getParentLeafIdOf(siteContext, leafId) {
|
|
|
100
100
|
exports.getParentLeafIdOf = getParentLeafIdOf;
|
|
101
101
|
async function getParentDocumentIdsOf(siteContext, options) {
|
|
102
102
|
const langs = options.langs ?? siteContext.siteSchema.langs;
|
|
103
|
-
const rows = await siteContext.
|
|
103
|
+
const rows = await siteContext.cn
|
|
104
104
|
.createQueryBuilder()
|
|
105
105
|
.select("l.parentId", "parentId")
|
|
106
106
|
.addSelect("d.lang", "lang")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-documents.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/document/load-documents.queries.ts"],"names":[],"mappings":";;;AAAA,2CAAmD;AACnD,oEAAmE;AAGnE,qDAAkD;AAG3C,KAAK,UAAU,QAAQ,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"load-documents.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/document/load-documents.queries.ts"],"names":[],"mappings":"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"}
|