@paroicms/server 1.80.0 → 1.81.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/bo-backend/account/account.formatters.js +2 -2
- package/dist/bo-backend/account/account.formatters.js.map +1 -1
- package/dist/bo-backend/account/account.queries.js +9 -9
- package/dist/bo-backend/account/account.queries.js.map +1 -1
- package/dist/bo-backend/account/account.resolver.js +3 -3
- package/dist/bo-backend/account/account.resolver.js.map +1 -1
- package/dist/bo-backend/auth/auth.helper.js +10 -10
- package/dist/bo-backend/auth/auth.helper.js.map +1 -1
- package/dist/bo-backend/auth/auth.service.js +3 -3
- package/dist/bo-backend/auth/auth.service.js.map +1 -1
- package/dist/bo-backend/backup/backup.controller.js +3 -3
- package/dist/bo-backend/backup/backup.controller.js.map +1 -1
- package/dist/bo-backend/backup/backup.helper.js +2 -2
- package/dist/bo-backend/backup/backup.helper.js.map +1 -1
- package/dist/bo-backend/document/load-documents.queries.js +2 -2
- package/dist/bo-backend/document/load-documents.queries.js.map +1 -1
- package/dist/bo-backend/document/save-documents.queries.js +2 -2
- package/dist/bo-backend/document/save-documents.queries.js.map +1 -1
- package/dist/bo-backend/fields/load-fields-of.queries.js +6 -12
- package/dist/bo-backend/fields/load-fields-of.queries.js.map +1 -1
- package/dist/bo-backend/fields/save-fields.queries.js +2 -5
- package/dist/bo-backend/fields/save-fields.queries.js.map +1 -1
- package/dist/bo-backend/login/login.controller.js +2 -2
- package/dist/bo-backend/login/login.controller.js.map +1 -1
- package/dist/bo-backend/media/add-media-to-node.js +3 -4
- package/dist/bo-backend/media/add-media-to-node.js.map +1 -1
- package/dist/bo-backend/media/media-upload.controller.js +3 -5
- package/dist/bo-backend/media/media-upload.controller.js.map +1 -1
- package/dist/bo-backend/media/media.resolver.js +7 -10
- package/dist/bo-backend/media/media.resolver.js.map +1 -1
- package/dist/bo-backend/node/node.queries.js +5 -5
- package/dist/bo-backend/node/node.queries.js.map +1 -1
- package/dist/bo-backend/nodel/nodel-wrap.formatters.js +2 -2
- package/dist/bo-backend/nodel/nodel-wrap.formatters.js.map +1 -1
- package/dist/bo-backend/nodel/nodel.queries.js +2 -4
- package/dist/bo-backend/nodel/nodel.queries.js.map +1 -1
- package/dist/bo-backend/part/part-node.queries.js +2 -2
- package/dist/bo-backend/part/part-node.queries.js.map +1 -1
- package/dist/bo-backend/part/part.queries.js +7 -13
- package/dist/bo-backend/part/part.queries.js.map +1 -1
- package/dist/bo-backend/site-constants/site-constants.resolver.js +2 -2
- package/dist/bo-backend/site-constants/site-constants.resolver.js.map +1 -1
- package/dist/express/http-helpers.js +2 -2
- package/dist/express/http-helpers.js.map +1 -1
- package/dist/express/route-handler-wrapper.js +1 -1
- package/dist/express/route-handler-wrapper.js.map +1 -1
- package/dist/express/site-middleware.js +1 -1
- package/dist/express/site-middleware.js.map +1 -1
- package/dist/graphql/error-converter-plugin.js +1 -1
- package/dist/graphql/error-converter-plugin.js.map +1 -1
- package/dist/helpers/make-backend-plugin-service.js +1 -1
- package/dist/helpers/make-backend-plugin-service.js.map +1 -1
- package/dist/helpers/special-account.helpers.js +3 -3
- package/dist/helpers/special-account.helpers.js.map +1 -1
- package/dist/oauth/oauth2-client.controller.js +4 -5
- package/dist/oauth/oauth2-client.controller.js.map +1 -1
- package/dist/public-api/mail/validate-recaptcha-response.js +3 -3
- package/dist/public-api/mail/validate-recaptcha-response.js.map +1 -1
- package/dist/public-api/password-reset/password-reset.controller.js +3 -3
- package/dist/public-api/password-reset/password-reset.controller.js.map +1 -1
- package/dist/public-api/password-reset/password-reset.service.js +3 -3
- package/dist/public-api/password-reset/password-reset.service.js.map +1 -1
- package/dist/public-payload/public-payload.types.d.ts +4 -0
- package/dist/public-payload/site-payload.js +7 -1
- package/dist/public-payload/site-payload.js.map +1 -1
- package/dist/public-site/liquidjs-filters/info-filter.js +1 -0
- package/dist/public-site/liquidjs-filters/info-filter.js.map +1 -1
- package/dist/public-site/media-serve/media-serve.controller.js +7 -10
- package/dist/public-site/media-serve/media-serve.controller.js.map +1 -1
- package/dist/site-context/create-site-context.js +5 -3
- package/dist/site-context/create-site-context.js.map +1 -1
- package/dist/site-context/site-context.js +2 -2
- package/dist/site-context/site-context.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +7 -7
- package/dist/common/api-error-handler.d.ts +0 -10
- package/dist/common/api-error-handler.js +0 -28
- package/dist/common/api-error-handler.js.map +0 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { ApiError } from "
|
|
1
|
+
import { ApiError } from "@paroicms/public-server-lib";
|
|
2
2
|
export function formatAccountType(val) {
|
|
3
3
|
if (["local", "google"].includes(val))
|
|
4
4
|
return val;
|
|
5
|
-
throw new ApiError(`Invalid account type: ${val}`,
|
|
5
|
+
throw new ApiError(`Invalid account type: ${val}`, 400);
|
|
6
6
|
}
|
|
7
7
|
//# sourceMappingURL=account.formatters.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account.formatters.js","sourceRoot":"","sources":["../../../src/bo-backend/account/account.formatters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"account.formatters.js","sourceRoot":"","sources":["../../../src/bo-backend/account/account.formatters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAIvD,MAAM,UAAU,iBAAiB,CAAC,GAAW;IAC3C,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,GAAkB,CAAC;IACjE,MAAM,IAAI,QAAQ,CAAC,yBAAyB,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;AAC1D,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { strVal, strValOrUndef } from "@paroi/data-formatters-lib";
|
|
2
2
|
import { makeSecret } from "@paroicms/internal-server-lib";
|
|
3
|
-
import { ApiError } from "
|
|
3
|
+
import { ApiError } from "@paroicms/public-server-lib";
|
|
4
4
|
import { formatToAccountObjectType, formatToAuthenticatedAccountObjectType, } from "../../common/data-format.js";
|
|
5
5
|
import { sendMail } from "../../common/mail/sendMail.helpers.js";
|
|
6
6
|
import { simpleI18n } from "../../context.js";
|
|
@@ -15,7 +15,7 @@ export async function findAccountByIdAndEmail(siteContext, payload) {
|
|
|
15
15
|
})
|
|
16
16
|
.first();
|
|
17
17
|
if (!account)
|
|
18
|
-
throw new ApiError("Account not found",
|
|
18
|
+
throw new ApiError("Account not found", 404);
|
|
19
19
|
return {
|
|
20
20
|
id: strVal(account.id),
|
|
21
21
|
email: strVal(account.email),
|
|
@@ -52,7 +52,7 @@ export async function getAccount(siteContext, id) {
|
|
|
52
52
|
.where("a.id", id)
|
|
53
53
|
.first();
|
|
54
54
|
if (!found)
|
|
55
|
-
throw new ApiError("Account not found",
|
|
55
|
+
throw new ApiError("Account not found", 404);
|
|
56
56
|
const account = {
|
|
57
57
|
id: strVal(found.id),
|
|
58
58
|
email: strVal(found.email),
|
|
@@ -74,7 +74,7 @@ export async function getAuthenticatedAccount(siteContext, id) {
|
|
|
74
74
|
.where("a.id", id)
|
|
75
75
|
.first();
|
|
76
76
|
if (!found)
|
|
77
|
-
throw new ApiError("Account not found",
|
|
77
|
+
throw new ApiError("Account not found", 404);
|
|
78
78
|
const account = {
|
|
79
79
|
id: strVal(found.id),
|
|
80
80
|
email: strVal(found.email),
|
|
@@ -110,7 +110,7 @@ export async function setAccountPreferences(siteContext, accountId, values) {
|
|
|
110
110
|
export async function createAccount(siteContext, payload) {
|
|
111
111
|
const account = await findAccountByEmail(siteContext, payload.email);
|
|
112
112
|
if (account)
|
|
113
|
-
throw new ApiError("email already exists",
|
|
113
|
+
throw new ApiError("email already exists", 409);
|
|
114
114
|
const [inserted] = await siteContext
|
|
115
115
|
.cn("PaAccount")
|
|
116
116
|
.insert({
|
|
@@ -122,7 +122,7 @@ export async function createAccount(siteContext, payload) {
|
|
|
122
122
|
const id = strVal(inserted.id);
|
|
123
123
|
const newAccount = await findAccountById(siteContext, id);
|
|
124
124
|
if (!newAccount) {
|
|
125
|
-
throw new ApiError("Failed to get last insert account",
|
|
125
|
+
throw new ApiError("Failed to get last insert account", 500);
|
|
126
126
|
}
|
|
127
127
|
if (payload.accountType === "google") {
|
|
128
128
|
return await createGoogleAccount(siteContext, {
|
|
@@ -157,7 +157,7 @@ async function createGoogleAccount(siteContext, { payload, newAccount, }) {
|
|
|
157
157
|
export async function updateAccount(siteContext, accountId, payload) {
|
|
158
158
|
const account = await findAccountById(siteContext, accountId);
|
|
159
159
|
if (!account)
|
|
160
|
-
throw new ApiError("Account not found",
|
|
160
|
+
throw new ApiError("Account not found", 404);
|
|
161
161
|
await siteContext.cn("PaAccount").where({ id: account.id }).update(payload);
|
|
162
162
|
return formatToAccountObjectType({
|
|
163
163
|
...account,
|
|
@@ -168,13 +168,13 @@ export async function updateAccount(siteContext, accountId, payload) {
|
|
|
168
168
|
export async function deleteAccount(siteContext, accountId) {
|
|
169
169
|
const account = await findAccountById(siteContext, accountId);
|
|
170
170
|
if (!account)
|
|
171
|
-
throw new ApiError("Account not found",
|
|
171
|
+
throw new ApiError("Account not found", 404);
|
|
172
172
|
await siteContext.cn("PaAccount").where({ id: account.id }).delete();
|
|
173
173
|
}
|
|
174
174
|
export async function resetAccountPassword(siteContext, accountId) {
|
|
175
175
|
const account = await findAccountById(siteContext, accountId);
|
|
176
176
|
if (!account)
|
|
177
|
-
throw new ApiError("Account not found",
|
|
177
|
+
throw new ApiError("Account not found", 404);
|
|
178
178
|
const language = getAccountLanguage(siteContext, account);
|
|
179
179
|
await resetAccountToken(siteContext, { id: account.id, email: account.email, language });
|
|
180
180
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account.queries.js","sourceRoot":"","sources":["../../../src/bo-backend/account/account.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAEnE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"account.queries.js","sourceRoot":"","sources":["../../../src/bo-backend/account/account.queries.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ApiError } from "
|
|
1
|
+
import { ApiError } from "@paroicms/public-server-lib";
|
|
2
2
|
import { authGuard, verifyAccessToken } from "../auth/auth.helper.js";
|
|
3
3
|
import { formatAccountType } from "./account.formatters.js";
|
|
4
4
|
import { createAccount, deleteAccount, getAccount, getAllAccounts, getAuthenticatedAccount, resetAccountPassword, setAccountPreferences, updateAccount, } from "./account.queries.js";
|
|
@@ -13,11 +13,11 @@ export const accountResolvers = {
|
|
|
13
13
|
authGuard(httpContext);
|
|
14
14
|
const token = httpContext.req.headers.authorization?.replace(/^Bearer\s+/, "");
|
|
15
15
|
if (!token) {
|
|
16
|
-
throw new ApiError("authorization header not found",
|
|
16
|
+
throw new ApiError("authorization header not found", 404);
|
|
17
17
|
}
|
|
18
18
|
const payload = verifyAccessToken(token);
|
|
19
19
|
if (!payload.id) {
|
|
20
|
-
throw new ApiError("auth account id not found",
|
|
20
|
+
throw new ApiError("auth account id not found", 404);
|
|
21
21
|
}
|
|
22
22
|
return await getAuthenticatedAccount(siteContext, payload.id);
|
|
23
23
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account.resolver.js","sourceRoot":"","sources":["../../../src/bo-backend/account/account.resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"account.resolver.js","sourceRoot":"","sources":["../../../src/bo-backend/account/account.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
+
import { ApiError } from "@paroicms/public-server-lib";
|
|
1
2
|
import passport from "passport";
|
|
2
|
-
import { ApiError } from "../../common/api-error-handler.js";
|
|
3
3
|
import { jwtExpiresIn, jwtSecret, platformJwtSecret } from "../../context.js";
|
|
4
4
|
const { sign, verify } = (await import("jsonwebtoken")).default;
|
|
5
5
|
export function authGuard(httpContext) {
|
|
6
6
|
const { req } = httpContext;
|
|
7
7
|
const authorization = req.headers.authorization;
|
|
8
8
|
if (!authorization || !authorization.startsWith("Bearer ")) {
|
|
9
|
-
throw new ApiError("Unauthorized",
|
|
9
|
+
throw new ApiError("Unauthorized", 401);
|
|
10
10
|
}
|
|
11
11
|
const token = authorization.substring(7);
|
|
12
12
|
let payload;
|
|
@@ -14,10 +14,10 @@ export function authGuard(httpContext) {
|
|
|
14
14
|
payload = verify(token, jwtSecret);
|
|
15
15
|
}
|
|
16
16
|
catch (error) {
|
|
17
|
-
throw new ApiError("Unauthorized",
|
|
17
|
+
throw new ApiError("Unauthorized", 401);
|
|
18
18
|
}
|
|
19
19
|
if (payload.fqdn !== req.hostname) {
|
|
20
|
-
throw new ApiError("Not the right token",
|
|
20
|
+
throw new ApiError("Not the right token", 403);
|
|
21
21
|
}
|
|
22
22
|
return payload;
|
|
23
23
|
}
|
|
@@ -28,7 +28,7 @@ export function googleAuthGuard(req, res) {
|
|
|
28
28
|
return new Promise((resolve, reject) => {
|
|
29
29
|
passport.authenticate("google", { session: false }, (err, user, info) => {
|
|
30
30
|
if (err || !user || !isGoogleUser(user)) {
|
|
31
|
-
reject(new ApiError("Unauthorized",
|
|
31
|
+
reject(new ApiError("Unauthorized", 401));
|
|
32
32
|
return;
|
|
33
33
|
}
|
|
34
34
|
resolve(user);
|
|
@@ -40,22 +40,22 @@ export function verifyAccessToken(token) {
|
|
|
40
40
|
return verify(token, jwtSecret);
|
|
41
41
|
}
|
|
42
42
|
catch (error) {
|
|
43
|
-
throw new ApiError("Invalid token",
|
|
43
|
+
throw new ApiError("Invalid token", 401);
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
46
|
export function verifyPlatformToken(platformToken) {
|
|
47
47
|
if (!platformJwtSecret) {
|
|
48
|
-
throw new ApiError("Platform token not set",
|
|
48
|
+
throw new ApiError("Platform token not set", 401);
|
|
49
49
|
}
|
|
50
50
|
try {
|
|
51
51
|
const payload = verify(platformToken, platformJwtSecret);
|
|
52
52
|
if (!payload?.email) {
|
|
53
|
-
throw new ApiError("email not found in token payload",
|
|
53
|
+
throw new ApiError("email not found in token payload", 500);
|
|
54
54
|
}
|
|
55
55
|
return payload;
|
|
56
56
|
}
|
|
57
57
|
catch (error) {
|
|
58
|
-
throw new ApiError("Invalid platform token",
|
|
58
|
+
throw new ApiError("Invalid platform token", 401);
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
61
|
export function generateAccessToken(payload) {
|
|
@@ -63,7 +63,7 @@ export function generateAccessToken(payload) {
|
|
|
63
63
|
}
|
|
64
64
|
export function generatePlatformToken(payload) {
|
|
65
65
|
if (!platformJwtSecret) {
|
|
66
|
-
throw new ApiError("Platform token not set",
|
|
66
|
+
throw new ApiError("Platform token not set", 401);
|
|
67
67
|
}
|
|
68
68
|
return sign(payload, platformJwtSecret, { expiresIn: "7d" });
|
|
69
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.helper.js","sourceRoot":"","sources":["../../../src/bo-backend/auth/auth.helper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"auth.helper.js","sourceRoot":"","sources":["../../../src/bo-backend/auth/auth.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { strVal } from "@paroi/data-formatters-lib";
|
|
2
|
-
import { ApiError } from "
|
|
2
|
+
import { ApiError } from "@paroicms/public-server-lib";
|
|
3
3
|
import { formatAccountPreferences } from "../../common/data-format.js";
|
|
4
4
|
import { appConf } from "../../context.js";
|
|
5
5
|
import { comparePassword } from "../../helpers/passwordEncrypt-helper.js";
|
|
@@ -44,7 +44,7 @@ export async function getVerifiedAccountFromToken(siteContext, token) {
|
|
|
44
44
|
try {
|
|
45
45
|
payload = verifyAccessToken(token);
|
|
46
46
|
if (payload.fqdn !== siteContext.fqdn) {
|
|
47
|
-
throw new ApiError("Not the right token",
|
|
47
|
+
throw new ApiError("Not the right token", 403);
|
|
48
48
|
}
|
|
49
49
|
const defaultLanguage = siteContext.siteSchema.defaultLanguage;
|
|
50
50
|
let account;
|
|
@@ -94,7 +94,7 @@ export async function loginByPlatformToken(siteContext, token) {
|
|
|
94
94
|
else {
|
|
95
95
|
const foundAccount = await findAccountByEmail(siteContext, payload.email);
|
|
96
96
|
if (!foundAccount) {
|
|
97
|
-
throw new ApiError("Account not found",
|
|
97
|
+
throw new ApiError("Account not found", 404);
|
|
98
98
|
}
|
|
99
99
|
account = foundAccount;
|
|
100
100
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../src/bo-backend/auth/auth.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAEpD,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../src/bo-backend/auth/auth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { checkBackupFileName, getBackup } from "@paroicms/connector";
|
|
2
|
-
import { ApiError } from "
|
|
2
|
+
import { ApiError } from "@paroicms/public-server-lib";
|
|
3
3
|
import { getRouteParameter } from "../../express/http-helpers.js";
|
|
4
4
|
import { verifyDownloadToken } from "./backup.helper.js";
|
|
5
5
|
export async function downloadBackupController(siteContext, httpContext, routeParams) {
|
|
@@ -10,10 +10,10 @@ export async function downloadBackupController(siteContext, httpContext, routePa
|
|
|
10
10
|
throw new Error("missing user token");
|
|
11
11
|
const { backupFile, contentType } = verifyDownloadToken(token);
|
|
12
12
|
if (!checkBackupFileName({ fqdn: req.hostname }, backupName)) {
|
|
13
|
-
throw new ApiError("Invalid payload",
|
|
13
|
+
throw new ApiError("Invalid payload", 404);
|
|
14
14
|
}
|
|
15
15
|
if (backupFile !== backupName) {
|
|
16
|
-
throw new ApiError("invalid token provided",
|
|
16
|
+
throw new ApiError("invalid token provided", 400);
|
|
17
17
|
}
|
|
18
18
|
const { fileStream, fileWeight } = await getBackup(siteContext, backupName);
|
|
19
19
|
res.status(200);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backup.controller.js","sourceRoot":"","sources":["../../../src/bo-backend/backup/backup.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErE,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"backup.controller.js","sourceRoot":"","sources":["../../../src/bo-backend/backup/backup.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErE,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEzD,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,WAAwB,EACxB,WAA0B,EAC1B,WAA+C;IAE/C,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,WAAW,CAAC;IACjC,MAAM,UAAU,GAAG,iBAAiB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAChE,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;IAE1B,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IAElD,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAE/D,IAAI,CAAC,mBAAmB,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC,EAAE,CAAC;QAC7D,MAAM,IAAI,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,UAAU,KAAK,UAAU,EAAE,CAAC;QAC9B,MAAM,IAAI,QAAQ,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAE5E,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChB,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IACxC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;IACxC,GAAG,CAAC,MAAM,CAAC,gBAAgB,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpD,GAAG,CAAC,MAAM,CAAC,qBAAqB,EAAE,wBAAwB,UAAU,EAAE,CAAC,CAAC;IACxE,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AACvB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ApiError } from "
|
|
1
|
+
import { ApiError } from "@paroicms/public-server-lib";
|
|
2
2
|
import { jwtSecret } from "../../context.js";
|
|
3
3
|
const { sign, verify } = (await import("jsonwebtoken")).default;
|
|
4
4
|
export function createDownloadToken(payload) {
|
|
@@ -9,7 +9,7 @@ export function verifyDownloadToken(token) {
|
|
|
9
9
|
return verify(token, jwtSecret, { ignoreExpiration: true });
|
|
10
10
|
}
|
|
11
11
|
catch (error) {
|
|
12
|
-
throw new ApiError("Invalid token",
|
|
12
|
+
throw new ApiError("Invalid token", 401);
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
15
|
//# sourceMappingURL=backup.helper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backup.helper.js","sourceRoot":"","sources":["../../../src/bo-backend/backup/backup.helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"backup.helper.js","sourceRoot":"","sources":["../../../src/bo-backend/backup/backup.helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC;AAOhE,MAAM,UAAU,mBAAmB,CAAC,OAA6B;IAC/D,OAAO,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,KAAa;IAC/C,IAAI,CAAC;QACH,OAAO,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAyB,CAAC;IACtF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,QAAQ,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;IAC3C,CAAC;AACH,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { strVal, strValOrUndef } from "@paroi/data-formatters-lib";
|
|
2
|
-
import { ApiError } from "
|
|
2
|
+
import { ApiError } from "@paroicms/public-server-lib";
|
|
3
3
|
export async function document({ cn }, documentId) {
|
|
4
4
|
const document = await cn("PaDocument as d")
|
|
5
5
|
.select("d.nodeId", "d.language", "d.title", "d.slug", "d.metaDescription", "d.metaKeywords")
|
|
@@ -22,7 +22,7 @@ export async function document({ cn }, documentId) {
|
|
|
22
22
|
export async function getOneDocument(siteContext, id) {
|
|
23
23
|
const doc = await document(siteContext, id);
|
|
24
24
|
if (!doc) {
|
|
25
|
-
throw new ApiError(`can't find document '${id.language}:${id.nodeId}'`,
|
|
25
|
+
throw new ApiError(`can't find document '${id.language}:${id.nodeId}'`, 404);
|
|
26
26
|
}
|
|
27
27
|
return doc;
|
|
28
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-documents.queries.js","sourceRoot":"","sources":["../../../src/bo-backend/document/load-documents.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAGnE,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"load-documents.queries.js","sourceRoot":"","sources":["../../../src/bo-backend/document/load-documents.queries.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { nbVal, strVal } from "@paroi/data-formatters-lib";
|
|
2
2
|
import { createNode } from "@paroicms/connector";
|
|
3
3
|
import { getDocumentTypeByName } from "@paroicms/internal-anywhere-lib";
|
|
4
|
-
import { ApiError } from "
|
|
4
|
+
import { ApiError } from "@paroicms/public-server-lib";
|
|
5
5
|
import { getHandleOfFeaturedImage } from "../../common/media-handles.helpers.js";
|
|
6
6
|
import { invalidateDocumentInCache, invalidateDocumentRelationCache, invalidateMultipleDocumentsInCache, } from "../../common/text-cache.js";
|
|
7
7
|
import { countNodeChildrenOf, getTypeNameOf } from "../node/node.queries.js";
|
|
@@ -56,7 +56,7 @@ export async function createNodeWithDocument(siteContext, { parentId, values, fo
|
|
|
56
56
|
if (parentDocumentType.childLimit !== undefined) {
|
|
57
57
|
const count = await countNodeChildrenOf(siteContext, parentNodeId);
|
|
58
58
|
if (count >= parentDocumentType.childLimit)
|
|
59
|
-
throw new ApiError("maximum children reached",
|
|
59
|
+
throw new ApiError("maximum children reached", 400);
|
|
60
60
|
}
|
|
61
61
|
const documentId = await siteContext.cn.transaction(async (tx) => {
|
|
62
62
|
const { id: nodeId } = await createNode(siteContext.siteSchema, tx, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"save-documents.queries.js","sourceRoot":"","sources":["../../../src/bo-backend/document/save-documents.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"save-documents.queries.js","sourceRoot":"","sources":["../../../src/bo-backend/document/save-documents.queries.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { strVal } from "@paroi/data-formatters-lib";
|
|
2
2
|
import { PART_DEFAULT_LIST_NAME, getNodeTypeByName } from "@paroicms/internal-anywhere-lib";
|
|
3
3
|
import { encodeNodelId, parseNodelId, } from "@paroicms/public-anywhere-lib";
|
|
4
|
-
import { ApiError } from "
|
|
4
|
+
import { ApiError } from "@paroicms/public-server-lib";
|
|
5
5
|
import { createNoRenderingContext } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
|
|
6
6
|
import { getTypeNameOf } from "../node/node.queries.js";
|
|
7
7
|
import { getFieldTypesByNames, loadFieldValues } from "./load-fields.queries.js";
|
|
@@ -30,12 +30,10 @@ export async function getFieldValuesOfOneList(siteContext, options) {
|
|
|
30
30
|
const parentNodeType = getNodeTypeByName(siteContext.siteSchema, parentTypeName);
|
|
31
31
|
if (parentNodeType.kind === "document") {
|
|
32
32
|
if (!listName)
|
|
33
|
-
throw new ApiError("listName is required for document parts",
|
|
33
|
+
throw new ApiError("listName is required for document parts", 400);
|
|
34
34
|
const listType = parentNodeType.lists?.find((item) => item.listName === listName);
|
|
35
35
|
if (!listType) {
|
|
36
|
-
throw new ApiError(`invalid listName '${listName}' for document type '${parentTypeName}'`,
|
|
37
|
-
status: 400,
|
|
38
|
-
});
|
|
36
|
+
throw new ApiError(`invalid listName '${listName}' for document type '${parentTypeName}'`, 400);
|
|
39
37
|
}
|
|
40
38
|
return await getFieldValuesOfList(siteContext, {
|
|
41
39
|
parentNodelId,
|
|
@@ -46,15 +44,11 @@ export async function getFieldValuesOfOneList(siteContext, options) {
|
|
|
46
44
|
}
|
|
47
45
|
if (parentNodeType.kind === "part") {
|
|
48
46
|
if (listName && listName !== PART_DEFAULT_LIST_NAME) {
|
|
49
|
-
throw new ApiError(`invalid listName '${listName}' for part type (can be omitted)`,
|
|
50
|
-
status: 400,
|
|
51
|
-
});
|
|
47
|
+
throw new ApiError(`invalid listName '${listName}' for part type (can be omitted)`, 400);
|
|
52
48
|
}
|
|
53
49
|
const listType = parentNodeType.list;
|
|
54
50
|
if (!listType) {
|
|
55
|
-
throw new ApiError(`missing sub-list for part type '${parentTypeName}'`,
|
|
56
|
-
status: 400,
|
|
57
|
-
});
|
|
51
|
+
throw new ApiError(`missing sub-list for part type '${parentTypeName}'`, 400);
|
|
58
52
|
}
|
|
59
53
|
return await getFieldValuesOfList(siteContext, {
|
|
60
54
|
parentNodelId,
|
|
@@ -63,7 +57,7 @@ export async function getFieldValuesOfOneList(siteContext, options) {
|
|
|
63
57
|
preprocess,
|
|
64
58
|
});
|
|
65
59
|
}
|
|
66
|
-
throw new ApiError(`invalid node kind '${parentNodeType.kind}'`,
|
|
60
|
+
throw new ApiError(`invalid node kind '${parentNodeType.kind}'`, 400);
|
|
67
61
|
}
|
|
68
62
|
async function getFieldValuesOfList(siteContext, options) {
|
|
69
63
|
const { parentNodelId, listType, fieldNames, preprocess } = options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-fields-of.queries.js","sourceRoot":"","sources":["../../../src/bo-backend/fields/load-fields-of.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAC5F,OAAO,EAGL,aAAa,EACb,YAAY,GACb,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"load-fields-of.queries.js","sourceRoot":"","sources":["../../../src/bo-backend/fields/load-fields-of.queries.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { boolVal, nbVal, objVal, strVal, strValOrUndef } from "@paroi/data-formatters-lib";
|
|
2
2
|
import { getNodeTypeByName, isFTextFieldType } from "@paroicms/internal-anywhere-lib";
|
|
3
|
-
import { stripHtmlTags } from "@paroicms/public-server-lib";
|
|
4
|
-
import { ApiError } from "../../common/api-error-handler.js";
|
|
3
|
+
import { ApiError, stripHtmlTags } from "@paroicms/public-server-lib";
|
|
5
4
|
import { invalidateMultipleDocumentsInCache } from "../../common/text-cache.js";
|
|
6
5
|
import { dbAnyLanguage } from "../../context.js";
|
|
7
6
|
import { truncExcerptToWord } from "../../helpers/excerpt.helpers.js";
|
|
@@ -13,9 +12,7 @@ export function parseFieldValues(jsonVal) {
|
|
|
13
12
|
return objVal(JSON.parse(jsonVal));
|
|
14
13
|
}
|
|
15
14
|
catch {
|
|
16
|
-
throw new ApiError("invalid fieldValues",
|
|
17
|
-
status: 400,
|
|
18
|
-
});
|
|
15
|
+
throw new ApiError("invalid fieldValues", 400);
|
|
19
16
|
}
|
|
20
17
|
}
|
|
21
18
|
export async function saveFieldValues(siteContext, options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"save-fields.queries.js","sourceRoot":"","sources":["../../../src/bo-backend/fields/save-fields.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3F,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAStF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"save-fields.queries.js","sourceRoot":"","sources":["../../../src/bo-backend/fields/save-fields.queries.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { objVal, strVal } from "@paroi/data-formatters-lib";
|
|
2
|
-
import { ApiError } from "
|
|
2
|
+
import { ApiError } from "@paroicms/public-server-lib";
|
|
3
3
|
import { getVerifiedAccountFromToken, loginByPlatformToken, loginUser, } from "../auth/auth.service.js";
|
|
4
4
|
export async function loginController(siteContext, httpContext) {
|
|
5
5
|
const loginInput = formatLoginAction(httpContext.req.body);
|
|
@@ -26,6 +26,6 @@ function formatLoginAction(val) {
|
|
|
26
26
|
const token = strVal(obj.token, { varName: "token" });
|
|
27
27
|
return { action, token };
|
|
28
28
|
}
|
|
29
|
-
throw new ApiError(`Invalid login action: ${action}`,
|
|
29
|
+
throw new ApiError(`Invalid login action: ${action}`, 400);
|
|
30
30
|
}
|
|
31
31
|
//# sourceMappingURL=login.controller.js.map
|