@paroicms/server 1.85.1 → 1.86.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/backup/backup.controller.js +2 -1
- package/dist/bo-backend/backup/backup.controller.js.map +1 -1
- package/dist/bo-backend/document/document.resolver.js +1 -1
- package/dist/bo-backend/fields/save-fields.queries.js +5 -0
- package/dist/bo-backend/fields/save-fields.queries.js.map +1 -1
- package/dist/common/serve-text-or.d.ts +8 -0
- package/dist/common/serve-text-or.js +10 -4
- package/dist/common/serve-text-or.js.map +1 -1
- package/dist/context.d.ts +1 -0
- package/dist/context.js +4 -4
- package/dist/context.js.map +1 -1
- package/dist/express/pa-http-context.js +9 -0
- package/dist/express/pa-http-context.js.map +1 -1
- package/dist/express/{public-api-middlewares.js → public-api.req-handler.js} +1 -1
- package/dist/express/{public-api-middlewares.js.map → public-api.req-handler.js.map} +1 -1
- package/dist/express/route-handler-wrapper.d.ts +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.d.ts +2 -1
- package/dist/express/site-middleware.js +23 -15
- package/dist/express/site-middleware.js.map +1 -1
- package/dist/express/{static-files-middlewares.d.ts → static-files.req-handler.d.ts} +1 -1
- package/dist/express/{static-files-middlewares.js → static-files.req-handler.js} +2 -2
- package/dist/express/{static-files-middlewares.js.map → static-files.req-handler.js.map} +1 -1
- package/dist/helpers/make-backend-plugin-service.js +3 -3
- package/dist/helpers/make-backend-plugin-service.js.map +1 -1
- package/dist/index.js +8 -5
- package/dist/index.js.map +1 -1
- package/dist/protected-site/protected-access-token.d.ts +4 -0
- package/dist/protected-site/protected-access-token.js +30 -0
- package/dist/protected-site/protected-access-token.js.map +1 -0
- package/dist/protected-site/protected-access.controller.d.ts +9 -0
- package/dist/protected-site/protected-access.controller.js +22 -0
- package/dist/protected-site/protected-access.controller.js.map +1 -0
- package/dist/protected-site/protected-site.req-handler.d.ts +3 -0
- package/dist/protected-site/protected-site.req-handler.js +164 -0
- package/dist/protected-site/protected-site.req-handler.js.map +1 -0
- package/dist/public-api/public-api-rendering.js +3 -3
- package/dist/public-api/public-api-rendering.js.map +1 -1
- package/dist/public-api/search-text/search-text.queries.d.ts +1 -1
- package/dist/public-api/search-text/search-text.queries.js +1 -1
- package/dist/public-api/search-text/search-text.queries.js.map +1 -1
- package/dist/rendered-site/common-routes.controller.js.map +1 -0
- package/dist/{public-site → rendered-site}/feed/feed-generator.js +4 -4
- package/dist/rendered-site/feed/feed-generator.js.map +1 -0
- package/dist/rendered-site/feed/feed-helpers.js.map +1 -0
- package/dist/{public-site/feed/feed.middleware.js → rendered-site/feed/feed.req-handler.js} +1 -1
- package/dist/rendered-site/feed/feed.req-handler.js.map +1 -0
- package/dist/rendered-site/helpers/format-date.helper.js.map +1 -0
- package/dist/rendered-site/helpers/medias.helpers.js.map +1 -0
- package/dist/rendered-site/liquidjs-filters/format-date.js.map +1 -0
- package/dist/rendered-site/liquidjs-filters/format-number.js.map +1 -0
- package/dist/{public-site → rendered-site}/liquidjs-filters/head-tags-filter.js +1 -1
- package/dist/rendered-site/liquidjs-filters/head-tags-filter.js.map +1 -0
- package/dist/{public-site → rendered-site}/liquidjs-filters/image-zoom-url.js +1 -1
- package/dist/rendered-site/liquidjs-filters/image-zoom-url.js.map +1 -0
- package/dist/rendered-site/liquidjs-filters/info-filter.js.map +1 -0
- package/dist/rendered-site/liquidjs-filters/inject-menu-items-data.js.map +1 -0
- package/dist/rendered-site/liquidjs-filters/make-excerpt.js.map +1 -0
- package/dist/rendered-site/liquidjs-filters/obfuscate.js.map +1 -0
- package/dist/{public-site → rendered-site}/liquidjs-filters/open-graph-filter.d.ts +1 -1
- package/dist/{public-site → rendered-site}/liquidjs-filters/open-graph-filter.js +1 -1
- package/dist/rendered-site/liquidjs-filters/open-graph-filter.js.map +1 -0
- package/dist/rendered-site/liquidjs-filters/plugin-asset-url-filter.js.map +1 -0
- package/dist/rendered-site/liquidjs-filters/translate-filter.js.map +1 -0
- package/dist/{public-site → rendered-site}/liquidjs-tags/get-doc-tag.js +2 -2
- package/dist/rendered-site/liquidjs-tags/get-doc-tag.js.map +1 -0
- package/dist/{public-site → rendered-site}/liquidjs-tags/get-docs-tag.js +2 -2
- package/dist/rendered-site/liquidjs-tags/get-docs-tag.js.map +1 -0
- package/dist/{public-site → rendered-site}/liquidjs-tags/get-paginated-docs-tag.d.ts +2 -2
- package/dist/{public-site → rendered-site}/liquidjs-tags/get-paginated-docs-tag.js +2 -2
- package/dist/rendered-site/liquidjs-tags/get-paginated-docs-tag.js.map +1 -0
- package/dist/{public-site → rendered-site}/liquidjs-tags/use-image-tag.js +1 -1
- package/dist/rendered-site/liquidjs-tags/use-image-tag.js.map +1 -0
- package/dist/rendered-site/media-serve/_media-serve-helpers.js.map +1 -0
- package/dist/rendered-site/media-serve/media-serve.controller.js.map +1 -0
- package/dist/{public-site/public-route → rendered-site/page-route}/make-url.js.map +1 -1
- package/dist/{public-site/public-route/public-route-parser.d.ts → rendered-site/page-route/page-route-parser.d.ts} +4 -4
- package/dist/{public-site/public-route/public-route-parser.js → rendered-site/page-route/page-route-parser.js} +33 -34
- package/dist/rendered-site/page-route/page-route-parser.js.map +1 -0
- package/dist/rendered-site/page-route/raw-document-payload.d.ts +4 -0
- package/dist/{public-site/public-route → rendered-site/page-route}/raw-document-payload.js +1 -1
- package/dist/{public-site/public-route → rendered-site/page-route}/raw-document-payload.js.map +1 -1
- package/dist/{public-site/public-site.middleware.d.ts → rendered-site/rendered-site.req-handler.d.ts} +1 -1
- package/dist/{public-site/public-site.middleware.js → rendered-site/rendered-site.req-handler.js} +16 -10
- package/dist/rendered-site/rendered-site.req-handler.js.map +1 -0
- package/dist/{public-site → rendered-site}/serve-document/serve-document.d.ts +5 -3
- package/dist/{public-site → rendered-site}/serve-document/serve-document.js +23 -9
- package/dist/rendered-site/serve-document/serve-document.js.map +1 -0
- package/dist/{public-site → rendered-site}/serve-index-page.d.ts +1 -1
- package/dist/{public-site → rendered-site}/serve-index-page.js +6 -3
- package/dist/rendered-site/serve-index-page.js.map +1 -0
- package/dist/{public-payload → rendering-payload}/breadcrumb.queries.d.ts +1 -1
- package/dist/{public-payload → rendering-payload}/breadcrumb.queries.js +1 -1
- package/dist/rendering-payload/breadcrumb.queries.js.map +1 -0
- package/dist/{public-payload → rendering-payload}/create-doc-drop.d.ts +4 -1
- package/dist/{public-payload → rendering-payload}/create-doc-drop.js +4 -2
- package/dist/rendering-payload/create-doc-drop.js.map +1 -0
- package/dist/{public-payload → rendering-payload}/create-part-drop.d.ts +1 -1
- package/dist/rendering-payload/create-part-drop.js.map +1 -0
- package/dist/{public-payload → rendering-payload}/doc-values.queries.d.ts +1 -1
- package/dist/rendering-payload/doc-values.queries.js.map +1 -0
- package/dist/rendering-payload/excerpt.queries.js.map +1 -0
- package/dist/{public-payload → rendering-payload}/field-values.d.ts +1 -1
- package/dist/{public-payload → rendering-payload}/field-values.js +1 -1
- package/dist/rendering-payload/field-values.js.map +1 -0
- package/dist/{public-payload → rendering-payload}/get-siblings.queries.d.ts +1 -1
- package/dist/rendering-payload/get-siblings.queries.js.map +1 -0
- package/dist/{public-payload → rendering-payload}/load-default-image.js +1 -1
- package/dist/rendering-payload/load-default-image.js.map +1 -0
- package/dist/rendering-payload/make-image-available.js.map +1 -0
- package/dist/{public-payload → rendering-payload}/make-public-payload.d.ts +10 -4
- package/dist/{public-payload → rendering-payload}/make-public-payload.js +4 -3
- package/dist/rendering-payload/make-public-payload.js.map +1 -0
- package/dist/{public-payload → rendering-payload}/parts.queries.d.ts +1 -1
- package/dist/rendering-payload/parts.queries.js.map +1 -0
- package/dist/{public-payload/public-payload.types.d.ts → rendering-payload/rendering-payload.types.d.ts} +4 -0
- package/dist/rendering-payload/rendering-payload.types.js +2 -0
- package/dist/rendering-payload/rendering-payload.types.js.map +1 -0
- package/dist/{public-payload → rendering-payload}/site-payload.d.ts +1 -1
- package/dist/{public-payload → rendering-payload}/site-payload.js +1 -1
- package/dist/rendering-payload/site-payload.js.map +1 -0
- package/dist/{public-payload → rendering-payload}/translations.queries.d.ts +1 -1
- package/dist/{public-payload → rendering-payload}/translations.queries.js +1 -1
- package/dist/rendering-payload/translations.queries.js.map +1 -0
- package/dist/site-context/create-site-context.js +18 -15
- package/dist/site-context/create-site-context.js.map +1 -1
- package/dist/site-context/load-site-access.d.ts +3 -0
- package/dist/site-context/load-site-access.js +9 -0
- package/dist/site-context/load-site-access.js.map +1 -0
- package/dist/site-context/site-context.types.d.ts +2 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +15 -13
- package/dist/public-payload/breadcrumb.queries.js.map +0 -1
- package/dist/public-payload/create-doc-drop.js.map +0 -1
- package/dist/public-payload/create-part-drop.js.map +0 -1
- package/dist/public-payload/doc-values.queries.js.map +0 -1
- package/dist/public-payload/excerpt.queries.js.map +0 -1
- package/dist/public-payload/field-values.js.map +0 -1
- package/dist/public-payload/get-siblings.queries.js.map +0 -1
- package/dist/public-payload/load-default-image.js.map +0 -1
- package/dist/public-payload/make-image-available.js.map +0 -1
- package/dist/public-payload/make-public-payload.js.map +0 -1
- package/dist/public-payload/parts.queries.js.map +0 -1
- package/dist/public-payload/public-payload.types.js +0 -2
- package/dist/public-payload/public-payload.types.js.map +0 -1
- package/dist/public-payload/site-payload.js.map +0 -1
- package/dist/public-payload/translations.queries.js.map +0 -1
- package/dist/public-site/common-routes.controller.js.map +0 -1
- package/dist/public-site/feed/feed-generator.js.map +0 -1
- package/dist/public-site/feed/feed-helpers.js.map +0 -1
- package/dist/public-site/feed/feed.middleware.js.map +0 -1
- package/dist/public-site/helpers/format-date.helper.js.map +0 -1
- package/dist/public-site/helpers/medias.helpers.js.map +0 -1
- package/dist/public-site/liquidjs-filters/format-date.js.map +0 -1
- package/dist/public-site/liquidjs-filters/format-number.js.map +0 -1
- package/dist/public-site/liquidjs-filters/head-tags-filter.js.map +0 -1
- package/dist/public-site/liquidjs-filters/image-zoom-url.js.map +0 -1
- package/dist/public-site/liquidjs-filters/info-filter.js.map +0 -1
- package/dist/public-site/liquidjs-filters/inject-menu-items-data.js.map +0 -1
- package/dist/public-site/liquidjs-filters/make-excerpt.js.map +0 -1
- package/dist/public-site/liquidjs-filters/obfuscate.js.map +0 -1
- package/dist/public-site/liquidjs-filters/open-graph-filter.js.map +0 -1
- package/dist/public-site/liquidjs-filters/plugin-asset-url-filter.js.map +0 -1
- package/dist/public-site/liquidjs-filters/translate-filter.js.map +0 -1
- package/dist/public-site/liquidjs-tags/get-doc-tag.js.map +0 -1
- package/dist/public-site/liquidjs-tags/get-docs-tag.js.map +0 -1
- package/dist/public-site/liquidjs-tags/get-paginated-docs-tag.js.map +0 -1
- package/dist/public-site/liquidjs-tags/use-image-tag.js.map +0 -1
- package/dist/public-site/media-serve/_media-serve-helpers.js.map +0 -1
- package/dist/public-site/media-serve/media-serve.controller.js.map +0 -1
- package/dist/public-site/public-route/public-route-parser.js.map +0 -1
- package/dist/public-site/public-route/raw-document-payload.d.ts +0 -4
- package/dist/public-site/public-site.middleware.js.map +0 -1
- package/dist/public-site/serve-document/serve-document.js.map +0 -1
- package/dist/public-site/serve-index-page.js.map +0 -1
- /package/dist/express/{public-api-middlewares.d.ts → public-api.req-handler.d.ts} +0 -0
- /package/dist/{public-site → rendered-site}/common-routes.controller.d.ts +0 -0
- /package/dist/{public-site → rendered-site}/common-routes.controller.js +0 -0
- /package/dist/{public-site → rendered-site}/feed/feed-generator.d.ts +0 -0
- /package/dist/{public-site → rendered-site}/feed/feed-helpers.d.ts +0 -0
- /package/dist/{public-site → rendered-site}/feed/feed-helpers.js +0 -0
- /package/dist/{public-site/feed/feed.middleware.d.ts → rendered-site/feed/feed.req-handler.d.ts} +0 -0
- /package/dist/{public-site → rendered-site}/helpers/format-date.helper.d.ts +0 -0
- /package/dist/{public-site → rendered-site}/helpers/format-date.helper.js +0 -0
- /package/dist/{public-site → rendered-site}/helpers/medias.helpers.d.ts +0 -0
- /package/dist/{public-site → rendered-site}/helpers/medias.helpers.js +0 -0
- /package/dist/{public-site → rendered-site}/liquidjs-filters/format-date.d.ts +0 -0
- /package/dist/{public-site → rendered-site}/liquidjs-filters/format-date.js +0 -0
- /package/dist/{public-site → rendered-site}/liquidjs-filters/format-number.d.ts +0 -0
- /package/dist/{public-site → rendered-site}/liquidjs-filters/format-number.js +0 -0
- /package/dist/{public-site → rendered-site}/liquidjs-filters/head-tags-filter.d.ts +0 -0
- /package/dist/{public-site → rendered-site}/liquidjs-filters/image-zoom-url.d.ts +0 -0
- /package/dist/{public-site → rendered-site}/liquidjs-filters/info-filter.d.ts +0 -0
- /package/dist/{public-site → rendered-site}/liquidjs-filters/info-filter.js +0 -0
- /package/dist/{public-site → rendered-site}/liquidjs-filters/inject-menu-items-data.d.ts +0 -0
- /package/dist/{public-site → rendered-site}/liquidjs-filters/inject-menu-items-data.js +0 -0
- /package/dist/{public-site → rendered-site}/liquidjs-filters/make-excerpt.d.ts +0 -0
- /package/dist/{public-site → rendered-site}/liquidjs-filters/make-excerpt.js +0 -0
- /package/dist/{public-site → rendered-site}/liquidjs-filters/obfuscate.d.ts +0 -0
- /package/dist/{public-site → rendered-site}/liquidjs-filters/obfuscate.js +0 -0
- /package/dist/{public-site → rendered-site}/liquidjs-filters/plugin-asset-url-filter.d.ts +0 -0
- /package/dist/{public-site → rendered-site}/liquidjs-filters/plugin-asset-url-filter.js +0 -0
- /package/dist/{public-site → rendered-site}/liquidjs-filters/translate-filter.d.ts +0 -0
- /package/dist/{public-site → rendered-site}/liquidjs-filters/translate-filter.js +0 -0
- /package/dist/{public-site → rendered-site}/liquidjs-tags/get-doc-tag.d.ts +0 -0
- /package/dist/{public-site → rendered-site}/liquidjs-tags/get-docs-tag.d.ts +0 -0
- /package/dist/{public-site → rendered-site}/liquidjs-tags/use-image-tag.d.ts +0 -0
- /package/dist/{public-site → rendered-site}/media-serve/_media-serve-helpers.d.ts +0 -0
- /package/dist/{public-site → rendered-site}/media-serve/_media-serve-helpers.js +0 -0
- /package/dist/{public-site → rendered-site}/media-serve/media-serve.controller.d.ts +0 -0
- /package/dist/{public-site → rendered-site}/media-serve/media-serve.controller.js +0 -0
- /package/dist/{public-site/public-route → rendered-site/page-route}/make-url.d.ts +0 -0
- /package/dist/{public-site/public-route → rendered-site/page-route}/make-url.js +0 -0
- /package/dist/{public-payload → rendering-payload}/create-part-drop.js +0 -0
- /package/dist/{public-payload → rendering-payload}/doc-values.queries.js +0 -0
- /package/dist/{public-payload → rendering-payload}/excerpt.queries.d.ts +0 -0
- /package/dist/{public-payload → rendering-payload}/excerpt.queries.js +0 -0
- /package/dist/{public-payload → rendering-payload}/get-siblings.queries.js +0 -0
- /package/dist/{public-payload → rendering-payload}/load-default-image.d.ts +0 -0
- /package/dist/{public-payload → rendering-payload}/make-image-available.d.ts +0 -0
- /package/dist/{public-payload → rendering-payload}/make-image-available.js +0 -0
- /package/dist/{public-payload → rendering-payload}/parts.queries.js +0 -0
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { strValOrUndef } from "@paroi/data-formatters-lib";
|
|
1
2
|
import { checkBackupFileName, getBackup } from "@paroicms/connector";
|
|
2
3
|
import { ApiError } from "@paroicms/public-server-lib";
|
|
3
4
|
import { getRouteParameter } from "../../express/http-helpers.js";
|
|
@@ -5,7 +6,7 @@ import { verifyDownloadToken } from "./backup.helper.js";
|
|
|
5
6
|
export async function downloadBackupController(siteContext, httpContext, routeParams) {
|
|
6
7
|
const { req, res } = httpContext;
|
|
7
8
|
const backupName = getRouteParameter(routeParams, "backupName");
|
|
8
|
-
const token = req.query.t;
|
|
9
|
+
const token = strValOrUndef(req.query.t);
|
|
9
10
|
if (!token)
|
|
10
11
|
throw new Error("missing user token");
|
|
11
12
|
const { backupFile, contentType } = verifyDownloadToken(token);
|
|
@@ -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,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;
|
|
1
|
+
{"version":3,"file":"backup.controller.js","sourceRoot":"","sources":["../../../src/bo-backend/backup/backup.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,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,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAEzC,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"}
|
|
@@ -3,7 +3,7 @@ import { createNoTracker } from "@paroicms/internal-server-lib";
|
|
|
3
3
|
import { parseNodelId } from "@paroicms/public-anywhere-lib";
|
|
4
4
|
import { toAbsoluteUrl } from "@paroicms/public-server-lib";
|
|
5
5
|
import { documentToObjectType } from "../../common/data-format.js";
|
|
6
|
-
import { getUrlOfDocument } from "../../
|
|
6
|
+
import { getUrlOfDocument } from "../../rendered-site/page-route/make-url.js";
|
|
7
7
|
import { authGuard } from "../auth/auth.helper.js";
|
|
8
8
|
import { getOneDocument } from "./load-documents.queries.js";
|
|
9
9
|
import { createDocumentOnNode, createNodeWithDocument, deleteDocument, deleteNodeAndDocuments, updateDocument, } from "./save-documents.queries.js";
|
|
@@ -6,6 +6,7 @@ import { invalidateDocumentRelationCache, invalidateMultipleDocumentsInCache, }
|
|
|
6
6
|
import { dbAnyLanguage } from "../../context.js";
|
|
7
7
|
import { truncExcerptToWord } from "../../helpers/excerpt.helpers.js";
|
|
8
8
|
import { createNoRenderingContext } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
|
|
9
|
+
import { loadSiteAccess } from "../../site-context/load-site-access.js";
|
|
9
10
|
import { languageIfNodel } from "./_fields.helpers.js";
|
|
10
11
|
import { saveFieldLabeling } from "./labeling.queries.js";
|
|
11
12
|
import { preprocessFieldForExcerpt } from "./preprocess-fields.js";
|
|
@@ -33,6 +34,10 @@ export async function saveFieldValues(siteContext, options) {
|
|
|
33
34
|
else if (nodeType.kind === "site") {
|
|
34
35
|
await siteContext.textCache.invalidateAll();
|
|
35
36
|
}
|
|
37
|
+
if (nodeType.kind === "site" && "access" in options.values) {
|
|
38
|
+
siteContext.access = await loadSiteAccess(siteContext);
|
|
39
|
+
siteContext.logger.info(`Site access updated: ${siteContext.access.access}`);
|
|
40
|
+
}
|
|
36
41
|
}
|
|
37
42
|
async function saveFieldValuesInMainDb(siteContext, options) {
|
|
38
43
|
const { nodeId, language, values, nodeType, force } = 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,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAClG,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAOL,gBAAgB,EAChB,0BAA0B,GAC3B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAEtE,OAAO,EACL,+BAA+B,EAC/B,kCAAkC,GACnC,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,8DAA8D,CAAC;
|
|
1
|
+
{"version":3,"file":"save-fields.queries.js","sourceRoot":"","sources":["../../../src/bo-backend/fields/save-fields.queries.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,10 +5,18 @@ export interface ServeTextOr {
|
|
|
5
5
|
serveFromCache: () => Promise<boolean>;
|
|
6
6
|
putInCacheAndServe: (html: string, dependencyKeys: string[]) => Promise<void>;
|
|
7
7
|
}
|
|
8
|
+
export interface ServeTextOrWithCacheKey {
|
|
9
|
+
serveFromCache: () => Promise<boolean>;
|
|
10
|
+
putInCacheAndServe: (html: string, dependencyKeys: string[], cacheKey: string) => Promise<void>;
|
|
11
|
+
}
|
|
8
12
|
export declare function serveTextFromCacheOr(siteContext: SiteContext, httpContext: PaHttpContext, tracker: Tracker, options: {
|
|
9
13
|
cacheKey: string;
|
|
10
14
|
contentType?: string;
|
|
11
15
|
}): ServeTextOr;
|
|
16
|
+
export declare function serveTextFromCacheOr(siteContext: SiteContext, httpContext: PaHttpContext, tracker: Tracker, options: {
|
|
17
|
+
cacheKey: string[];
|
|
18
|
+
contentType?: string;
|
|
19
|
+
}): ServeTextOrWithCacheKey;
|
|
12
20
|
export declare function render404Html(siteContext: SiteContext, httpContext: PaHttpContext, options?: {
|
|
13
21
|
language?: string;
|
|
14
22
|
}): Promise<void>;
|
|
@@ -2,7 +2,7 @@ import { createTracker } from "@paroicms/internal-server-lib";
|
|
|
2
2
|
import { serveTextContent } from "../express/http-helpers.js";
|
|
3
3
|
import { renderLiquidTemplate } from "../liquidjs-tools/liquidjs-rendering/render-liquidjs.js";
|
|
4
4
|
import { createRenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
|
|
5
|
-
import { makeDetachedPublicPayload } from "../
|
|
5
|
+
import { makeDetachedPublicPayload } from "../rendering-payload/make-public-payload.js";
|
|
6
6
|
import { makeCacheKey } from "./text-cache.js";
|
|
7
7
|
import { trackerReportToMessage } from "./tracker-report.js";
|
|
8
8
|
export function serveTextFromCacheOr(siteContext, httpContext, tracker, options) {
|
|
@@ -23,9 +23,12 @@ export function serveTextFromCacheOr(siteContext, httpContext, tracker, options)
|
|
|
23
23
|
});
|
|
24
24
|
return true;
|
|
25
25
|
},
|
|
26
|
-
async putInCacheAndServe(html, dependencyKeys) {
|
|
26
|
+
async putInCacheAndServe(html, dependencyKeys, k) {
|
|
27
|
+
const writeK = k ?? cacheKey;
|
|
28
|
+
if (Array.isArray(writeK))
|
|
29
|
+
throw new Error("Missing 'cacheKey' parameter");
|
|
27
30
|
const cacheVal = await siteContext.textCache.setCacheValue({
|
|
28
|
-
cacheKey,
|
|
31
|
+
cacheKey: writeK,
|
|
29
32
|
dependencyKeys,
|
|
30
33
|
value: html,
|
|
31
34
|
}, tracker);
|
|
@@ -45,7 +48,10 @@ export async function render404Html(siteContext, httpContext, options) {
|
|
|
45
48
|
const renderingContext = await createRenderingContext(siteContext, { cacheKey, tracker });
|
|
46
49
|
const html = await renderLiquidTemplate(siteContext, renderingContext, {
|
|
47
50
|
templateNames: ["404"],
|
|
48
|
-
payload: makeDetachedPublicPayload(siteContext, renderingContext,
|
|
51
|
+
payload: makeDetachedPublicPayload(siteContext, renderingContext, {
|
|
52
|
+
language: options?.language,
|
|
53
|
+
urlQuery: httpContext.req.query,
|
|
54
|
+
}),
|
|
49
55
|
});
|
|
50
56
|
cacheVal = await siteContext.textCache.setCacheValue({
|
|
51
57
|
cacheKey,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve-text-or.js","sourceRoot":"","sources":["../../src/common/serve-text-or.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,yDAAyD,CAAC;AAC/F,OAAO,EAAE,sBAAsB,EAAE,MAAM,2DAA2D,CAAC;AACnG,OAAO,EAAE,yBAAyB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"serve-text-or.js","sourceRoot":"","sources":["../../src/common/serve-text-or.ts"],"names":[],"mappings":"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"}
|
package/dist/context.d.ts
CHANGED
|
@@ -13,6 +13,7 @@ export declare let registeredSites: Map<string, RegisteredSite>;
|
|
|
13
13
|
export declare const httpRedirections: Map<string, import("@paroicms/connector").JtHttpRedirection>;
|
|
14
14
|
export declare function initCommonSchemaLib(val: CommonSchemaLibrary): void;
|
|
15
15
|
export declare function getCommonSchemaLib(): CommonSchemaLibrary;
|
|
16
|
+
export declare const platformDataDir: string;
|
|
16
17
|
export declare const jwtSecret: string;
|
|
17
18
|
export declare const jwtExpiresIn = "180d";
|
|
18
19
|
export declare const platformJwtSecret: string | undefined;
|
package/dist/context.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { readAppConfSync, supportedLanguages } from "@paroicms/connector";
|
|
2
|
-
import { createPlatformLog,
|
|
2
|
+
import { createPlatformLog, readOrCreateJwtSecretSync } from "@paroicms/internal-server-lib";
|
|
3
3
|
import { loadSimpleTranslatorFromDirectory, makeUrl, resolveModuleDirectory, } from "@paroicms/public-server-lib";
|
|
4
4
|
import { existsSync, readFileSync, renameSync, unlinkSync } from "node:fs";
|
|
5
5
|
import { join } from "node:path";
|
|
@@ -29,8 +29,8 @@ export function getCommonSchemaLib() {
|
|
|
29
29
|
}
|
|
30
30
|
return commonSchemaLib;
|
|
31
31
|
}
|
|
32
|
-
const platformDataDir = appConf.kind === "multisite" ? appConf.platform.dataDir : appConf.singleSite.dataDir;
|
|
33
|
-
export const jwtSecret =
|
|
32
|
+
export const platformDataDir = appConf.kind === "multisite" ? appConf.platform.dataDir : appConf.singleSite.dataDir;
|
|
33
|
+
export const jwtSecret = readOrCreateJwtSecretSync(join(platformDataDir, "jwt-secret.txt"));
|
|
34
34
|
export const jwtExpiresIn = "180d";
|
|
35
35
|
const oldFile = join(platformDataDir, "platform-jwt-secret.txt");
|
|
36
36
|
if (existsSync(oldFile)) {
|
|
@@ -40,7 +40,7 @@ if (existsSync(oldFile)) {
|
|
|
40
40
|
unlinkSync(oldFile);
|
|
41
41
|
}
|
|
42
42
|
export const platformJwtSecret = appConf.googleAuth
|
|
43
|
-
?
|
|
43
|
+
? readOrCreateJwtSecretSync(join(platformDataDir, "jwt-secret-pl.txt"))
|
|
44
44
|
: undefined;
|
|
45
45
|
export const platformAuthUrl = appConf.googleAuth && !appConf.googleAuth.disabled
|
|
46
46
|
? makeUrl({
|
package/dist/context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,eAAe,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACpG,OAAO,EAAE,iBAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,eAAe,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACpG,OAAO,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAE7F,OAAO,EAGL,iCAAiC,EACjC,OAAO,EACP,sBAAsB,GACvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC3E,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAAC;AAEjC,MAAM,CAAC,MAAM,UAAU,GAAG,sBAAsB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;AACpF,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAC9D,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,EAAE,OAAO,CAAC,CACxD,CAAC;AAEF,MAAM,CAAC,IAAI,UAA8B,CAAC;AAC1C,MAAM,UAAU,aAAa,CAAC,OAAe;IAC3C,UAAU,GAAG,OAAO,CAAC;AACvB,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,eAAe,EAAE,CAAC;AACzC,MAAM,CAAC,MAAM,cAAc,GAAG,iBAAiB,CAAC;IAC9C,KAAK,EAAE,OAAO,CAAC,QAAQ;IACvB,IAAI,EAAE,OAAO,CAAC,OAAO;IACrB,aAAa,EAAE,IAAI;CACpB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAc,OAAO,CAAC;AAEhD,MAAM,CAAC,IAAI,eAA4C,CAAC;AAExD,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,GAAG,CACrC,CAAC,OAAO,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CACtE,CAAC;AAEF,IAAI,eAAgD,CAAC;AAErD,MAAM,UAAU,mBAAmB,CAAC,GAAwB;IAC1D,eAAe,GAAG,GAAG,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,kBAAkB;IAChC,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IACD,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAC1B,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC;AAEvF,MAAM,CAAC,MAAM,SAAS,GAAG,yBAAyB,CAAC,IAAI,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC,CAAC;AAC5F,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC;AAGnC,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,EAAE,yBAAyB,CAAC,CAAC;AACjE,IAAI,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;IACxB,IAAI,OAAO,CAAC,UAAU;QAAE,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAC,CAAC;;QACnF,UAAU,CAAC,OAAO,CAAC,CAAC;AAC3B,CAAC;AAGD,MAAM,CAAC,MAAM,iBAAiB,GAAG,OAAO,CAAC,UAAU;IACjD,CAAC,CAAC,yBAAyB,CAAC,IAAI,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAC;IACvE,CAAC,CAAC,SAAS,CAAC;AAEd,MAAM,CAAC,MAAM,eAAe,GAC1B,OAAO,CAAC,UAAU,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ;IAChD,CAAC,CAAC,OAAO,CAAC;QACN,QAAQ,EAAE,OAAO,CAAC,cAAc;QAChC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI;QAC7B,IAAI,EAAE,OAAO,CAAC,UAAU;QACxB,IAAI,EAAE,OAAO;KACd,CAAC;IACJ,CAAC,CAAC,SAAS,CAAC;AAEhB,MAAM,CAAC,IAAI,UAA4B,CAAC;AAExC,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,kBAA+C;IACrF,eAAe,GAAG,kBAAkB,CAAC;IACrC,UAAU,GAAG,MAAM,iCAAiC,CAAC;QACnD,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC;QACpC,SAAS,EAAE,kBAAkB;QAC7B,MAAM,EAAE,cAAc;KACvB,CAAC,CAAC;IACH,KAAK,MAAM,OAAO,IAAI,eAAe,CAAC,MAAM,EAAE,EAAE,CAAC;QAC/C,IAAI,CAAC,OAAO,CAAC,WAAW;YAAE,SAAS;QACnC,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,WAAW;YAAE,SAAS;QAE7E,MAAM,QAAQ,GACZ,MAAM,CAAC,MAAM,KAAK,CAAC;YACjB,CAAC,CAAC,OAAO,OAAO,CAAC,IAAI,EAAE;YACvB,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;gBACtD,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC3B,CAAC,CAAC,SAAS,CAAC;QAClB,IAAI,CAAC,QAAQ,IAAI,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC;YAAE,SAAS;QAE1D,gBAAgB,CAAC,GAAG,CAAC,QAAQ,EAAE;YAC7B,QAAQ;YACR,EAAE,EAAE,OAAO,CAAC;gBACV,QAAQ,EAAE,OAAO,CAAC,cAAc;gBAChC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,IAAI,EAAE,OAAO,CAAC,UAAU;aACzB,CAAC;SACH,CAAC,CAAC;IACL,CAAC;IAED,IAAI,gBAAgB,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QAC9B,cAAc,CAAC,IAAI,CACjB,+BAA+B,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC;aACjE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;aACpD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,QAAQ,MAAM,KAAK,CAAC,EAAE,EAAE,CAAC;aACjD,IAAI,CAAC,QAAQ,CAAC,EAAE,CACpB,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,OAAuB;IACvD,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACzB,IAAI,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,gBAAgB,IAAI,mBAAmB,CAAC,CAAC;IACxF,eAAe,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,IAAY;IAC/C,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,IAAI,GAAG,CAAC,CAAC;AAC/E,CAAC"}
|
|
@@ -9,6 +9,7 @@ export function toPaHttpContext(expressReq, expressRes) {
|
|
|
9
9
|
query: expressReq.query,
|
|
10
10
|
body: expressReq.body,
|
|
11
11
|
file: expressReq.file,
|
|
12
|
+
cookies: expressReq.cookies,
|
|
12
13
|
};
|
|
13
14
|
let headersSent = false;
|
|
14
15
|
const res = {
|
|
@@ -33,6 +34,14 @@ export function toPaHttpContext(expressReq, expressRes) {
|
|
|
33
34
|
}
|
|
34
35
|
return res;
|
|
35
36
|
},
|
|
37
|
+
cookie(name, value, options) {
|
|
38
|
+
expressRes.cookie(name, value, options);
|
|
39
|
+
return res;
|
|
40
|
+
},
|
|
41
|
+
clearCookie(name, options) {
|
|
42
|
+
expressRes.clearCookie(name, options);
|
|
43
|
+
return res;
|
|
44
|
+
},
|
|
36
45
|
};
|
|
37
46
|
return { req, res };
|
|
38
47
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pa-http-context.js","sourceRoot":"","sources":["../../src/express/pa-http-context.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,UAAU,eAAe,CAAC,UAAmB,EAAE,UAAoB;IACvE,MAAM,GAAG,GAAkB;QACzB,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,OAAO,EAAE,UAAU,CAAC,OAAuD;QAC3E,MAAM,EAAE,UAAU,CAAC,MAAM;QACzB,WAAW,EAAE,UAAU,CAAC,GAAG;QAC3B,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,KAAK,EAAE,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"pa-http-context.js","sourceRoot":"","sources":["../../src/express/pa-http-context.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,UAAU,eAAe,CAAC,UAAmB,EAAE,UAAoB;IACvE,MAAM,GAAG,GAAkB;QACzB,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,OAAO,EAAE,UAAU,CAAC,OAAuD;QAC3E,MAAM,EAAE,UAAU,CAAC,MAAM;QACzB,WAAW,EAAE,UAAU,CAAC,GAAG;QAC3B,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,IAAI,EAAE,UAAU,CAAC,IAA0B;QAC3C,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,OAAO,EAAE,UAAU,CAAC,OAAO;KAC5B,CAAC;IAEF,IAAI,WAAW,GAAG,KAAK,CAAC;IAExB,MAAM,GAAG,GAAmB;QAC1B,IAAI,WAAW;YACb,OAAO,WAAW,IAAI,UAAU,CAAC,WAAW,CAAC;QAC/C,CAAC;QACD,MAAM,CAAC,IAAI;YACT,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACxB,OAAO,GAAG,CAAC;QACb,CAAC;QACD,MAAM,CAAC,KAAK,EAAE,KAAK;YACjB,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAChC,OAAO,GAAG,CAAC;QACb,CAAC;QACD,IAAI,CAAC,IAAI;YACP,WAAW,GAAG,IAAI,CAAC;YACnB,IAAI,IAAI,YAAY,MAAM,EAAE,CAAC;gBAC3B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACxB,CAAC;iBAAM,CAAC;gBACN,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxB,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC;QACD,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO;YACzB,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,OAAc,CAAC,CAAC;YAC/C,OAAO,GAAG,CAAC;QACb,CAAC;QACD,WAAW,CAAC,IAAI,EAAE,OAAO;YACvB,UAAU,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACtC,OAAO,GAAG,CAAC;QACb,CAAC;KACF,CAAC;IAEF,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AACtB,CAAC"}
|
|
@@ -18,4 +18,4 @@ export async function pluginPublicApiReqHandler(siteContext, httpContext) {
|
|
|
18
18
|
await plugin.publicApiHandler(makeBackendPluginRenderService(siteContext, createNoRenderingContext(), plugin), httpContext, relativePath);
|
|
19
19
|
return true;
|
|
20
20
|
}
|
|
21
|
-
//# sourceMappingURL=public-api-
|
|
21
|
+
//# sourceMappingURL=public-api.req-handler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public-api-
|
|
1
|
+
{"version":3,"file":"public-api.req-handler.js","sourceRoot":"","sources":["../../src/express/public-api.req-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,8BAA8B,EAAE,MAAM,2CAA2C,CAAC;AAC3F,OAAO,EAAE,wBAAwB,EAAE,MAAM,2DAA2D,CAAC;AAErG,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,WAAwB,EACxB,WAA0B;IAE1B,MAAM,EAAE,GAAG,EAAE,GAAG,WAAW,CAAC;IAC5B,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;IACtB,MAAM,MAAM,GAAG,cAAc,CAAC;IAC9B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;QAAE,OAAO,KAAK,CAAC;IAE3C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAClD,MAAM,mBAAmB,GACvB,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC5F,MAAM,YAAY,GAAG,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IACrE,MAAM,MAAM,GAAG,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAClE,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;QACxC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,MAAM,CAAC,gBAAgB,CAC3B,8BAA8B,CAAC,WAAW,EAAE,wBAAwB,EAAE,EAAE,MAAM,CAAC,EAC/E,WAAW,EACX,YAAY,CACb,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -2,7 +2,7 @@ import type { PaHttpContext } from "@paroicms/public-server-lib";
|
|
|
2
2
|
import type { NextFunction, Request, Response } from "express";
|
|
3
3
|
import { Stream } from "node:stream";
|
|
4
4
|
import type { SiteContext } from "../site-context/site-context.types.js";
|
|
5
|
-
export declare function
|
|
5
|
+
export declare function loadPaSiteContextMiddleware(req: Request, res: Response, next: NextFunction): Promise<void>;
|
|
6
6
|
export type PaRouteController = (siteContext: SiteContext, httpContext: PaHttpContext, routeParams: Record<string, string | undefined>) => Promise<unknown>;
|
|
7
7
|
export declare function wrapRouteController(handler: PaRouteController): (req: Request, res: Response) => Promise<void>;
|
|
8
8
|
export type PaReqHandler = (siteContext: SiteContext, httpContext: PaHttpContext) => Promise<boolean>;
|
|
@@ -4,7 +4,7 @@ import { platformLogger } from "../context.js";
|
|
|
4
4
|
import { getSiteContext } from "../site-context/site-context.js";
|
|
5
5
|
import { getPaSiteContext, serve404SimpleHtml, serve500Html } from "./http-helpers.js";
|
|
6
6
|
import { toPaHttpContext } from "./pa-http-context.js";
|
|
7
|
-
export async function
|
|
7
|
+
export async function loadPaSiteContextMiddleware(req, res, next) {
|
|
8
8
|
try {
|
|
9
9
|
const siteContext = await getSiteContext(req.hostname, { returnsUndef: true });
|
|
10
10
|
if (!siteContext) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-handler-wrapper.js","sourceRoot":"","sources":["../../src/express/route-handler-wrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACvF,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,CAAC,KAAK,UAAU,
|
|
1
|
+
{"version":3,"file":"route-handler-wrapper.js","sourceRoot":"","sources":["../../src/express/route-handler-wrapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import express, { type NextFunction, type Request, type Response } from "express";
|
|
2
2
|
export declare function createBoGraphqlMiddleware(): Promise<express.RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>>;
|
|
3
|
-
export declare function
|
|
3
|
+
export declare function createMinimalSiteMiddleware(): (req: Request, res: Response, next: NextFunction) => void;
|
|
4
|
+
export declare function createRenderedSiteMiddleware(): (req: Request, res: Response, next: NextFunction) => void;
|
|
@@ -9,20 +9,22 @@ import { loginController } from "../bo-backend/login/login.controller.js";
|
|
|
9
9
|
import { uploadMediaController } from "../bo-backend/media/media-upload.controller.js";
|
|
10
10
|
import { platformLogger } from "../context.js";
|
|
11
11
|
import { getPaSiteContext } from "../express/http-helpers.js";
|
|
12
|
-
import { pluginPublicApiReqHandler } from "../express/public-api-middlewares.js";
|
|
13
12
|
import { mergeReqHandlers, reqHandlerToExpressMiddleware, wrapRouteController, } from "../express/route-handler-wrapper.js";
|
|
14
|
-
import { boFilesReqHandler, boPluginsReqHandler, publicAssetsReqHandler, } from "../express/static-files-middlewares.js";
|
|
15
13
|
import { federateResolvers, typeDefs } from "../graphql/apollo-server-init.js";
|
|
16
14
|
import { createComplexityPlugin } from "../graphql/complexity-plugin.js";
|
|
17
15
|
import { disableApolloStudioPlugin } from "../graphql/disable-apollo-studio-plugin.js";
|
|
18
16
|
import { createErrorConverterPlugin } from "../graphql/error-converter-plugin.js";
|
|
17
|
+
import { protectedAccessController } from "../protected-site/protected-access.controller.js";
|
|
18
|
+
import { protectedSiteReqHandler } from "../protected-site/protected-site.req-handler.js";
|
|
19
19
|
import { checkPasswordResetController, setAccountPasswordController, } from "../public-api/password-reset/password-reset.controller.js";
|
|
20
20
|
import { healthCheckController } from "../public-api/public-api-controller.js";
|
|
21
|
-
import { faviconController, robotsTxtController } from "../
|
|
22
|
-
import { feedReqHandler } from "../
|
|
23
|
-
import { serveFilecontroller, serveUnversionedImageController, serveVersionedImageController, } from "../
|
|
24
|
-
import {
|
|
21
|
+
import { faviconController, robotsTxtController, } from "../rendered-site/common-routes.controller.js";
|
|
22
|
+
import { feedReqHandler } from "../rendered-site/feed/feed.req-handler.js";
|
|
23
|
+
import { serveFilecontroller, serveUnversionedImageController, serveVersionedImageController, } from "../rendered-site/media-serve/media-serve.controller.js";
|
|
24
|
+
import { renderedSiteReqHandler } from "../rendered-site/rendered-site.req-handler.js";
|
|
25
25
|
import { toPaHttpContext } from "./pa-http-context.js";
|
|
26
|
+
import { pluginPublicApiReqHandler } from "./public-api.req-handler.js";
|
|
27
|
+
import { boFilesReqHandler, boPluginsReqHandler, renderedPageAssetsReqHandler, } from "./static-files.req-handler.js";
|
|
26
28
|
export async function createBoGraphqlMiddleware() {
|
|
27
29
|
const developmentMode = process.env.NODE_ENV === "development";
|
|
28
30
|
const graphqlServer = new ApolloServer({
|
|
@@ -53,7 +55,7 @@ export async function createBoGraphqlMiddleware() {
|
|
|
53
55
|
}),
|
|
54
56
|
});
|
|
55
57
|
}
|
|
56
|
-
export function
|
|
58
|
+
export function createMinimalSiteMiddleware() {
|
|
57
59
|
const router = express.Router();
|
|
58
60
|
const upload = multer();
|
|
59
61
|
router.post("/adm/backend/upload", upload.single("file"), wrapRouteController(uploadMediaController));
|
|
@@ -62,22 +64,28 @@ export function createSiteMiddleware() {
|
|
|
62
64
|
router.post("/api/v1/login", wrapRouteController(loginController));
|
|
63
65
|
router.post("/api/v1/set-account-password", wrapRouteController(setAccountPasswordController));
|
|
64
66
|
router.post("/api/v1/check-password-reset", wrapRouteController(checkPasswordResetController));
|
|
67
|
+
router.post("/api/v1/protected-access", wrapRouteController(protectedAccessController));
|
|
65
68
|
router.get("/robots.txt", wrapRouteController(robotsTxtController));
|
|
66
69
|
router.get("/favicon.ico", wrapRouteController(faviconController));
|
|
70
|
+
const siteReqMiddleware = reqHandlerToExpressMiddleware(mergeReqHandlers([boPluginsReqHandler, boFilesReqHandler]));
|
|
71
|
+
return (req, res, next) => {
|
|
72
|
+
router(req, res, () => siteReqMiddleware(req, res, next));
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
export function createRenderedSiteMiddleware() {
|
|
76
|
+
const router = express.Router();
|
|
67
77
|
router.get("/medias/:mediaUid/file/:nameAndExt", wrapRouteController(serveFilecontroller));
|
|
68
78
|
router.get("/medias/:mediaUid/image/:resourceVersion/:nameAndExt", wrapRouteController(serveVersionedImageController));
|
|
69
79
|
router.get("/medias/:mediaUid/image/:nameAndExt", wrapRouteController(serveUnversionedImageController));
|
|
70
|
-
const
|
|
71
|
-
|
|
72
|
-
boFilesReqHandler,
|
|
80
|
+
const siteReqMiddleware = reqHandlerToExpressMiddleware(mergeReqHandlers([
|
|
81
|
+
protectedSiteReqHandler,
|
|
73
82
|
pluginPublicApiReqHandler,
|
|
74
|
-
|
|
83
|
+
renderedPageAssetsReqHandler,
|
|
75
84
|
feedReqHandler,
|
|
76
|
-
|
|
77
|
-
]);
|
|
78
|
-
const siteReqMiddleware = reqHandlerToExpressMiddleware(siteReqHandlers);
|
|
85
|
+
renderedSiteReqHandler,
|
|
86
|
+
]));
|
|
79
87
|
return (req, res, next) => {
|
|
80
|
-
|
|
88
|
+
siteReqMiddleware(req, res, () => router(req, res, next));
|
|
81
89
|
};
|
|
82
90
|
}
|
|
83
91
|
//# sourceMappingURL=site-middleware.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"site-middleware.js","sourceRoot":"","sources":["../../src/express/site-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,IAAI,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjF,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,OAA2D,MAAM,SAAS,CAAC;AAClF,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,
|
|
1
|
+
{"version":3,"file":"site-middleware.js","sourceRoot":"","sources":["../../src/express/site-middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { PaHttpContext } from "@paroicms/public-server-lib";
|
|
2
2
|
import type { SiteContext } from "../site-context/site-context.types.js";
|
|
3
|
-
export declare function
|
|
3
|
+
export declare function renderedPageAssetsReqHandler(siteContext: SiteContext, httpContext: PaHttpContext): Promise<boolean>;
|
|
4
4
|
export declare function boFilesReqHandler(siteContext: SiteContext, httpContext: PaHttpContext): Promise<boolean>;
|
|
5
5
|
export declare function boPluginsReqHandler(siteContext: SiteContext, httpContext: PaHttpContext): Promise<boolean>;
|
|
@@ -8,7 +8,7 @@ import { appConf } from "../context.js";
|
|
|
8
8
|
import { HTTP_MAX_AGE } from "./http-constants.js";
|
|
9
9
|
import { serve404SimpleHtml, serve500Html } from "./http-helpers.js";
|
|
10
10
|
import { serveFile } from "./serve-file.js";
|
|
11
|
-
export async function
|
|
11
|
+
export async function renderedPageAssetsReqHandler(siteContext, httpContext) {
|
|
12
12
|
const { req } = httpContext;
|
|
13
13
|
let path = req.path;
|
|
14
14
|
if (!path.startsWith("/assets/") || !["GET", "HEAD"].includes(req.method)) {
|
|
@@ -99,4 +99,4 @@ async function render404Asset(siteContext, httpContext) {
|
|
|
99
99
|
serve500Html(httpContext);
|
|
100
100
|
}
|
|
101
101
|
}
|
|
102
|
-
//# sourceMappingURL=static-files-
|
|
102
|
+
//# sourceMappingURL=static-files.req-handler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"static-files-
|
|
1
|
+
{"version":3,"file":"static-files.req-handler.js","sourceRoot":"","sources":["../../src/express/static-files.req-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,9 +7,9 @@ import { makeCacheDependencyKey } from "../common/text-cache.js";
|
|
|
7
7
|
import { appConf } from "../context.js";
|
|
8
8
|
import { validateRecaptchaResponse } from "../public-api/mail/validate-recaptcha-response.js";
|
|
9
9
|
import { renderChildPartials, renderSearchPartials } from "../public-api/public-api-rendering.js";
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
12
|
-
import {
|
|
10
|
+
import { getUrlOfDocument } from "../rendered-site/page-route/make-url.js";
|
|
11
|
+
import { getDocItem } from "../rendering-payload/doc-values.queries.js";
|
|
12
|
+
import { makeImageAvailable } from "../rendering-payload/make-image-available.js";
|
|
13
13
|
import { createRunningInstanceConnector } from "./running-instance-connector.js";
|
|
14
14
|
export function executeHook(siteContext, hookName, params) {
|
|
15
15
|
const hook = siteContext.hooks.get(hookName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make-backend-plugin-service.js","sourceRoot":"","sources":["../../src/helpers/make-backend-plugin-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC1E,OAAO,EAAkB,YAAY,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACnG,OAAO,EAIL,aAAa,GACd,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,yBAAyB,EAAE,MAAM,mDAAmD,CAAC;AAC9F,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAClG,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"make-backend-plugin-service.js","sourceRoot":"","sources":["../../src/helpers/make-backend-plugin-service.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -3,17 +3,18 @@ import { eachDay, startCronLike } from "@paroicms/internal-server-lib";
|
|
|
3
3
|
import { makeUrl } from "@paroicms/public-server-lib";
|
|
4
4
|
import { setupImageProcessor } from "@paroicms/server-image-cache-engine";
|
|
5
5
|
import compression from "compression";
|
|
6
|
+
import cookieParser from "cookie-parser";
|
|
6
7
|
import express from "express";
|
|
7
8
|
import rateLimit from "express-rate-limit";
|
|
8
9
|
import { appConf, cmsVersion, initCommonSchemaLib, initializeContext, platformAuthUrl, platformLogger, registeredSites, setAppVersion, } from "./context.js";
|
|
9
10
|
import { httpRedirectionMiddleware } from "./express/http-redirection-middleware.js";
|
|
10
|
-
import {
|
|
11
|
-
import { createBoGraphqlMiddleware,
|
|
11
|
+
import { loadPaSiteContextMiddleware, reqHandlerToExpressMiddleware, } from "./express/route-handler-wrapper.js";
|
|
12
|
+
import { createBoGraphqlMiddleware, createMinimalSiteMiddleware, createRenderedSiteMiddleware, } from "./express/site-middleware.js";
|
|
12
13
|
import { createCorsMiddleware } from "./helpers/cors-middleware.js";
|
|
13
14
|
import { maintenanceTask, unloadAllActiveSites } from "./maintenance/maintenance-task.js";
|
|
14
15
|
import { handleShutdownEvents } from "./maintenance/shutdown.js";
|
|
15
16
|
import { createOauth2ClientMiddleware } from "./oauth/oauth-middleware.js";
|
|
16
|
-
import { tailReqHandler } from "./
|
|
17
|
+
import { tailReqHandler } from "./rendered-site/serve-index-page.js";
|
|
17
18
|
import { watchForIdleSiteContexts } from "./site-context/site-context.js";
|
|
18
19
|
if (process.env.NODE_ENV === "development") {
|
|
19
20
|
(await import("source-map-support")).default.install();
|
|
@@ -38,6 +39,7 @@ export async function start(options = {}) {
|
|
|
38
39
|
});
|
|
39
40
|
const expressApp = express();
|
|
40
41
|
expressApp.use(express.json({ limit: "50mb" }));
|
|
42
|
+
expressApp.use(cookieParser());
|
|
41
43
|
expressApp.use(rateLimit({
|
|
42
44
|
windowMs: 2_000,
|
|
43
45
|
limit: 50,
|
|
@@ -49,10 +51,11 @@ export async function start(options = {}) {
|
|
|
49
51
|
if (platformAuthUrl && appConf.googleAuth) {
|
|
50
52
|
expressApp.use(await createOauth2ClientMiddleware(appConf.googleAuth.fqdn));
|
|
51
53
|
}
|
|
52
|
-
expressApp.use(
|
|
54
|
+
expressApp.use(loadPaSiteContextMiddleware);
|
|
53
55
|
expressApp.use("/adm/backend/graphql", await createBoGraphqlMiddleware());
|
|
54
56
|
expressApp.use(compression());
|
|
55
|
-
expressApp.use(
|
|
57
|
+
expressApp.use(createMinimalSiteMiddleware());
|
|
58
|
+
expressApp.use(createRenderedSiteMiddleware());
|
|
56
59
|
expressApp.use(reqHandlerToExpressMiddleware(tailReqHandler));
|
|
57
60
|
let httpServer;
|
|
58
61
|
if (appConf.hostname) {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,+BAA+B,EAC/B,4BAA4B,EAC5B,uBAAuB,GACxB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,WAAW,MAAM,aAAa,CAAC;AACtC,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAE3C,OAAO,EACL,OAAO,EACP,UAAU,EACV,mBAAmB,EACnB,iBAAiB,EACjB,eAAe,EACf,cAAc,EACd,eAAe,EACf,aAAa,GACd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,yBAAyB,EAAE,MAAM,0CAA0C,CAAC;AACrF,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
export declare const PROTECTED_TOKEN_COOKIE = "paProtectedToken";
|
|
2
|
+
export declare const accessTokenTtlInMs: number;
|
|
3
|
+
export declare function generateProtectedToken(password: string): Promise<string>;
|
|
4
|
+
export declare function validateProtectedToken(token: string, password: string): Promise<boolean>;
|