@paroicms/server 2.2.0 → 3.0.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 +1 -0
- package/dist/admin-backend/account/account.queries.d.ts +5 -0
- package/dist/admin-backend/account/account.queries.d.ts.map +1 -1
- package/dist/admin-backend/account/account.queries.js +1 -1
- package/dist/admin-backend/account/account.queries.js.map +1 -1
- package/dist/admin-backend/auth/authorization.helper.d.ts +1 -1
- package/dist/admin-backend/auth/authorization.helper.d.ts.map +1 -1
- package/dist/admin-backend/auth/authorization.helper.js +3 -1
- package/dist/admin-backend/auth/authorization.helper.js.map +1 -1
- package/dist/admin-backend/login/login.controller.js +4 -4
- package/dist/admin-backend/login/login.controller.js.map +1 -1
- package/dist/admin-backend/media/media-upload.controller.d.ts.map +1 -1
- package/dist/admin-backend/media/media-upload.controller.js +2 -3
- package/dist/admin-backend/media/media-upload.controller.js.map +1 -1
- package/dist/admin-backend/personal-access-token/dev-pat.controller.d.ts +9 -0
- package/dist/admin-backend/personal-access-token/dev-pat.controller.d.ts.map +1 -0
- package/dist/admin-backend/personal-access-token/dev-pat.controller.js +31 -0
- package/dist/admin-backend/personal-access-token/dev-pat.controller.js.map +1 -0
- package/dist/admin-backend/personal-access-token/pat.resolver.d.ts.map +1 -1
- package/dist/admin-backend/personal-access-token/pat.resolver.js +2 -0
- package/dist/admin-backend/personal-access-token/pat.resolver.js.map +1 -1
- package/dist/connector/db-init/db-constants.d.ts +1 -1
- package/dist/connector/db-init/db-constants.js +1 -1
- package/dist/connector/db-init/ddl-migration.d.ts.map +1 -1
- package/dist/connector/db-init/ddl-migration.js +5 -0
- package/dist/connector/db-init/ddl-migration.js.map +1 -1
- package/dist/express/site-middleware.d.ts.map +1 -1
- package/dist/express/site-middleware.js +2 -0
- package/dist/express/site-middleware.js.map +1 -1
- package/dist/personal-access-token/pat-auth.helper.d.ts +3 -1
- package/dist/personal-access-token/pat-auth.helper.d.ts.map +1 -1
- package/dist/personal-access-token/pat-auth.helper.js +7 -2
- package/dist/personal-access-token/pat-auth.helper.js.map +1 -1
- package/dist/personal-access-token/pat.service.d.ts +7 -0
- package/dist/personal-access-token/pat.service.d.ts.map +1 -1
- package/dist/personal-access-token/pat.service.js +14 -3
- package/dist/personal-access-token/pat.service.js.map +1 -1
- package/dist/public-api/password-reset/password-reset.controller.d.ts.map +1 -1
- package/dist/public-api/password-reset/password-reset.controller.js +3 -2
- package/dist/public-api/password-reset/password-reset.controller.js.map +1 -1
- package/dist/running-server/site-content-api.d.ts.map +1 -1
- package/dist/running-server/site-content-api.js +11 -1
- package/dist/running-server/site-content-api.js.map +1 -1
- package/package.json +11 -11
- package/schema.graphql +1 -0
package/ddl/main.ddl.sql
CHANGED
|
@@ -145,6 +145,7 @@ create table PaPersonalAccessToken (
|
|
|
145
145
|
accountId integer not null references PaAccount (id) on delete cascade,
|
|
146
146
|
tokenHash varchar(64) not null unique,
|
|
147
147
|
tokenPreview varchar(20) not null,
|
|
148
|
+
origin varchar(50) not null,
|
|
148
149
|
description varchar(200),
|
|
149
150
|
createdAt timestamp not null default current_timestamp,
|
|
150
151
|
lastUsedAt timestamp,
|
|
@@ -39,4 +39,9 @@ export declare function deleteAccount(siteContext: SiteContext, accountId: strin
|
|
|
39
39
|
export declare function isAccountReferenced(siteContext: SiteContext, accountId: string): Promise<boolean>;
|
|
40
40
|
export declare function resetAccountPassword(siteContext: SiteContext, accountId: string): Promise<void>;
|
|
41
41
|
export declare function changeOwnPassword(siteContext: SiteContext, accountId: string, currentPassword: string, newPassword: string): Promise<void>;
|
|
42
|
+
export declare function resetAccountToken(siteContext: SiteContext, account: {
|
|
43
|
+
id: string;
|
|
44
|
+
email: string;
|
|
45
|
+
language: string;
|
|
46
|
+
}): Promise<void>;
|
|
42
47
|
//# sourceMappingURL=account.queries.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account.queries.d.ts","sourceRoot":"","sources":["../../../src/admin-backend/account/account.queries.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"account.queries.d.ts","sourceRoot":"","sources":["../../../src/admin-backend/account/account.queries.ts"],"names":[],"mappings":"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"}
|
|
@@ -348,7 +348,7 @@ async function findAccountById(siteContext, id) {
|
|
|
348
348
|
return;
|
|
349
349
|
return FindAccountByIdRowAT.assert(found);
|
|
350
350
|
}
|
|
351
|
-
async function resetAccountToken(siteContext, account) {
|
|
351
|
+
export async function resetAccountToken(siteContext, account) {
|
|
352
352
|
const passwordResetToken = makeSecret(60);
|
|
353
353
|
await siteContext.cn("PaAccount").where({ id: account.id }).update({
|
|
354
354
|
passwordResetToken,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account.queries.js","sourceRoot":"","sources":["../../../src/admin-backend/account/account.queries.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"account.queries.js","sourceRoot":"","sources":["../../../src/admin-backend/account/account.queries.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,5 +11,5 @@ export interface AuthorizedAccount {
|
|
|
11
11
|
permissions: string[];
|
|
12
12
|
}
|
|
13
13
|
export declare function permissionGuard(siteContext: SiteContext | MigrationSiteContext, httpContext: PaHttpContext, requiredPermission: string): Promise<AuthorizedAccount>;
|
|
14
|
-
export declare function permissionPatGuard(siteContext: Pick<SiteContext, "cn" | "fqdn">, pat: string, requiredPermission: string): Promise<AuthorizedAccount>;
|
|
14
|
+
export declare function permissionPatGuard(siteContext: Pick<SiteContext, "cn" | "fqdn" | "regSite">, pat: string, requiredPermission: string): Promise<AuthorizedAccount>;
|
|
15
15
|
//# sourceMappingURL=authorization.helper.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authorization.helper.d.ts","sourceRoot":"","sources":["../../../src/admin-backend/auth/authorization.helper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAY,KAAK,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE3E,OAAO,KAAK,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAgBlG,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,wBAAsB,eAAe,CACnC,WAAW,EAAE,WAAW,GAAG,oBAAoB,EAC/C,WAAW,EAAE,aAAa,EAC1B,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,iBAAiB,CAAC,CAgB5B;AAED,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,GAAG,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"authorization.helper.d.ts","sourceRoot":"","sources":["../../../src/admin-backend/auth/authorization.helper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAY,KAAK,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE3E,OAAO,KAAK,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAgBlG,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,wBAAsB,eAAe,CACnC,WAAW,EAAE,WAAW,GAAG,oBAAoB,EAC/C,WAAW,EAAE,aAAa,EAC1B,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,iBAAiB,CAAC,CAgB5B;AAED,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC,EACzD,GAAG,EAAE,MAAM,EACX,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,iBAAiB,CAAC,CAsB5B"}
|
|
@@ -28,7 +28,9 @@ export async function permissionGuard(siteContext, httpContext, requiredPermissi
|
|
|
28
28
|
};
|
|
29
29
|
}
|
|
30
30
|
export async function permissionPatGuard(siteContext, pat, requiredPermission) {
|
|
31
|
-
const authResult = await authenticateWithPat(siteContext.cn, pat
|
|
31
|
+
const authResult = await authenticateWithPat(siteContext.cn, pat, {
|
|
32
|
+
allowUnsafeLogin: siteContext.regSite.allowUnsafeLogin,
|
|
33
|
+
});
|
|
32
34
|
const account = { id: authResult.accountId, email: authResult.email };
|
|
33
35
|
const roles = await loadAccountRoles(siteContext, account);
|
|
34
36
|
const permissions = [...new Set(roles.flatMap((role) => getRolePermissions(role)))];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authorization.helper.js","sourceRoot":"","sources":["../../../src/admin-backend/auth/authorization.helper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAsB,MAAM,6BAA6B,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AAErF,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,SAAS,kBAAkB,CAAC,IAAY;IACtC,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,OAAO;YACV,OAAO,iBAAiB,CAAC;QAC3B,KAAK,QAAQ;YACX,OAAO,kBAAkB,CAAC;QAC5B;YACE,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC;AAYD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,WAA+C,EAC/C,WAA0B,EAC1B,kBAA0B;IAE1B,MAAM,OAAO,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;IAEvC,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAEpF,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,QAAQ,CAAC,qCAAqC,EAAE,GAAG,CAAC,CAAC;IACjE,CAAC;IAED,OAAO;QACL,SAAS,EAAE,OAAO,CAAC,EAAE;QACrB,KAAK;QACL,WAAW;QACX,GAAG,OAAO;KACX,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,
|
|
1
|
+
{"version":3,"file":"authorization.helper.js","sourceRoot":"","sources":["../../../src/admin-backend/auth/authorization.helper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAsB,MAAM,6BAA6B,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AAErF,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,SAAS,kBAAkB,CAAC,IAAY;IACtC,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,OAAO;YACV,OAAO,iBAAiB,CAAC;QAC3B,KAAK,QAAQ;YACX,OAAO,kBAAkB,CAAC;QAC5B;YACE,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC;AAYD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,WAA+C,EAC/C,WAA0B,EAC1B,kBAA0B;IAE1B,MAAM,OAAO,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;IAEvC,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAEpF,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,QAAQ,CAAC,qCAAqC,EAAE,GAAG,CAAC,CAAC;IACjE,CAAC;IAED,OAAO;QACL,SAAS,EAAE,OAAO,CAAC,EAAE;QACrB,KAAK;QACL,WAAW;QACX,GAAG,OAAO;KACX,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,WAAyD,EACzD,GAAW,EACX,kBAA0B;IAE1B,MAAM,UAAU,GAAG,MAAM,mBAAmB,CAAC,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE;QAChE,gBAAgB,EAAE,WAAW,CAAC,OAAO,CAAC,gBAAgB;KACvD,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,EAAE,EAAE,EAAE,UAAU,CAAC,SAAS,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,CAAC;IACtE,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAEpF,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,QAAQ,CAAC,qCAAqC,EAAE,GAAG,CAAC,CAAC;IACjE,CAAC;IAED,OAAO;QACL,EAAE,EAAE,UAAU,CAAC,SAAS;QACxB,SAAS,EAAE,UAAU,CAAC,SAAS;QAC/B,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,WAAW,EAAE,KAAK;QAClB,KAAK;QACL,WAAW;KACZ,CAAC;AACJ,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ApiError } from "@paroicms/public-server-lib";
|
|
1
|
+
import { ApiError, assertBody } from "@paroicms/public-server-lib";
|
|
2
2
|
import { type } from "arktype";
|
|
3
3
|
import { getVerifiedAccountFromToken, loginByPlatformToken, loginLocalUser, } from "../auth/auth.service.js";
|
|
4
4
|
import { recordEvent } from "../event-log/event-log.service.js";
|
|
@@ -6,7 +6,7 @@ export async function loginController(siteContext, httpContext, _routeParams) {
|
|
|
6
6
|
const defaultLanguage = siteContext.status === "migration"
|
|
7
7
|
? (siteContext.deprecatedSiteSchema.languages[0] ?? "en")
|
|
8
8
|
: siteContext.siteSchema.defaultLanguage;
|
|
9
|
-
const loginInput = formatLoginAction(httpContext
|
|
9
|
+
const loginInput = formatLoginAction(httpContext);
|
|
10
10
|
if (loginInput.action === "loginWithPlatformToken") {
|
|
11
11
|
const result = await loginByPlatformToken(siteContext, {
|
|
12
12
|
token: loginInput.token,
|
|
@@ -62,8 +62,8 @@ const LoginActionUrlQuery = type({
|
|
|
62
62
|
"token?": "string|undefined",
|
|
63
63
|
"+": "reject",
|
|
64
64
|
});
|
|
65
|
-
function formatLoginAction(
|
|
66
|
-
const validated = LoginActionUrlQuery
|
|
65
|
+
function formatLoginAction(httpContext) {
|
|
66
|
+
const validated = assertBody(LoginActionUrlQuery, httpContext);
|
|
67
67
|
const action = validated.action;
|
|
68
68
|
if (action === "signIn") {
|
|
69
69
|
if (!validated.email || !validated.password) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.controller.js","sourceRoot":"","sources":["../../../src/admin-backend/login/login.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"login.controller.js","sourceRoot":"","sources":["../../../src/admin-backend/login/login.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-upload.controller.d.ts","sourceRoot":"","sources":["../../../src/admin-backend/media/media-upload.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAqB,MAAM,iCAAiC,CAAC;AAEvF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAMjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAkB5E,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,aAAa,GACzB,OAAO,CAAC,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"media-upload.controller.d.ts","sourceRoot":"","sources":["../../../src/admin-backend/media/media-upload.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAqB,MAAM,iCAAiC,CAAC;AAEvF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAMjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAkB5E,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,aAAa,GACzB,OAAO,CAAC,YAAY,CAAC,CA6DvB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { getNodeTypeByName } from "@paroicms/internal-anywhere-lib";
|
|
2
|
-
import { ApiError } from "@paroicms/public-server-lib";
|
|
2
|
+
import { ApiError, assertBody } from "@paroicms/public-server-lib";
|
|
3
3
|
import { type } from "arktype";
|
|
4
4
|
import { getNodeIdFromHandle } from "../../common/media-handles.helpers.js";
|
|
5
5
|
import { makeDefaultThumbAvailableForAdminUi } from "../../common/medias/media-lib.js";
|
|
@@ -22,10 +22,9 @@ export async function uploadMediaController(siteContext, httpContext) {
|
|
|
22
22
|
const authorizedAccount = await permissionGuard(siteContext, httpContext, "document.edit");
|
|
23
23
|
const { req } = httpContext;
|
|
24
24
|
const file = req.file;
|
|
25
|
-
const body = req.body;
|
|
26
25
|
if (!file)
|
|
27
26
|
throw new ApiError("missing file", 400);
|
|
28
|
-
const { handle, attachedData, replace } = UploadBodyAT
|
|
27
|
+
const { handle, attachedData, replace } = assertBody(UploadBodyAT, httpContext);
|
|
29
28
|
const nodeId = getNodeIdFromHandle(siteContext, handle);
|
|
30
29
|
const typeName = await getTypeNameOf(siteContext, nodeId);
|
|
31
30
|
const nodeType = getNodeTypeByName(siteContext.siteSchema, typeName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-upload.controller.js","sourceRoot":"","sources":["../../../src/admin-backend/media/media-upload.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAGvF,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"media-upload.controller.js","sourceRoot":"","sources":["../../../src/admin-backend/media/media-upload.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { PaHttpContext } from "@paroicms/public-server-lib";
|
|
2
|
+
import type { PaRouteParams } from "../../express/http-helpers.js";
|
|
3
|
+
import type { SiteContext } from "../../site-context/site-context.types.js";
|
|
4
|
+
export declare function devPatController(siteContext: SiteContext, httpContext: PaHttpContext, _routeParams: PaRouteParams): Promise<{
|
|
5
|
+
token: string;
|
|
6
|
+
email: string;
|
|
7
|
+
accountId: string;
|
|
8
|
+
}>;
|
|
9
|
+
//# sourceMappingURL=dev-pat.controller.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dev-pat.controller.d.ts","sourceRoot":"","sources":["../../../src/admin-backend/personal-access-token/dev-pat.controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAGjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAKnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAY5E,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,aAAa,EAC1B,YAAY,EAAE,aAAa;;;;GAoB5B"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { ApiError, assertBody } from "@paroicms/public-server-lib";
|
|
2
|
+
import { type } from "arktype";
|
|
3
|
+
import { createPat, deleteActiveDevPatsByDescription, } from "../../personal-access-token/pat.service.js";
|
|
4
|
+
import { loginLocalUser } from "../auth/auth.service.js";
|
|
5
|
+
const DEFAULT_DESCRIPTION = "Unsafe dev token";
|
|
6
|
+
const DevPatBodyAT = type({
|
|
7
|
+
email: "string",
|
|
8
|
+
password: "string",
|
|
9
|
+
"description?": "string|undefined",
|
|
10
|
+
"+": "reject",
|
|
11
|
+
});
|
|
12
|
+
export async function devPatController(siteContext, httpContext, _routeParams) {
|
|
13
|
+
if (!siteContext.regSite.allowUnsafeLogin)
|
|
14
|
+
throw new ApiError("Not Found", 404);
|
|
15
|
+
const body = assertBody(DevPatBodyAT, httpContext);
|
|
16
|
+
const login = await loginLocalUser(siteContext, {
|
|
17
|
+
user: { email: body.email, password: body.password },
|
|
18
|
+
defaultLanguage: siteContext.siteSchema.defaultLanguage,
|
|
19
|
+
});
|
|
20
|
+
if ("statusCode" in login)
|
|
21
|
+
throw new ApiError(login.message, login.statusCode);
|
|
22
|
+
const description = body.description ?? DEFAULT_DESCRIPTION;
|
|
23
|
+
await deleteActiveDevPatsByDescription(siteContext, { accountId: login.id, description });
|
|
24
|
+
const { token } = await createPat(siteContext, {
|
|
25
|
+
accountId: login.id,
|
|
26
|
+
origin: "dev",
|
|
27
|
+
description,
|
|
28
|
+
});
|
|
29
|
+
return { token, email: login.email, accountId: login.id };
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=dev-pat.controller.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dev-pat.controller.js","sourceRoot":"","sources":["../../../src/admin-backend/personal-access-token/dev-pat.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,OAAO,EACL,SAAS,EACT,gCAAgC,GACjC,MAAM,4CAA4C,CAAC;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,MAAM,mBAAmB,GAAG,kBAAkB,CAAC;AAE/C,MAAM,YAAY,GAAG,IAAI,CAAC;IACxB,KAAK,EAAE,QAAQ;IACf,QAAQ,EAAE,QAAQ;IAClB,cAAc,EAAE,kBAAkB;IAClC,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC;AAEH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,WAAwB,EACxB,WAA0B,EAC1B,YAA2B;IAE3B,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,gBAAgB;QAAE,MAAM,IAAI,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IAEhF,MAAM,IAAI,GAAG,UAAU,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE;QAC9C,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE;QACpD,eAAe,EAAE,WAAW,CAAC,UAAU,CAAC,eAAe;KACxD,CAAC,CAAC;IACH,IAAI,YAAY,IAAI,KAAK;QAAE,MAAM,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAE/E,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,mBAAmB,CAAC;IAC5D,MAAM,gCAAgC,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;IAC1F,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE;QAC7C,SAAS,EAAE,KAAK,CAAC,EAAE;QACnB,MAAM,EAAE,KAAK;QACb,WAAW;KACZ,CAAC,CAAC;IAEH,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;AAC5D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pat.resolver.d.ts","sourceRoot":"","sources":["../../../src/admin-backend/personal-access-token/pat.resolver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAkB,KAAK,cAAc,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"pat.resolver.d.ts","sourceRoot":"","sources":["../../../src/admin-backend/personal-access-token/pat.resolver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAkB,KAAK,cAAc,EAAE,MAAM,gCAAgC,CAAC;AA0CrF,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,cAAc,CAyCrD,CAAC"}
|
|
@@ -8,6 +8,7 @@ const CreatePatInputAT = type({
|
|
|
8
8
|
"+": "reject",
|
|
9
9
|
}).pipe((input) => ({
|
|
10
10
|
accountId: input.accountId,
|
|
11
|
+
origin: "user",
|
|
11
12
|
description: input.description,
|
|
12
13
|
expiresAt: input.expiresAt ? new Date(input.expiresAt) : undefined,
|
|
13
14
|
}));
|
|
@@ -21,6 +22,7 @@ function toGqlPat(pat) {
|
|
|
21
22
|
id: pat.id,
|
|
22
23
|
accountId: pat.accountId,
|
|
23
24
|
tokenPreview: pat.tokenPreview,
|
|
25
|
+
origin: pat.origin,
|
|
24
26
|
description: pat.description ?? null,
|
|
25
27
|
createdAt: pat.createdAt,
|
|
26
28
|
lastUsedAt: pat.lastUsedAt ?? null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pat.resolver.js","sourceRoot":"","sources":["../../../src/admin-backend/personal-access-token/pat.resolver.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"pat.resolver.js","sourceRoot":"","sources":["../../../src/admin-backend/personal-access-token/pat.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ddl-migration.d.ts","sourceRoot":"","sources":["../../../src/connector/db-init/ddl-migration.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAGjC,wBAAsB,aAAa,CACjC,EAAE,EAAE,IAAI,EACR,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAE,EACnE,eAAe,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,
|
|
1
|
+
{"version":3,"file":"ddl-migration.d.ts","sourceRoot":"","sources":["../../../src/connector/db-init/ddl-migration.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAGjC,wBAAsB,aAAa,CACjC,EAAE,EAAE,IAAI,EACR,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAE,EACnE,eAAe,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,iBA4XlC"}
|
|
@@ -288,6 +288,11 @@ set updatedAt = coalesce(
|
|
|
288
288
|
await setMetadataDbSchemaVersion(cn, { dbSchemaName: mainDbSchemaName, value: 29 });
|
|
289
289
|
currentVersion = 29;
|
|
290
290
|
}
|
|
291
|
+
if (currentVersion === 29) {
|
|
292
|
+
await cn.raw("alter table PaPersonalAccessToken add column origin varchar(50) not null default 'user'");
|
|
293
|
+
await setMetadataDbSchemaVersion(cn, { dbSchemaName: mainDbSchemaName, value: 30 });
|
|
294
|
+
currentVersion = 30;
|
|
295
|
+
}
|
|
291
296
|
if (currentVersion !== toVersion) {
|
|
292
297
|
throw new Error(`version of ${mainDbSchemaName} database should be '${toVersion}', but is '${currentVersion}'`);
|
|
293
298
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ddl-migration.js","sourceRoot":"","sources":["../../../src/connector/db-init/ddl-migration.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ddl-migration.js","sourceRoot":"","sources":["../../../src/connector/db-init/ddl-migration.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"site-middleware.d.ts","sourceRoot":"","sources":["../../src/express/site-middleware.ts"],"names":[],"mappings":"AAGA,OAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"site-middleware.d.ts","sourceRoot":"","sources":["../../src/express/site-middleware.ts"],"names":[],"mappings":"AAGA,OAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,SAAS,CAAC;AAkDvD,wBAAsB,8BAA8B,IAAI,OAAO,CAAC,cAAc,CAAC,CAiC9E;AAED,wBAAgB,2BAA2B,mDAyB1C;AAED,wBAAgB,4BAA4B,mDAuB3C"}
|
|
@@ -7,6 +7,7 @@ import multer from "multer";
|
|
|
7
7
|
import { downloadBackupController } from "../admin-backend/backup/backup.controller.js";
|
|
8
8
|
import { loginController } from "../admin-backend/login/login.controller.js";
|
|
9
9
|
import { uploadMediaController } from "../admin-backend/media/media-upload.controller.js";
|
|
10
|
+
import { devPatController } from "../admin-backend/personal-access-token/dev-pat.controller.js";
|
|
10
11
|
import { platformLogger } from "../context.js";
|
|
11
12
|
import { getPaSiteContext } from "../express/http-helpers.js";
|
|
12
13
|
import { mergeReqHandlers, reqHandlerToExpressMiddleware, wrapRouteController, } from "../express/route-handler-wrapper.js";
|
|
@@ -65,6 +66,7 @@ export function createMinimalSiteMiddleware() {
|
|
|
65
66
|
router.get("/adm/backend/backup/:backupName", wrapRouteController(downloadBackupController));
|
|
66
67
|
router.get("/api/v1/healthcheck", wrapRouteController(healthCheckController));
|
|
67
68
|
router.post("/api/v1/login", wrapRouteController(loginController, { allowMigration: true }));
|
|
69
|
+
router.post("/api/v1/dev-pat", wrapRouteController(devPatController));
|
|
68
70
|
router.post("/api/v1/set-account-password", wrapRouteController(setAccountPasswordController));
|
|
69
71
|
router.post("/api/v1/check-password-reset", wrapRouteController(checkPasswordResetController));
|
|
70
72
|
router.post("/api/v1/protected-access", wrapRouteController(protectedAccessController));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"site-middleware.js","sourceRoot":"","sources":["../../src/express/site-middleware.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"site-middleware.js","sourceRoot":"","sources":["../../src/express/site-middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,5 +3,7 @@ export interface PatAuthResult {
|
|
|
3
3
|
accountId: string;
|
|
4
4
|
email: string;
|
|
5
5
|
}
|
|
6
|
-
export declare function authenticateWithPat(cn: Knex, token: string
|
|
6
|
+
export declare function authenticateWithPat(cn: Knex, token: string, { allowUnsafeLogin }: {
|
|
7
|
+
allowUnsafeLogin: boolean;
|
|
8
|
+
}): Promise<PatAuthResult>;
|
|
7
9
|
//# sourceMappingURL=pat-auth.helper.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pat-auth.helper.d.ts","sourceRoot":"","sources":["../../src/personal-access-token/pat-auth.helper.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAGjC,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf;
|
|
1
|
+
{"version":3,"file":"pat-auth.helper.d.ts","sourceRoot":"","sources":["../../src/personal-access-token/pat-auth.helper.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAGjC,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf;AAqBD,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,IAAI,EACR,KAAK,EAAE,MAAM,EACb,EAAE,gBAAgB,EAAE,EAAE;IAAE,gBAAgB,EAAE,OAAO,CAAA;CAAE,GAClD,OAAO,CAAC,aAAa,CAAC,CA6CxB"}
|
|
@@ -6,6 +6,7 @@ const PatAuthRowAT = type({
|
|
|
6
6
|
id: "number",
|
|
7
7
|
accountId: "number",
|
|
8
8
|
email: "string",
|
|
9
|
+
origin: "'user'|'dev'",
|
|
9
10
|
active: "number",
|
|
10
11
|
expiresAt: "string|number|Date|null",
|
|
11
12
|
accountActive: "number",
|
|
@@ -14,14 +15,15 @@ const PatAuthRowAT = type({
|
|
|
14
15
|
id: String(r.id),
|
|
15
16
|
accountId: String(r.accountId),
|
|
16
17
|
email: r.email,
|
|
18
|
+
origin: r.origin,
|
|
17
19
|
active: Boolean(r.active),
|
|
18
20
|
expiresAt: parseSqliteDateTime(r.expiresAt),
|
|
19
21
|
accountActive: Boolean(r.accountActive),
|
|
20
22
|
}));
|
|
21
|
-
export async function authenticateWithPat(cn, token) {
|
|
23
|
+
export async function authenticateWithPat(cn, token, { allowUnsafeLogin }) {
|
|
22
24
|
const tokenHash = hashToken(token);
|
|
23
25
|
const row = await cn("PaPersonalAccessToken as p")
|
|
24
|
-
.select("p.id", "p.accountId", "p.active", "p.expiresAt", "a.email", cn.raw("a.active as accountActive"))
|
|
26
|
+
.select("p.id", "p.accountId", "p.origin", "p.active", "p.expiresAt", "a.email", cn.raw("a.active as accountActive"))
|
|
25
27
|
.innerJoin("PaAccount as a", "a.id", "p.accountId")
|
|
26
28
|
.where("p.tokenHash", tokenHash)
|
|
27
29
|
.first();
|
|
@@ -29,6 +31,9 @@ export async function authenticateWithPat(cn, token) {
|
|
|
29
31
|
throw new ApiError("Invalid or expired token", 401);
|
|
30
32
|
}
|
|
31
33
|
const validated = PatAuthRowAT.assert(row);
|
|
34
|
+
if (validated.origin === "dev" && !allowUnsafeLogin) {
|
|
35
|
+
throw new ApiError("Token is inactive", 401);
|
|
36
|
+
}
|
|
32
37
|
if (!validated.active) {
|
|
33
38
|
throw new ApiError("Token is inactive", 401);
|
|
34
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pat-auth.helper.js","sourceRoot":"","sources":["../../src/personal-access-token/pat-auth.helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAO/D,MAAM,YAAY,GAAG,IAAI,CAAC;IACxB,EAAE,EAAE,QAAQ;IACZ,SAAS,EAAE,QAAQ;IACnB,KAAK,EAAE,QAAQ;IACf,MAAM,EAAE,QAAQ;IAChB,SAAS,EAAE,yBAAyB;IACpC,aAAa,EAAE,QAAQ;IACvB,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACd,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IAC9B,KAAK,EAAE,CAAC,CAAC,KAAK;IACd,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;IACzB,SAAS,EAAE,mBAAmB,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3C,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC;CACxC,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,KAAK,UAAU,mBAAmB,
|
|
1
|
+
{"version":3,"file":"pat-auth.helper.js","sourceRoot":"","sources":["../../src/personal-access-token/pat-auth.helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAO/D,MAAM,YAAY,GAAG,IAAI,CAAC;IACxB,EAAE,EAAE,QAAQ;IACZ,SAAS,EAAE,QAAQ;IACnB,KAAK,EAAE,QAAQ;IACf,MAAM,EAAE,cAAc;IACtB,MAAM,EAAE,QAAQ;IAChB,SAAS,EAAE,yBAAyB;IACpC,aAAa,EAAE,QAAQ;IACvB,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACd,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IAC9B,KAAK,EAAE,CAAC,CAAC,KAAK;IACd,MAAM,EAAE,CAAC,CAAC,MAAM;IAChB,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;IACzB,SAAS,EAAE,mBAAmB,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3C,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC;CACxC,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,EAAQ,EACR,KAAa,EACb,EAAE,gBAAgB,EAAiC;IAEnD,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IAEnC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,4BAA4B,CAAC;SAC/C,MAAM,CACL,MAAM,EACN,aAAa,EACb,UAAU,EACV,UAAU,EACV,aAAa,EACb,SAAS,EACT,EAAE,CAAC,GAAG,CAAC,2BAA2B,CAAC,CACpC;SACA,SAAS,CAAC,gBAAgB,EAAE,MAAM,EAAE,aAAa,CAAC;SAClD,KAAK,CAAC,aAAa,EAAE,SAAS,CAAC;SAC/B,KAAK,EAAE,CAAC;IAEX,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,QAAQ,CAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAE3C,IAAI,SAAS,CAAC,MAAM,KAAK,KAAK,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACpD,MAAM,IAAI,QAAQ,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;QACtB,MAAM,IAAI,QAAQ,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;QAC7B,MAAM,IAAI,QAAQ,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,SAAS,CAAC,SAAS,IAAI,SAAS,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;QAC5D,MAAM,IAAI,QAAQ,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,gBAAgB,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;IAElD,OAAO;QACL,SAAS,EAAE,SAAS,CAAC,SAAS;QAC9B,KAAK,EAAE,SAAS,CAAC,KAAK;KACvB,CAAC;AACJ,CAAC"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
import type { PatOrigin } from "@paroicms/internal-anywhere-lib";
|
|
1
2
|
import type { Knex } from "knex";
|
|
2
3
|
import type { SiteContext } from "../site-context/site-context.types.js";
|
|
3
4
|
export interface PersonalAccessToken {
|
|
4
5
|
id: string;
|
|
5
6
|
accountId: string;
|
|
6
7
|
tokenPreview: string;
|
|
8
|
+
origin: PatOrigin;
|
|
7
9
|
description?: string;
|
|
8
10
|
createdAt: Date;
|
|
9
11
|
lastUsedAt?: Date;
|
|
@@ -12,6 +14,7 @@ export interface PersonalAccessToken {
|
|
|
12
14
|
}
|
|
13
15
|
export interface CreatePatOptions {
|
|
14
16
|
accountId: string;
|
|
17
|
+
origin: PatOrigin;
|
|
15
18
|
description?: string;
|
|
16
19
|
expiresAt?: Date;
|
|
17
20
|
}
|
|
@@ -33,5 +36,9 @@ export declare function listPatsByAccount(siteContext: SiteContext, accountId: s
|
|
|
33
36
|
export declare function getPat(siteContext: SiteContext, patId: string): Promise<PersonalAccessToken | undefined>;
|
|
34
37
|
export declare function updatePat(siteContext: SiteContext, patId: string, options: UpdatePatOptions): Promise<void>;
|
|
35
38
|
export declare function deletePat(siteContext: SiteContext, patId: string): Promise<void>;
|
|
39
|
+
export declare function deleteActiveDevPatsByDescription(siteContext: SiteContext, options: {
|
|
40
|
+
accountId: string;
|
|
41
|
+
description: string;
|
|
42
|
+
}): Promise<void>;
|
|
36
43
|
export declare function updateLastUsedAt(cn: Knex, tokenHash: string, timestamp: Date): Promise<void>;
|
|
37
44
|
//# sourceMappingURL=pat.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pat.service.d.ts","sourceRoot":"","sources":["../../src/personal-access-token/pat.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pat.service.d.ts","sourceRoot":"","sources":["../../src/personal-access-token/pat.service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAGjE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAEjC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAEzE,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,IAAI,CAAC;IAChB,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,IAAI,CAAC;CAClB;AAED,MAAM,WAAW,gBAAgB;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,wBAAgB,WAAW,IAAI;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAMxF;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE/C;AAyBD,wBAAsB,SAAS,CAC7B,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,mBAAmB,CAAA;CAAE,CAAC,CAyBtD;AAED,wBAAsB,iBAAiB,CACrC,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAkBhC;AAED,wBAAsB,MAAM,CAC1B,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAmB1C;AAED,wBAAsB,SAAS,CAC7B,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,IAAI,CAAC,CAYf;AAED,wBAAsB,SAAS,CAAC,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEtF;AAED,wBAAsB,gCAAgC,CACpD,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GAClD,OAAO,CAAC,IAAI,CAAC,CAMf;AAED,wBAAsB,gBAAgB,CACpC,EAAE,EAAE,IAAI,EACR,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,IAAI,GACd,OAAO,CAAC,IAAI,CAAC,CAIf"}
|
|
@@ -15,6 +15,7 @@ const PatRowAT = type({
|
|
|
15
15
|
id: "number",
|
|
16
16
|
accountId: "number",
|
|
17
17
|
tokenPreview: "string",
|
|
18
|
+
origin: "'user'|'dev'",
|
|
18
19
|
description: "string|null",
|
|
19
20
|
createdAt: "string|number|Date|null",
|
|
20
21
|
lastUsedAt: "string|number|Date|null",
|
|
@@ -25,6 +26,7 @@ const PatRowAT = type({
|
|
|
25
26
|
id: String(r.id),
|
|
26
27
|
accountId: String(r.accountId),
|
|
27
28
|
tokenPreview: r.tokenPreview,
|
|
29
|
+
origin: r.origin,
|
|
28
30
|
description: r.description ?? undefined,
|
|
29
31
|
createdAt: parseSqliteDateTime(r.createdAt) ?? new Date(),
|
|
30
32
|
lastUsedAt: parseSqliteDateTime(r.lastUsedAt),
|
|
@@ -32,12 +34,13 @@ const PatRowAT = type({
|
|
|
32
34
|
active: Boolean(r.active),
|
|
33
35
|
}));
|
|
34
36
|
export async function createPat(siteContext, options) {
|
|
35
|
-
const { accountId, description, expiresAt } = options;
|
|
37
|
+
const { accountId, origin, description, expiresAt } = options;
|
|
36
38
|
const { token, tokenHash, tokenPreview } = generatePat();
|
|
37
39
|
const [id] = await siteContext.cn("PaPersonalAccessToken").insert({
|
|
38
40
|
accountId,
|
|
39
41
|
tokenHash,
|
|
40
42
|
tokenPreview,
|
|
43
|
+
origin,
|
|
41
44
|
description: description ?? null,
|
|
42
45
|
expiresAt: expiresAt ? sqliteDateTime(expiresAt) : null,
|
|
43
46
|
});
|
|
@@ -45,6 +48,7 @@ export async function createPat(siteContext, options) {
|
|
|
45
48
|
id: String(id),
|
|
46
49
|
accountId,
|
|
47
50
|
tokenPreview,
|
|
51
|
+
origin,
|
|
48
52
|
description,
|
|
49
53
|
createdAt: new Date(),
|
|
50
54
|
expiresAt,
|
|
@@ -55,7 +59,7 @@ export async function createPat(siteContext, options) {
|
|
|
55
59
|
export async function listPatsByAccount(siteContext, accountId) {
|
|
56
60
|
const rows = await siteContext
|
|
57
61
|
.cn("PaPersonalAccessToken")
|
|
58
|
-
.select("id", "accountId", "tokenPreview", "description", "createdAt", "lastUsedAt", "expiresAt", "active")
|
|
62
|
+
.select("id", "accountId", "tokenPreview", "origin", "description", "createdAt", "lastUsedAt", "expiresAt", "active")
|
|
59
63
|
.where({ accountId })
|
|
60
64
|
.orderBy("createdAt", "desc");
|
|
61
65
|
return rows.map((row) => PatRowAT.assert(row));
|
|
@@ -63,7 +67,7 @@ export async function listPatsByAccount(siteContext, accountId) {
|
|
|
63
67
|
export async function getPat(siteContext, patId) {
|
|
64
68
|
const row = await siteContext
|
|
65
69
|
.cn("PaPersonalAccessToken")
|
|
66
|
-
.select("id", "accountId", "tokenPreview", "description", "createdAt", "lastUsedAt", "expiresAt", "active")
|
|
70
|
+
.select("id", "accountId", "tokenPreview", "origin", "description", "createdAt", "lastUsedAt", "expiresAt", "active")
|
|
67
71
|
.where({ id: patId })
|
|
68
72
|
.first();
|
|
69
73
|
if (!row)
|
|
@@ -85,6 +89,13 @@ export async function updatePat(siteContext, patId, options) {
|
|
|
85
89
|
export async function deletePat(siteContext, patId) {
|
|
86
90
|
await siteContext.cn("PaPersonalAccessToken").delete().where({ id: patId });
|
|
87
91
|
}
|
|
92
|
+
export async function deleteActiveDevPatsByDescription(siteContext, options) {
|
|
93
|
+
const { accountId, description } = options;
|
|
94
|
+
await siteContext
|
|
95
|
+
.cn("PaPersonalAccessToken")
|
|
96
|
+
.delete()
|
|
97
|
+
.where({ accountId, origin: "dev", description, active: 1 });
|
|
98
|
+
}
|
|
88
99
|
export async function updateLastUsedAt(cn, tokenHash, timestamp) {
|
|
89
100
|
await cn("PaPersonalAccessToken")
|
|
90
101
|
.update({ lastUsedAt: sqliteDateTime(timestamp) })
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pat.service.js","sourceRoot":"","sources":["../../src/personal-access-token/pat.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pat.service.js","sourceRoot":"","sources":["../../src/personal-access-token/pat.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"password-reset.controller.d.ts","sourceRoot":"","sources":["../../../src/public-api/password-reset/password-reset.controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"password-reset.controller.d.ts","sourceRoot":"","sources":["../../../src/public-api/password-reset/password-reset.controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAGjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAU5E,wBAAsB,4BAA4B,CAChD,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,aAAa,iBAW3B;AAQD,wBAAsB,4BAA4B,CAChD,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,aAAa;;GAQ3B"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { assertBody } from "@paroicms/public-server-lib";
|
|
1
2
|
import { type } from "arktype";
|
|
2
3
|
import { checkAccountPasswordReset, updateAccountPassword } from "./password-reset.service.js";
|
|
3
4
|
const SetAccountPasswordBodyAT = type({
|
|
@@ -7,7 +8,7 @@ const SetAccountPasswordBodyAT = type({
|
|
|
7
8
|
"+": "reject",
|
|
8
9
|
});
|
|
9
10
|
export async function setAccountPasswordController(siteContext, httpContext) {
|
|
10
|
-
const { accountId, password, resetToken } = SetAccountPasswordBodyAT
|
|
11
|
+
const { accountId, password, resetToken } = assertBody(SetAccountPasswordBodyAT, httpContext);
|
|
11
12
|
const payload = {
|
|
12
13
|
accountId,
|
|
13
14
|
password,
|
|
@@ -21,7 +22,7 @@ const CheckPasswordResetBodyAT = type({
|
|
|
21
22
|
"+": "reject",
|
|
22
23
|
});
|
|
23
24
|
export async function checkPasswordResetController(siteContext, httpContext) {
|
|
24
|
-
const { accountId, resetToken } = CheckPasswordResetBodyAT
|
|
25
|
+
const { accountId, resetToken } = assertBody(CheckPasswordResetBodyAT, httpContext);
|
|
25
26
|
return await checkAccountPasswordReset(siteContext, {
|
|
26
27
|
accountId,
|
|
27
28
|
resetToken,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"password-reset.controller.js","sourceRoot":"","sources":["../../../src/public-api/password-reset/password-reset.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAE/F,MAAM,wBAAwB,GAAG,IAAI,CAAC;IACpC,SAAS,EAAE,QAAQ;IACnB,QAAQ,EAAE,QAAQ;IAClB,UAAU,EAAE,QAAQ;IACpB,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC;AAEH,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAChD,WAAwB,EACxB,WAA0B;IAE1B,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"password-reset.controller.js","sourceRoot":"","sources":["../../../src/public-api/password-reset/password-reset.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAE/F,MAAM,wBAAwB,GAAG,IAAI,CAAC;IACpC,SAAS,EAAE,QAAQ;IACnB,QAAQ,EAAE,QAAQ;IAClB,UAAU,EAAE,QAAQ;IACpB,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC;AAEH,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAChD,WAAwB,EACxB,WAA0B;IAE1B,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,wBAAwB,EAAE,WAAW,CAAC,CAAC;IAE9F,MAAM,OAAO,GAAG;QACd,SAAS;QACT,QAAQ;QACR,UAAU;KACX,CAAC;IAEF,MAAM,qBAAqB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,wBAAwB,GAAG,IAAI,CAAC;IACpC,SAAS,EAAE,QAAQ;IACnB,UAAU,EAAE,QAAQ;IACpB,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC;AAEH,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAChD,WAAwB,EACxB,WAA0B;IAE1B,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,wBAAwB,EAAE,WAAW,CAAC,CAAC;IAEpF,OAAO,MAAM,yBAAyB,CAAC,WAAW,EAAE;QAClD,SAAS;QACT,UAAU;KACX,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"site-content-api.d.ts","sourceRoot":"","sources":["../../src/running-server/site-content-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"site-content-api.d.ts","sourceRoot":"","sources":["../../src/running-server/site-content-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAKhE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAGzE,wBAAsB,4BAA4B,CAChD,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,YAAY,EACrB,OAAO,CAAC,EAAE;IAAE,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,mBAgDvC;AAED,wBAAsB,+BAA+B,CACnD,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,iBAAiB,GACxB,OAAO,CAAC,IAAI,CAAC,CAcf"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type } from "arktype";
|
|
2
|
+
import { resetAccountToken } from "../admin-backend/account/account.queries.js";
|
|
2
3
|
import { saveFieldValues } from "../admin-backend/fields/save-fields.queries.js";
|
|
3
4
|
import { hashPassword } from "../helpers/passwordEncrypt-helper.js";
|
|
4
5
|
import { applyMarkdownToNativeForValues } from "./markdown-content.js";
|
|
@@ -12,7 +13,9 @@ export async function createAccountProgrammaticApi(siteContext, account, options
|
|
|
12
13
|
.insert({
|
|
13
14
|
email,
|
|
14
15
|
name,
|
|
15
|
-
passwordHash: kind === "local"
|
|
16
|
+
passwordHash: kind === "local" && account.password !== undefined
|
|
17
|
+
? await hashPassword(account.password)
|
|
18
|
+
: undefined,
|
|
16
19
|
})
|
|
17
20
|
.returning("id");
|
|
18
21
|
const insertedId = String(InsertedIdAT.assert(inserted).id);
|
|
@@ -21,6 +24,13 @@ export async function createAccountProgrammaticApi(siteContext, account, options
|
|
|
21
24
|
.cn("PaAccountRole")
|
|
22
25
|
.insert(account.roles.map((role) => ({ accountId: insertedId, role })));
|
|
23
26
|
}
|
|
27
|
+
if (kind === "local" && account.password === undefined) {
|
|
28
|
+
await resetAccountToken(siteContext, {
|
|
29
|
+
id: insertedId,
|
|
30
|
+
email,
|
|
31
|
+
language: account.language ?? siteContext.siteSchema.defaultLanguage,
|
|
32
|
+
});
|
|
33
|
+
}
|
|
24
34
|
if (options?.asContactEmail) {
|
|
25
35
|
await saveFieldValues(siteContext, {
|
|
26
36
|
typeName: siteType.typeName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"site-content-api.js","sourceRoot":"","sources":["../../src/running-server/site-content-api.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAEpE,OAAO,EAAE,8BAA8B,EAAE,MAAM,uBAAuB,CAAC;AAEvE,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAChD,WAAwB,EACxB,OAAqB,EACrB,OAAsC;IAEtC,MAAM,UAAU,GAAG,WAAW,CAAC,kBAAkB,CAAC,UAAU,CAAC;IAC7D,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,YAAY,GAAG,IAAI,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;IAE3D,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,WAAW;SACjC,EAAE,CAAC,WAAW,CAAC;SACf,MAAM,CAAC;QACN,KAAK;QACL,IAAI;QACJ,YAAY,
|
|
1
|
+
{"version":3,"file":"site-content-api.js","sourceRoot":"","sources":["../../src/running-server/site-content-api.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAEpE,OAAO,EAAE,8BAA8B,EAAE,MAAM,uBAAuB,CAAC;AAEvE,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAChD,WAAwB,EACxB,OAAqB,EACrB,OAAsC;IAEtC,MAAM,UAAU,GAAG,WAAW,CAAC,kBAAkB,CAAC,UAAU,CAAC;IAC7D,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,YAAY,GAAG,IAAI,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;IAE3D,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,WAAW;SACjC,EAAE,CAAC,WAAW,CAAC;SACf,MAAM,CAAC;QACN,KAAK;QACL,IAAI;QACJ,YAAY,EACV,IAAI,KAAK,OAAO,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS;YAChD,CAAC,CAAC,MAAM,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC;YACtC,CAAC,CAAC,SAAS;KAChB,CAAC;SACD,SAAS,CAAC,IAAI,CAAC,CAAC;IACnB,MAAM,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC;IAE5D,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7B,MAAM,WAAW;aACd,EAAE,CAAC,eAAe,CAAC;aACnB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,IAAI,IAAI,KAAK,OAAO,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QACvD,MAAM,iBAAiB,CAAC,WAAW,EAAE;YACnC,EAAE,EAAE,UAAU;YACd,KAAK;YACL,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,WAAW,CAAC,UAAU,CAAC,eAAe;SACrE,CAAC,CAAC;IACL,CAAC;IAED,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;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,+BAA+B,CACnD,WAAwB,EACxB,QAAgB,EAChB,MAAyB;IAEzB,MAAM,eAAe,GAAG,MAAM,8BAA8B,CAC1D,WAAW,EACX,MAAM,EACN,OAAO,EACP,QAAQ,CACT,CAAC;IACF,MAAM,eAAe,CAAC,WAAW,EAAE;QACjC,QAAQ,EAAE,OAAO;QACjB,MAAM,EAAE,WAAW,CAAC,kBAAkB,CAAC,UAAU;QACjD,QAAQ;QACR,MAAM,EAAE,eAAe;QACvB,KAAK,EAAE,IAAI;KACZ,CAAC,CAAC;AACL,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@paroicms/server",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "3.0.0",
|
|
4
4
|
"description": "The ParoiCMS server",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cms",
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"nodemon": "NODE_ENV=development nodemon --delay 1 --watch dist --watch config.json --watch site-schema-lib --watch 'sites/*/*.json' --watch '../../packages/*[!-ui]*/dist/*' --watch '../../plugins/*/*backend/dist/*' dist/start.js | npm run _pino-pretty",
|
|
27
27
|
"tsc:watch": "tsc --watch --preserveWatchOutput",
|
|
28
28
|
"dev": "turbo dev",
|
|
29
|
-
"clear": "rimraf dist/*",
|
|
29
|
+
"clear": "rimraf dist/* tsconfig.tsbuildinfo",
|
|
30
30
|
"typecheck": "tsc --noEmit -p tsconfig.typecheck.json",
|
|
31
31
|
"test:watch": "vitest",
|
|
32
32
|
"test": "vitest run",
|
|
@@ -41,15 +41,15 @@
|
|
|
41
41
|
"@apollo/server": "~5.5.1",
|
|
42
42
|
"@as-integrations/express5": "~1.1.2",
|
|
43
43
|
"@paroicms/admin-ui": "1.96.6",
|
|
44
|
-
"@paroicms/internal-anywhere-lib": "1.
|
|
45
|
-
"@paroicms/internal-server-lib": "1.24.
|
|
46
|
-
"@paroicms/playground_demo1": "0.68.
|
|
44
|
+
"@paroicms/internal-anywhere-lib": "1.40.0",
|
|
45
|
+
"@paroicms/internal-server-lib": "1.24.16",
|
|
46
|
+
"@paroicms/playground_demo1": "0.68.15",
|
|
47
47
|
"@paroicms/public-anywhere-lib": "1.0.1",
|
|
48
|
-
"@paroicms/public-server-lib": "1.
|
|
49
|
-
"@paroicms/script-lib": "1.0.
|
|
50
|
-
"@paroicms/server-database-media-storage": "1.26.
|
|
51
|
-
"@paroicms/server-image-cache-engine": "1.29.
|
|
52
|
-
"@paroicms/server-text-cache-system": "1.21.
|
|
48
|
+
"@paroicms/public-server-lib": "1.2.0",
|
|
49
|
+
"@paroicms/script-lib": "1.0.2",
|
|
50
|
+
"@paroicms/server-database-media-storage": "1.26.23",
|
|
51
|
+
"@paroicms/server-image-cache-engine": "1.29.38",
|
|
52
|
+
"@paroicms/server-text-cache-system": "1.21.38",
|
|
53
53
|
"archiver": "~8.0.0",
|
|
54
54
|
"arktype": "~2.2.1",
|
|
55
55
|
"bcrypt": "~6.0.0",
|
|
@@ -109,6 +109,6 @@
|
|
|
109
109
|
"type": "module",
|
|
110
110
|
"main": "dist/index.js",
|
|
111
111
|
"bin": {
|
|
112
|
-
"paroicms": "cli.js"
|
|
112
|
+
"paroicms-server": "cli.js"
|
|
113
113
|
}
|
|
114
114
|
}
|