@paroicms/server 1.78.1 → 1.79.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/common/child-ordering-query.d.ts +2 -3
- package/dist/common/child-ordering-query.js +14 -18
- package/dist/common/child-ordering-query.js.map +1 -1
- package/dist/helpers/running-instance-connector.js +2 -7
- package/dist/helpers/running-instance-connector.js.map +1 -1
- package/dist/modules/core/account/account.queries.js +53 -90
- package/dist/modules/core/account/account.queries.js.map +1 -1
- package/dist/modules/core/document/load-documents.queries.js +33 -47
- package/dist/modules/core/document/load-documents.queries.js.map +1 -1
- package/dist/modules/core/document/save-documents.queries.js +78 -168
- package/dist/modules/core/document/save-documents.queries.js.map +1 -1
- package/dist/modules/core/fields/load-fields-of.queries.js +8 -10
- package/dist/modules/core/fields/load-fields-of.queries.js.map +1 -1
- package/dist/modules/core/fields/load-fields.queries.js +12 -24
- package/dist/modules/core/fields/load-fields.queries.js.map +1 -1
- package/dist/modules/core/fields/save-fields.queries.js +22 -34
- package/dist/modules/core/fields/save-fields.queries.js.map +1 -1
- package/dist/modules/core/labeling/labeling.queries.js +21 -27
- package/dist/modules/core/labeling/labeling.queries.js.map +1 -1
- package/dist/modules/core/node/node.queries.d.ts +1 -1
- package/dist/modules/core/node/node.queries.js +37 -66
- package/dist/modules/core/node/node.queries.js.map +1 -1
- package/dist/modules/core/node/ordered-node.queries.js +12 -24
- package/dist/modules/core/node/ordered-node.queries.js.map +1 -1
- package/dist/modules/core/nodel/nodel-wrap.resolver.js +7 -12
- package/dist/modules/core/nodel/nodel-wrap.resolver.js.map +1 -1
- package/dist/modules/core/nodel/nodel.queries.d.ts +2 -2
- package/dist/modules/core/nodel/nodel.queries.js +54 -66
- package/dist/modules/core/nodel/nodel.queries.js.map +1 -1
- package/dist/modules/core/part/part-node.queries.d.ts +4 -4
- package/dist/modules/core/part/part-node.queries.js +26 -47
- package/dist/modules/core/part/part-node.queries.js.map +1 -1
- package/dist/modules/core/part/part.queries.js +86 -105
- package/dist/modules/core/part/part.queries.js.map +1 -1
- package/dist/modules/public-api/password-reset/password-reset.service.js +19 -17
- 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 +53 -31
- package/dist/modules/public-api/search-text/search-text.queries.js.map +1 -1
- package/dist/modules/public-site/feed/feed-generator.js +25 -18
- package/dist/modules/public-site/feed/feed-generator.js.map +1 -1
- package/dist/modules/public-site/public-route/make-url.js +44 -30
- package/dist/modules/public-site/public-route/make-url.js.map +1 -1
- package/dist/modules/public-site/public-route/raw-document-payload.js +50 -40
- package/dist/modules/public-site/public-route/raw-document-payload.js.map +1 -1
- package/dist/public-payload/doc-values.queries.d.ts +2 -2
- package/dist/public-payload/doc-values.queries.js +32 -33
- package/dist/public-payload/doc-values.queries.js.map +1 -1
- package/dist/public-payload/excerpt.queries.js +9 -8
- package/dist/public-payload/excerpt.queries.js.map +1 -1
- package/dist/public-payload/get-siblings.queries.js +38 -47
- package/dist/public-payload/get-siblings.queries.js.map +1 -1
- package/dist/public-payload/parts.queries.js +34 -38
- package/dist/public-payload/parts.queries.js.map +1 -1
- package/dist/public-payload/taxonomies.queries.js +17 -15
- package/dist/public-payload/taxonomies.queries.js.map +1 -1
- package/dist/public-payload/translations.queries.js +5 -7
- package/dist/public-payload/translations.queries.js.map +1 -1
- package/dist/site-context/site-context.types.d.ts +2 -2
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +11 -11
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { OrderByItem, ScDocumentType, ScSorting } from "@paroicms/public-anywhere-lib";
|
|
2
|
-
import type {
|
|
2
|
+
import type { Knex } from "knex";
|
|
3
3
|
import type { SiteContext } from "../site-context/site-context.types.js";
|
|
4
4
|
export declare function applyRegularChildrenSortingOnQuery(siteContext: Pick<SiteContext, "cn" | "siteSchema">, options: {
|
|
5
|
-
query:
|
|
5
|
+
query: Knex.QueryBuilder;
|
|
6
6
|
parentDocumentType: ScDocumentType;
|
|
7
7
|
regularChildrenSorting?: ScSorting;
|
|
8
8
|
leftJoinDocument?: boolean;
|
|
@@ -12,4 +12,3 @@ export declare function applyRegularChildrenSortingOnQuery(siteContext: Pick<Sit
|
|
|
12
12
|
ordered: boolean;
|
|
13
13
|
orderBy?: string;
|
|
14
14
|
};
|
|
15
|
-
export declare function formatTypeOrmDirection(direction: "asc" | "desc"): "ASC" | "DESC";
|
|
@@ -9,20 +9,23 @@ export function applyRegularChildrenSortingOnQuery(siteContext, options) {
|
|
|
9
9
|
const orderPropertiesMap = makeMapOfOrderProperties(siteContext, parentDocumentType.regularChildren);
|
|
10
10
|
const orderByQb = orderByAsString ? makeOrderByAsStringQB() : query;
|
|
11
11
|
if (orderBy === "manual") {
|
|
12
|
-
query.leftJoin("PaOrderedNode
|
|
13
|
-
orderByQb.orderBy("o.orderNum", "
|
|
12
|
+
query.leftJoin("PaOrderedNode as o", "o.nodeId", "l.id");
|
|
13
|
+
orderByQb.orderBy("o.orderNum", "asc").orderBy("l.id", "asc");
|
|
14
14
|
}
|
|
15
15
|
else {
|
|
16
16
|
let index = 0;
|
|
17
17
|
for (const { fieldName, direction } of orderBy) {
|
|
18
18
|
if (fieldName === "title") {
|
|
19
19
|
if (leftJoinDocument) {
|
|
20
|
-
query.leftJoin("PaDocument
|
|
20
|
+
query.leftJoin("PaDocument as d", {
|
|
21
|
+
"d.nodeId": "s.nodeId",
|
|
22
|
+
"d.language": "s.language",
|
|
23
|
+
});
|
|
21
24
|
}
|
|
22
|
-
orderByQb.
|
|
25
|
+
orderByQb.orderBy("d.title", direction);
|
|
23
26
|
}
|
|
24
27
|
else if (fieldName === "publishDate") {
|
|
25
|
-
orderByQb.
|
|
28
|
+
orderByQb.orderBy("l.publishDate", direction);
|
|
26
29
|
}
|
|
27
30
|
else {
|
|
28
31
|
const orderProperties = orderPropertiesMap.get(fieldName);
|
|
@@ -39,12 +42,12 @@ export function applyRegularChildrenSortingOnQuery(siteContext, options) {
|
|
|
39
42
|
else {
|
|
40
43
|
throw new Error(`invalid data type '${dataType}'`);
|
|
41
44
|
}
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
orderByQb.
|
|
45
|
+
query.leftJoin(`PaFieldVarchar as f${index}`, {
|
|
46
|
+
"f${index}.field": fieldName,
|
|
47
|
+
"f${index}.nodeId": "s.nodeId",
|
|
48
|
+
"f${index}.language": localized ? "s.language" : siteContext.cn.raw("?", [dbAnyLanguage]),
|
|
49
|
+
});
|
|
50
|
+
orderByQb.orderBy(orderByField, direction);
|
|
48
51
|
}
|
|
49
52
|
++index;
|
|
50
53
|
}
|
|
@@ -94,13 +97,6 @@ function makeOrderByAsStringQB() {
|
|
|
94
97
|
};
|
|
95
98
|
return qb;
|
|
96
99
|
}
|
|
97
|
-
export function formatTypeOrmDirection(direction) {
|
|
98
|
-
if (direction === "asc")
|
|
99
|
-
return "ASC";
|
|
100
|
-
if (direction === "desc")
|
|
101
|
-
return "DESC";
|
|
102
|
-
throw new Error(`Invalid direction ${direction}`);
|
|
103
|
-
}
|
|
104
100
|
function toOrderByOrManual(regularChildrenSorting) {
|
|
105
101
|
if (!regularChildrenSorting)
|
|
106
102
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child-ordering-query.js","sourceRoot":"","sources":["../../src/common/child-ordering-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,iCAAiC,CAAC;AAG/E,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAG9C,MAAM,UAAU,kCAAkC,CAChD,WAAmD,EACnD,OAOC;IAED,MAAM,EAAE,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;IACjF,MAAM,OAAO,GACX,OAAO,CAAC,OAAO;QACf,iBAAiB,CAAC,OAAO,CAAC,sBAAsB,IAAI,kBAAkB,CAAC,sBAAsB,CAAC,CAAC;IACjG,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAExC,MAAM,kBAAkB,GAAG,wBAAwB,CACjD,WAAW,EACX,kBAAkB,CAAC,eAAe,CACnC,CAAC;IAEF,MAAM,SAAS,GAAG,eAAe,CAAC,CAAC,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;IAEpE,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;QACzB,KAAK,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"child-ordering-query.js","sourceRoot":"","sources":["../../src/common/child-ordering-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,16 +42,11 @@ async function createAccount(fqdn, account, options) {
|
|
|
42
42
|
const { siteNodeId } = siteContext.siteIds;
|
|
43
43
|
const siteType = siteContext.siteSchema.nodeTypes._site;
|
|
44
44
|
const { kind, email, name } = account;
|
|
45
|
-
await siteContext.cn
|
|
46
|
-
.createQueryBuilder()
|
|
47
|
-
.insert()
|
|
48
|
-
.into("PaAccount")
|
|
49
|
-
.values({
|
|
45
|
+
await siteContext.cn("PaAccount").insert({
|
|
50
46
|
email,
|
|
51
47
|
name,
|
|
52
48
|
passwordHash: kind === "local" ? await hashPassword(account.password) : undefined,
|
|
53
|
-
})
|
|
54
|
-
.execute();
|
|
49
|
+
});
|
|
55
50
|
if (options?.asContactEmail) {
|
|
56
51
|
await saveFieldValues(siteContext, {
|
|
57
52
|
typeName: siteType.typeName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"running-instance-connector.js","sourceRoot":"","sources":["../../src/helpers/running-instance-connector.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,4BAA4B,EAC5B,4BAA4B,GAC7B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAqC,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAahG,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAChG,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EACL,oBAAoB,EACpB,sBAAsB,EACtB,cAAc,GACf,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,+CAA+C,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAC5F,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,MAAM,UAAU,8BAA8B;IAC5C,OAAO;QACL,eAAe,EAAE,CAAC,QAAQ,EAAE,EAAE;YAC5B,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBACjC,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;YAChF,CAAC;YAED,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;YACpE,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,SAAS,QAAQ,aAAa,CAAC,CAAC;YAC3D,OAAO;gBACL,GAAG,IAAI;gBACP,OAAO,EAAE,IAAI,CAAC,OAAO,KAAK,KAAK;aAChC,CAAC;QACJ,CAAC;QACD,oBAAoB,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACnC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;YAC3D,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;QACjC,CAAC;QACD,aAAa;QACb,gBAAgB;QAChB,qBAAqB;QACrB,2BAA2B;QAC3B,uBAAuB;KACxB,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,IAAY,EACZ,OAAqB,EACrB,OAAsC;IAEtC,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC;IAC3C,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC;IAExD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAEtC,MAAM,WAAW,CAAC,EAAE;SACjB,kBAAkB,EAAE;SACpB,MAAM,EAAE;SACR,IAAI,CAAC,WAAW,CAAC;SACjB,MAAM,CAAC;QACN,KAAK;QACL,IAAI;QACJ,YAAY,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;KAClF,CAAC;SACD,OAAO,EAAE,CAAC;IAEb,IAAI,OAAO,EAAE,cAAc,EAAE,CAAC;QAC5B,MAAM,eAAe,CAAC,WAAW,EAAE;YACjC,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,MAAM,EAAE,UAAU;YAClB,MAAM,EAAE;gBACN,YAAY,EAAE,KAAK;aACpB;YACD,KAAK,EAAE,IAAI;SACZ,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,KAAK,UAAU,gBAAgB,CAAC,IAAY,EAAE,MAAyB;IACrE,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC;IAC3C,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC;IAExD,MAAM,EAAE,uBAAuB,EAAE,WAAW,EAAE,GAAG,sBAAsB,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAEjG,KAAK,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,uBAAuB,CAAC,EAAE,CAAC;QACzE,MAAM,eAAe,CAAC,WAAW,EAAE;YACjC,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,MAAM,EAAE,UAAU;YAClB,QAAQ;YACR,MAAM;YACN,KAAK,EAAE,IAAI;SACZ,CAAC,CAAC;IACL,CAAC;IAED,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,MAAM,aAAa,CAAC,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;IACrE,CAAC;AACH,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,IAAY,EACZ,OAGC;IAED,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,4BAA4B,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAChF,MAAM,EAAE,uBAAuB,EAAE,WAAW,EAAE,GAAG,sBAAsB,CACrE,OAAO,CAAC,MAAM,EACd,QAAQ,CAAC,MAAM,IAAI,EAAE,CACtB,CAAC;IAEF,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QAClB,KAAK,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9D,MAAM,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;YACjC,MAAM,cAAc,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAED,KAAK,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,uBAAuB,CAAC,EAAE,CAAC;QACzE,MAAM,eAAe,CAAC,WAAW,EAAE;YACjC,QAAQ;YACR,MAAM;YACN,QAAQ;YACR,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAED,IAAI,OAAO,CAAC,aAAa,IAAI,QAAQ,CAAC,iBAAiB,EAAE,CAAC;QACxD,MAAM,YAAY,CAAC,WAAW,EAAE;YAC9B,MAAM;YACN,QAAQ;YACR,MAAM,EAAE,wBAAwB,CAAC,MAAM,CAAC;YACxC,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,IAAI;SACjC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,MAAM,aAAa,CAAC,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACjE,CAAC;AACH,CAAC;AAED,KAAK,UAAU,2BAA2B,CACxC,IAAY,EACZ,OAGC;IAED,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAC3C,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,UAAU,GAAG,iBAAiB,CAClC,WAAW,CAAC,UAAU,EACtB,MAAM,aAAa,CAAC,WAAW,EAAE,YAAY,CAAC,CAC/C,CAAC;IACF,IAAI,UAAU,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CAAC,wCAAwC,UAAU,CAAC,QAAQ,GAAG,CAAC,CAAC;IAClF,CAAC;IAED,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QAClC,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpD,MAAM,IAAI,KAAK,CAAC,SAAS,QAAQ,gCAAgC,UAAU,CAAC,QAAQ,GAAG,CAAC,CAAC;QAC3F,CAAC;QACD,MAAM,SAAS,GAAG,4BAA4B,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAEjF,MAAM,EAAE,uBAAuB,EAAE,WAAW,EAAE,GAAG,sBAAsB,CACrE,OAAO,CAAC,MAAM,EACd,SAAS,CAAC,MAAM,IAAI,EAAE,CACvB,CAAC;QACF,IAAI,MAA0B,CAAC;QAE/B,KAAK,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,uBAAuB,CAAC,EAAE,CAAC;YACzE,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,CAAC;YACxC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAErD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,MAAM,OAAO,GAAG,MAAM,sBAAsB,CAAC,WAAW,EAAE;oBACxD,QAAQ,EAAE;wBACR,MAAM,EAAE,YAAY;wBACpB,QAAQ;qBACT;oBACD,MAAM,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE;oBACjC,UAAU,EAAE,IAAI;iBACjB,CAAC,CAAC;gBACH,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAC1B,CAAC;iBAAM,CAAC;gBACN,MAAM,oBAAoB,CAAC,WAAW,EAAE;oBACtC,QAAQ;oBACR,MAAM;oBACN,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;oBACvB,UAAU,EAAE,IAAI;iBACjB,CAAC,CAAC;YACL,CAAC;YAED,MAAM,eAAe,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAC7E,CAAC;QAED,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,IAAI,OAAO,CAAC,aAAa,IAAI,SAAS,CAAC,iBAAiB,EAAE,CAAC;gBACzD,MAAM,YAAY,CAAC,WAAW,EAAE;oBAC9B,MAAM;oBACN,QAAQ,EAAE,SAAS;oBACnB,MAAM,EAAE,wBAAwB,CAAC,MAAM,CAAC;oBACxC,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,IAAI;iBACjC,CAAC,CAAC;YACL,CAAC;YAED,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;gBACrC,MAAM,aAAa,CAAC,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;YAClE,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED,KAAK,UAAU,uBAAuB,CACpC,IAAY,EACZ,OAGC;IAED,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAC3C,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,UAAU,GAAG,iBAAiB,CAClC,WAAW,CAAC,UAAU,EACtB,MAAM,aAAa,CAAC,WAAW,EAAE,YAAY,CAAC,CAC/C,CAAC;IACF,IAAI,UAAU,CAAC,IAAI,KAAK,UAAU,IAAI,UAAU,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACjE,MAAM,IAAI,KAAK,CAAC,oCAAoC,UAAU,CAAC,QAAQ,GAAG,CAAC,CAAC;IAC9E,CAAC;IAED,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QAClC,MAAM,QAAQ,GACZ,UAAU,CAAC,IAAI,KAAK,UAAU;YAC5B,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC3D,CAAC,CAAC,UAAU,CAAC,IAAI,KAAK,MAAM;gBAC1B,CAAC,CAAC,UAAU,CAAC,IAAI;gBACjB,CAAC,CAAC,SAAS,CAAC;QAClB,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpD,MAAM,IAAI,KAAK,CAAC,SAAS,QAAQ,uBAAuB,UAAU,CAAC,QAAQ,GAAG,CAAC,CAAC;QAClF,CAAC;QAED,MAAM,QAAQ,GAAG,iBAAiB,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACrE,MAAM,EAAE,uBAAuB,EAAE,WAAW,EAAE,GAAG,sBAAsB,CACrE,OAAO,CAAC,MAAM,EACd,QAAQ,CAAC,MAAM,IAAI,EAAE,CACtB,CAAC;QACF,IAAI,MAA0B,CAAC;QAE/B,KAAK,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,uBAAuB,CAAC,EAAE,CAAC;YACzE,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,WAAW,EAAE;oBACpD,aAAa,EAAE;wBACb,MAAM,EAAE,YAAY;wBACpB,QAAQ;qBACT;oBACD,QAAQ,EAAE,QAAQ,CAAC,QAAQ;oBAC3B,QAAQ;iBACT,CAAC,CAAC;gBACH,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAC1B,CAAC;iBAAM,CAAC;gBACN,MAAM,gBAAgB,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;YAC5D,CAAC;YAED,MAAM,eAAe,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAC7E,CAAC;QAED,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;gBACrC,MAAM,aAAa,CAAC,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YACjE,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAQD,KAAK,UAAU,aAAa,CAC1B,WAAwB,EACxB,UAAsB,EACtB,MAAc,EACd,QAAoB;IAEpB,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC;IAClD,MAAM,MAAM,GAAG,gBAAgB,CAAC,WAAW,EAAE;QAC3C,SAAS;QACT,MAAM;QACN,QAAQ;KACT,CAAC,CAAC;IACH,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,YAAY,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IACtE,CAAC;AACH,CAAC;AAED,KAAK,UAAU,YAAY,CACzB,WAAwB,EACxB,OAKC;IAED,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACnD,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAChC,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,mCAAmC,IAAI,GAAG,CAAC,CAAC;IAC9D,CAAC;IACD,MAAM,cAAc,CAClB,WAAW,EACX;QACE,UAAU;QACV,YAAY,EAAE,QAAQ;QACtB,OAAO,EAAE,UAAU,CAAC,UAAU;QAC9B,SAAS;KACV,EACD;QACE,MAAM;QACN,QAAQ;QACR,MAAM;KACP,CACF,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAC7B,MAAyB,EACzB,UAAyB;IAOzB,MAAM,uBAAuB,GAAwC,EAAE,CAAC;IACxE,MAAM,MAAM,GAAiB,EAAE,CAAC;IAEhC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,OAAO;YAAE,SAAS;QACvB,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;QAC/C,IAAI,QAAQ,KAAK,SAAS,CAAC,QAAQ,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CACb,UAAU,SAAS,CAAC,IAAI,yBAAyB,SAAS,CAAC,QAAQ,cAAc,QAAQ,GAAG,CAC7F,CAAC;QACJ,CAAC;QACD,IAAI,SAAS,KAAK,SAAS,CAAC,SAAS,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CACb,UAAU,SAAS,CAAC,IAAI,eAAe,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,GAAG,CAC9F,CAAC;QACJ,CAAC;QAED,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;YACzB,IAAI,CAAC,KAAK;gBAAE,SAAS;YACrB,IAAI,SAAS,EAAE,CAAC;gBACd,KAAK,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;oBAClD,IAAI,CAAC,CAAC;wBAAE,SAAS;oBACjB,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;gBACxD,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAClD,CAAC;QACH,CAAC;aAAM,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAClC,IAAI,CAAC,KAAK;gBAAE,SAAS;YACrB,IAAI,SAAS,EAAE,CAAC;gBACd,KAAK,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;oBAClD,IAAI,CAAC,CAAC;wBAAE,SAAS;oBACjB,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;gBACvD,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;YACjD,CAAC;QACH,CAAC;aAAM,IAAI,SAAS,EAAE,CAAC;YACrB,KAAK,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClD,uBAAuB,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACzC,uBAAuB,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YACjF,CAAC;QACH,CAAC;aAAM,CAAC;YACN,uBAAuB,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;YACpC,uBAAuB,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAChF,CAAC;IACH,CAAC;IAED,OAAO,EAAE,uBAAuB,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC;AAC1D,CAAC;AAED,SAAS,YAAY,CACnB,SAAsB,EACtB,KAAyD;IAEzD,IAAI,SAAS,CAAC,QAAQ,KAAK,YAAY;QACrC,OAAO;YACL,KAAK,EAAE,KAAK;SACb,CAAC;IACJ,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
1
|
+
{"version":3,"file":"running-instance-connector.js","sourceRoot":"","sources":["../../src/helpers/running-instance-connector.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,16 +6,14 @@ import { sendMail } from "../../../common/mail/sendMail.helpers.js";
|
|
|
6
6
|
import { simpleI18n } from "../../../context.js";
|
|
7
7
|
import { getDevAccount, getPlatformAdminAccount, isDevAccountId, parsePlatformAdminAccountId, } from "../../../helpers/special-account.helpers.js";
|
|
8
8
|
export async function findAccountByIdAndEmail(siteContext, payload) {
|
|
9
|
-
const account = await siteContext
|
|
10
|
-
.
|
|
11
|
-
.
|
|
12
|
-
.
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
.
|
|
17
|
-
.andWhere("a.email = :email", { email: payload.email })
|
|
18
|
-
.getRawOne();
|
|
9
|
+
const account = await siteContext
|
|
10
|
+
.cn("PaAccount as a")
|
|
11
|
+
.select("a.id", "a.email", "a.name", "a.preferences")
|
|
12
|
+
.where({
|
|
13
|
+
"a.id": payload.id,
|
|
14
|
+
"a.email": payload.email,
|
|
15
|
+
})
|
|
16
|
+
.first();
|
|
19
17
|
if (!account)
|
|
20
18
|
throw new ApiError("Account not found", { status: 404 });
|
|
21
19
|
return {
|
|
@@ -26,16 +24,11 @@ export async function findAccountByIdAndEmail(siteContext, payload) {
|
|
|
26
24
|
};
|
|
27
25
|
}
|
|
28
26
|
export async function findAccountByEmail(siteContext, email) {
|
|
29
|
-
const account = await siteContext
|
|
30
|
-
.
|
|
31
|
-
.
|
|
32
|
-
.
|
|
33
|
-
.
|
|
34
|
-
.addSelect("a.preferences", "preferences")
|
|
35
|
-
.addSelect("a.passwordHash", "passwordHash")
|
|
36
|
-
.from("PaAccount", "a")
|
|
37
|
-
.where("a.email = :email", { email })
|
|
38
|
-
.getRawOne();
|
|
27
|
+
const account = await siteContext
|
|
28
|
+
.cn("PaAccount as a")
|
|
29
|
+
.select(["a.id", "a.email", "a.name", "a.preferences", "a.passwordHash"])
|
|
30
|
+
.where("a.email", email)
|
|
31
|
+
.first();
|
|
39
32
|
if (!account)
|
|
40
33
|
return;
|
|
41
34
|
return {
|
|
@@ -53,15 +46,11 @@ export async function getAccount(siteContext, id) {
|
|
|
53
46
|
if (parsedPlatformAccountId) {
|
|
54
47
|
return formatToAccountObjectType(getPlatformAdminAccount(parsedPlatformAccountId));
|
|
55
48
|
}
|
|
56
|
-
const found = await siteContext
|
|
57
|
-
.
|
|
58
|
-
.select("a.id", "
|
|
59
|
-
.
|
|
60
|
-
.
|
|
61
|
-
.addSelect("a.passwordResetToken", "passwordResetToken")
|
|
62
|
-
.from("PaAccount", "a")
|
|
63
|
-
.where("a.id = :id", { id })
|
|
64
|
-
.getRawOne();
|
|
49
|
+
const found = await siteContext
|
|
50
|
+
.cn("PaAccount as a")
|
|
51
|
+
.select(["a.id", "a.email", "a.name", "a.passwordResetToken"])
|
|
52
|
+
.where("a.id", id)
|
|
53
|
+
.first();
|
|
65
54
|
if (!found)
|
|
66
55
|
throw new ApiError("Account not found", { status: 404 });
|
|
67
56
|
const account = {
|
|
@@ -79,16 +68,11 @@ export async function getAuthenticatedAccount(siteContext, id) {
|
|
|
79
68
|
if (parsedPlatformAccountId) {
|
|
80
69
|
return formatToAuthenticatedAccountObjectType(getPlatformAdminAccount(parsedPlatformAccountId));
|
|
81
70
|
}
|
|
82
|
-
const found = await siteContext
|
|
83
|
-
.
|
|
84
|
-
.select("a.id", "
|
|
85
|
-
.
|
|
86
|
-
.
|
|
87
|
-
.addSelect("a.preferences", "preferences")
|
|
88
|
-
.addSelect("a.passwordResetToken", "passwordResetToken")
|
|
89
|
-
.from("PaAccount", "a")
|
|
90
|
-
.where("a.id = :id", { id })
|
|
91
|
-
.getRawOne();
|
|
71
|
+
const found = await siteContext
|
|
72
|
+
.cn("PaAccount as a")
|
|
73
|
+
.select(["a.id", "a.email", "a.name", "a.preferences", "a.passwordResetToken"])
|
|
74
|
+
.where("a.id", id)
|
|
75
|
+
.first();
|
|
92
76
|
if (!found)
|
|
93
77
|
throw new ApiError("Account not found", { status: 404 });
|
|
94
78
|
const account = {
|
|
@@ -101,15 +85,9 @@ export async function getAuthenticatedAccount(siteContext, id) {
|
|
|
101
85
|
return formatToAuthenticatedAccountObjectType(account);
|
|
102
86
|
}
|
|
103
87
|
export async function getAllAccounts(siteContext) {
|
|
104
|
-
const accounts = await siteContext
|
|
105
|
-
.
|
|
106
|
-
.
|
|
107
|
-
.addSelect("a.email", "email")
|
|
108
|
-
.addSelect("a.name", "name")
|
|
109
|
-
.addSelect("a.preferences", "preferences")
|
|
110
|
-
.addSelect("a.passwordResetToken", "passwordResetToken")
|
|
111
|
-
.from("PaAccount", "a")
|
|
112
|
-
.getRawMany();
|
|
88
|
+
const accounts = await siteContext
|
|
89
|
+
.cn("PaAccount as a")
|
|
90
|
+
.select(["a.id", "a.email", "a.name", "a.preferences", "a.passwordResetToken"]);
|
|
113
91
|
const parsedAccounts = accounts
|
|
114
92
|
.map((account) => {
|
|
115
93
|
return {
|
|
@@ -124,29 +102,25 @@ export async function getAllAccounts(siteContext) {
|
|
|
124
102
|
return parsedAccounts;
|
|
125
103
|
}
|
|
126
104
|
export async function setAccountPreferences(siteContext, accountId, values) {
|
|
127
|
-
await siteContext
|
|
128
|
-
.
|
|
129
|
-
.update("PaAccount")
|
|
130
|
-
.set({ preferences: JSON.stringify(values) })
|
|
105
|
+
await siteContext
|
|
106
|
+
.cn("PaAccount")
|
|
131
107
|
.where({ id: accountId })
|
|
132
|
-
.
|
|
108
|
+
.update({ preferences: JSON.stringify(values) });
|
|
133
109
|
}
|
|
134
110
|
export async function createAccount(siteContext, payload) {
|
|
135
111
|
const account = await findAccountByEmail(siteContext, payload.email);
|
|
136
112
|
if (account)
|
|
137
113
|
throw new ApiError("email already exists", { status: 409 });
|
|
138
|
-
const
|
|
139
|
-
.
|
|
140
|
-
.insert(
|
|
141
|
-
.into("PaAccount")
|
|
142
|
-
.values({
|
|
114
|
+
const [inserted] = await siteContext
|
|
115
|
+
.cn("PaAccount")
|
|
116
|
+
.insert({
|
|
143
117
|
email: payload.email,
|
|
144
118
|
name: payload.name,
|
|
145
119
|
preferences: JSON.stringify({ language: payload.language }),
|
|
146
120
|
})
|
|
147
|
-
.
|
|
148
|
-
const
|
|
149
|
-
const newAccount = await findAccountById(siteContext,
|
|
121
|
+
.returning("id");
|
|
122
|
+
const id = strVal(inserted.id);
|
|
123
|
+
const newAccount = await findAccountById(siteContext, id);
|
|
150
124
|
if (!newAccount) {
|
|
151
125
|
throw new ApiError("Failed to get last insert account", { status: 500 });
|
|
152
126
|
}
|
|
@@ -184,12 +158,7 @@ export async function updateAccount(siteContext, accountId, payload) {
|
|
|
184
158
|
const account = await findAccountById(siteContext, accountId);
|
|
185
159
|
if (!account)
|
|
186
160
|
throw new ApiError("Account not found", { status: 404 });
|
|
187
|
-
await siteContext.cn
|
|
188
|
-
.createQueryBuilder()
|
|
189
|
-
.update("PaAccount")
|
|
190
|
-
.set(payload)
|
|
191
|
-
.where({ id: account.id })
|
|
192
|
-
.execute();
|
|
161
|
+
await siteContext.cn("PaAccount").where({ id: account.id }).update(payload);
|
|
193
162
|
return formatToAccountObjectType({
|
|
194
163
|
...account,
|
|
195
164
|
email: payload.email ?? account.email,
|
|
@@ -200,12 +169,7 @@ export async function deleteAccount(siteContext, accountId) {
|
|
|
200
169
|
const account = await findAccountById(siteContext, accountId);
|
|
201
170
|
if (!account)
|
|
202
171
|
throw new ApiError("Account not found", { status: 404 });
|
|
203
|
-
await siteContext.cn
|
|
204
|
-
.createQueryBuilder()
|
|
205
|
-
.delete()
|
|
206
|
-
.from("PaAccount")
|
|
207
|
-
.where({ id: account.id })
|
|
208
|
-
.execute();
|
|
172
|
+
await siteContext.cn("PaAccount").where({ id: account.id }).delete();
|
|
209
173
|
}
|
|
210
174
|
export async function resetAccountPassword(siteContext, accountId) {
|
|
211
175
|
const account = await findAccountById(siteContext, accountId);
|
|
@@ -215,17 +179,18 @@ export async function resetAccountPassword(siteContext, accountId) {
|
|
|
215
179
|
await resetAccountToken(siteContext, { id: account.id, email: account.email, language });
|
|
216
180
|
}
|
|
217
181
|
async function findAccountById(siteContext, id) {
|
|
218
|
-
const found = await siteContext
|
|
219
|
-
.
|
|
220
|
-
.
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
.
|
|
227
|
-
|
|
228
|
-
.
|
|
182
|
+
const found = await siteContext
|
|
183
|
+
.cn("PaAccount as a")
|
|
184
|
+
.select([
|
|
185
|
+
"a.id",
|
|
186
|
+
"a.email",
|
|
187
|
+
"a.name",
|
|
188
|
+
"a.preferences",
|
|
189
|
+
"a.passwordHash",
|
|
190
|
+
"a.passwordResetToken",
|
|
191
|
+
])
|
|
192
|
+
.where("a.id", id)
|
|
193
|
+
.first();
|
|
229
194
|
if (!found)
|
|
230
195
|
return;
|
|
231
196
|
return {
|
|
@@ -239,12 +204,10 @@ async function findAccountById(siteContext, id) {
|
|
|
239
204
|
}
|
|
240
205
|
async function resetAccountToken(siteContext, account) {
|
|
241
206
|
const passwordResetToken = makeSecret(60);
|
|
242
|
-
await siteContext.cn
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
.where({ id: account.id })
|
|
247
|
-
.execute();
|
|
207
|
+
await siteContext.cn("PaAccount").where({ id: account.id }).update({
|
|
208
|
+
passwordResetToken,
|
|
209
|
+
passwordHash: null,
|
|
210
|
+
});
|
|
248
211
|
const subject = simpleI18n.translate({
|
|
249
212
|
key: "accountPasswordReset.subject",
|
|
250
213
|
language: account.language,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/account/account.queries.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"account.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/account/account.queries.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,13 @@
|
|
|
1
1
|
import { strVal, strValOrUndef } from "@paroi/data-formatters-lib";
|
|
2
2
|
import { ApiError } from "../../../common/api-error-handler.js";
|
|
3
3
|
export async function document({ cn }, documentId) {
|
|
4
|
-
const document = await cn
|
|
5
|
-
.
|
|
6
|
-
.
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
.
|
|
11
|
-
.addSelect("d.metaKeywords", "metaKeywords")
|
|
12
|
-
.from("PaDocument", "d")
|
|
13
|
-
.where("d.nodeId = :nodeId", { nodeId: documentId.nodeId })
|
|
14
|
-
.andWhere("d.language = :language", { language: documentId.language })
|
|
15
|
-
.getRawOne();
|
|
4
|
+
const document = await cn("PaDocument as d")
|
|
5
|
+
.select("d.nodeId", "d.language", "d.title", "d.slug", "d.metaDescription", "d.metaKeywords")
|
|
6
|
+
.where({
|
|
7
|
+
"d.nodeId": documentId.nodeId,
|
|
8
|
+
"d.language": documentId.language,
|
|
9
|
+
})
|
|
10
|
+
.first();
|
|
16
11
|
if (!document)
|
|
17
12
|
return;
|
|
18
13
|
return {
|
|
@@ -36,14 +31,10 @@ export async function findOneDocument(siteContext, id) {
|
|
|
36
31
|
return doc ? doc : undefined;
|
|
37
32
|
}
|
|
38
33
|
export async function findOneTermDocument({ cn }, { language, nodeId }) {
|
|
39
|
-
const rows = await cn
|
|
40
|
-
.
|
|
41
|
-
.
|
|
42
|
-
.
|
|
43
|
-
.from("PaNode", "l")
|
|
44
|
-
.leftJoin("PaDocument", "d", "d.nodeId = l.id")
|
|
45
|
-
.andWhere("l.id = :nodeId", { nodeId })
|
|
46
|
-
.getRawMany();
|
|
34
|
+
const rows = await cn("PaNode as l")
|
|
35
|
+
.select("d.title", "d.language")
|
|
36
|
+
.leftJoin("PaDocument as d", "d.nodeId", "l.id")
|
|
37
|
+
.where("l.id", nodeId);
|
|
47
38
|
const candidates = rows.map((row) => ({
|
|
48
39
|
language: strVal(row.language),
|
|
49
40
|
title: strValOrUndef(row.title),
|
|
@@ -55,17 +46,16 @@ export async function findOneTermDocument({ cn }, { language, nodeId }) {
|
|
|
55
46
|
return found;
|
|
56
47
|
}
|
|
57
48
|
export async function getParentNodelIdOf(siteContext, { language, nodeId }) {
|
|
58
|
-
const row = await siteContext
|
|
59
|
-
.
|
|
60
|
-
.select("l2.id
|
|
61
|
-
.
|
|
62
|
-
.innerJoin("
|
|
63
|
-
.innerJoin("
|
|
64
|
-
.
|
|
65
|
-
.andWhere("
|
|
66
|
-
.andWhere("
|
|
67
|
-
.
|
|
68
|
-
.getRawOne();
|
|
49
|
+
const row = await siteContext
|
|
50
|
+
.cn("PaNode as l")
|
|
51
|
+
.select("l2.id as parentId")
|
|
52
|
+
.innerJoin("PaNodel as s", "s.nodeId", "l.id")
|
|
53
|
+
.innerJoin("PaNode as l2", "l2.id", "l.parentId")
|
|
54
|
+
.innerJoin("PaNodel as s2", "s2.nodeId", "l2.id")
|
|
55
|
+
.where("l.id", nodeId)
|
|
56
|
+
.andWhere("s.language", language)
|
|
57
|
+
.andWhere("s2.language", language)
|
|
58
|
+
.first();
|
|
69
59
|
if (!row)
|
|
70
60
|
return undefined;
|
|
71
61
|
return {
|
|
@@ -74,28 +64,24 @@ export async function getParentNodelIdOf(siteContext, { language, nodeId }) {
|
|
|
74
64
|
};
|
|
75
65
|
}
|
|
76
66
|
export async function getParentNodeIdOf(siteContext, nodeId) {
|
|
77
|
-
const row = await siteContext
|
|
78
|
-
.
|
|
79
|
-
.select("l.parentId
|
|
80
|
-
.
|
|
81
|
-
.
|
|
82
|
-
.getRawOne();
|
|
67
|
+
const row = await siteContext
|
|
68
|
+
.cn("PaNode as l")
|
|
69
|
+
.select("l.parentId as id")
|
|
70
|
+
.where("l.id", nodeId)
|
|
71
|
+
.first();
|
|
83
72
|
if (!row)
|
|
84
73
|
throw new Error(`cannot find parent node of '${nodeId}'`);
|
|
85
74
|
return strValOrUndef(row.id);
|
|
86
75
|
}
|
|
87
76
|
export async function getParentDocumentIdsOf(siteContext, options) {
|
|
88
77
|
const languages = options.languages ?? siteContext.siteSchema.languages;
|
|
89
|
-
const rows = await siteContext
|
|
90
|
-
.
|
|
91
|
-
.select("l.parentId", "
|
|
92
|
-
.
|
|
93
|
-
.
|
|
94
|
-
.
|
|
95
|
-
.
|
|
96
|
-
.andWhere("d.language in (:...languages)", { languages })
|
|
97
|
-
.andWhere("l.parentId is not null")
|
|
98
|
-
.getRawMany();
|
|
78
|
+
const rows = await siteContext
|
|
79
|
+
.cn("PaNode as l")
|
|
80
|
+
.select("l.parentId", "d.language")
|
|
81
|
+
.innerJoin("PaDocument as d", "d.nodeId", "l.id")
|
|
82
|
+
.where("l.id", options.nodeId)
|
|
83
|
+
.whereIn("d.language", languages)
|
|
84
|
+
.whereNotNull("l.parentId");
|
|
99
85
|
return rows.map((row) => ({
|
|
100
86
|
language: strVal(row.language),
|
|
101
87
|
nodeId: strVal(row.parentId),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-documents.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/document/load-documents.queries.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"load-documents.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/document/load-documents.queries.ts"],"names":[],"mappings":"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"}
|