@paroicms/server 1.71.0 → 1.72.0

package/dist/modules/core/account/account.resolver.js

@@ -2,18 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.accountResolvers = void 0;
 const api_error_handler_1 = require("../../../common/api-error-handler");
-const site_context_1 = require("../../../site-context/site-context");
 const auth_helper_1 = require("../auth/auth.helper");
 const account_formatters_1 = require("./account.formatters");
 const account_queries_1 = require("./account.queries");
 exports.accountResolvers = {
     Query: {
-        account: async (_parent, { id }, { fqdn, req }) => {
+        account: async (_parent, { id }, { req, siteContext }) => {
             (0, auth_helper_1.authGuard)(req);
-            const acccount = await (0, account_queries_1.getAccount)(await (0, site_context_1.getSiteContext)(fqdn), id);
+            const acccount = await (0, account_queries_1.getAccount)(siteContext, id);
             return acccount;
         },
-        authAccount: async (_parent, _values, { fqdn, req }) => {
+        authAccount: async (_parent, _values, { req, siteContext }) => {
             (0, auth_helper_1.authGuard)(req);
             const token = req.headers.authorization?.replace(/^Bearer\s+/, "");
             if (!token) {
@@ -23,43 +22,43 @@ exports.accountResolvers = {
             if (!payload.id) {
                 throw new api_error_handler_1.ApiError("auth account id not found", { status: 404 });
             }
-            return await (0, account_queries_1.getAuthenticatedAccount)(await (0, site_context_1.getSiteContext)(fqdn), payload.id);
+            return await (0, account_queries_1.getAuthenticatedAccount)(siteContext, payload.id);
         },
-        allAccounts: async (_parent, _values, { fqdn, req }) => {
+        allAccounts: async (_parent, _values, { req, siteContext }) => {
             (0, auth_helper_1.authGuard)(req);
-            return await (0, account_queries_1.getAllAccounts)(await (0, site_context_1.getSiteContext)(fqdn));
+            return await (0, account_queries_1.getAllAccounts)(siteContext);
         },
     },
     Mutation: {
-        createAccount: async (_parent, { values }, { fqdn, req }) => {
+        createAccount: async (_parent, { values }, { req, siteContext }) => {
             (0, auth_helper_1.authGuard)(req);
-            return await (0, account_queries_1.createAccount)(await (0, site_context_1.getSiteContext)(fqdn), {
+            return await (0, account_queries_1.createAccount)(siteContext, {
                 accountType: (0, account_formatters_1.formatAccountType)(values.accountType),
                 email: values.email,
                 language: values.language,
                 name: values.name ?? undefined,
             });
         },
-        updateAccount: async (_parent, { accountId, values }, { fqdn, req }) => {
+        updateAccount: async (_parent, { accountId, values }, { req, siteContext }) => {
             (0, auth_helper_1.authGuard)(req);
-            return await (0, account_queries_1.updateAccount)(await (0, site_context_1.getSiteContext)(fqdn), accountId, {
+            return await (0, account_queries_1.updateAccount)(siteContext, accountId, {
                 email: values.email ?? undefined,
                 name: values.name ?? undefined,
             });
         },
-        deleteAccount: async (_parent, { accountId }, { fqdn, req }) => {
+        deleteAccount: async (_parent, { accountId }, { req, siteContext }) => {
             (0, auth_helper_1.authGuard)(req);
-            await (0, account_queries_1.deleteAccount)(await (0, site_context_1.getSiteContext)(fqdn), accountId);
+            await (0, account_queries_1.deleteAccount)(siteContext, accountId);
             return true;
         },
-        resetAccountPassword: async (_parent, { accountId }, { fqdn, req }) => {
+        resetAccountPassword: async (_parent, { accountId }, { req, siteContext }) => {
             (0, auth_helper_1.authGuard)(req);
-            await (0, account_queries_1.resetAccountPassword)(await (0, site_context_1.getSiteContext)(fqdn), accountId);
+            await (0, account_queries_1.resetAccountPassword)(siteContext, accountId);
             return true;
         },
-        setAccountPreferences: async (_parent, { accountId, values }, { fqdn, req }) => {
+        setAccountPreferences: async (_parent, { accountId, values }, { req, siteContext }) => {
             (0, auth_helper_1.authGuard)(req);
-            await (0, account_queries_1.setAccountPreferences)(await (0, site_context_1.getSiteContext)(fqdn), accountId, {
+            await (0, account_queries_1.setAccountPreferences)(siteContext, accountId, {
                 language: values.language ?? undefined,
             });
             return accountId;

package/dist/modules/core/account/account.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"account.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/account/account.resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"account.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/account/account.resolver.ts"],"names":[],"mappings":"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"}

package/dist/modules/core/auth/auth.helper.d.ts

@@ -1,18 +1,15 @@
 import type { Request, Response } from "express";
-interface TokenPayload {
+export interface BearerTokenPayload {
     id: string;
     email: string;
+    fqdn: string;
 }
-export declare function authGuard(req: Request): TokenPayload;
+export declare function authGuard(req: Request): BearerTokenPayload;
 export interface GoogleUser {
     email: string;
 }
 export declare function googleAuthGuard(req: Request, res: Response): Promise<GoogleUser>;
-export declare function verifyAccessToken(token: string): TokenPayload;
+export declare function verifyAccessToken(token: string): BearerTokenPayload;
 export declare function verifyPlatformToken(platformToken: string): GoogleUser;
-export declare function generateAccessToken(payload: {
-    email: string;
-    id: string;
-}): string;
+export declare function generateAccessToken(payload: BearerTokenPayload): string;
 export declare function generatePlatformToken(payload: GoogleUser): string;
-export {};

package/dist/modules/core/auth/auth.helper.js

@@ -19,12 +19,17 @@ function authGuard(req) {
         throw new api_error_handler_1.ApiError("Unauthorized", { status: 401 });
     }
     const token = authorization.substring(7);
+    let payload;
     try {
-        return (0, jsonwebtoken_1.verify)(token, context_1.jwtSecret);
+        payload = (0, jsonwebtoken_1.verify)(token, context_1.jwtSecret);
     }
     catch (error) {
         throw new api_error_handler_1.ApiError("Unauthorized", { status: 401 });
     }
+    if (payload.fqdn !== req.hostname) {
+        throw new api_error_handler_1.ApiError("Not the right token", { status: 403 });
+    }
+    return payload;
 }
 function isGoogleUser(user) {
     return typeof user.email === "string";

package/dist/modules/core/auth/auth.helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.helper.js","sourceRoot":"","sources":["../../../../src/modules/core/auth/auth.helper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth.helper.js","sourceRoot":"","sources":["../../../../src/modules/core/auth/auth.helper.ts"],"names":[],"mappings":"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"}

package/dist/modules/core/auth/auth.service.js

@@ -40,6 +40,7 @@ async function loginUser(siteContext, user) {
         token: (0, auth_helper_1.generateAccessToken)({
             email: account.email,
             id: account.id,
+            fqdn: siteContext.fqdn,
         }),
     };
 }
@@ -47,6 +48,9 @@ async function getVerifiedAccountFromToken(siteContext, token) {
     let payload;
     try {
         payload = (0, auth_helper_1.verifyAccessToken)(token);
+        if (payload.fqdn !== siteContext.fqdn) {
+            throw new api_error_handler_1.ApiError("Not the right token", { status: 403 });
+        }
         const defaultLanguage = siteContext.siteSchema.defaultLanguage;
         let account;
         const parsedPlatformAccountId = (0, special_account_helpers_1.parsePlatformAdminAccountId)(payload.id);
@@ -75,7 +79,7 @@ async function getVerifiedAccountFromToken(siteContext, token) {
     }
     catch (error) {
         if (payload) {
-            siteContext.siteLog.warn(`Invalid account for token '${payload.id}', '${payload.email}'`);
+            siteContext.siteLog.warn(`Invalid token: ${JSON.stringify(payload)}`);
         }
         return {
             statusCode: 401,
@@ -110,6 +114,7 @@ async function loginByPlatformToken(siteContext, token) {
             token: (0, auth_helper_1.generateAccessToken)({
                 email: payload.email,
                 id: account.id,
+                fqdn: siteContext.fqdn,
             }),
         };
     }

package/dist/modules/core/auth/auth.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../src/modules/core/auth/auth.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../src/modules/core/auth/auth.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/core/backup/backup.controller.js

@@ -4,9 +4,9 @@ exports.downloadBackupController = downloadBackupController;
 const connector_1 = require("@paroicms/connector");
 const api_error_handler_1 = require("../../../common/api-error-handler");
 const http_helpers_1 = require("../../../express/http-helpers");
-const site_context_1 = require("../../../site-context/site-context");
 const backup_helper_1 = require("./backup.helper");
 async function downloadBackupController(req, res) {
+    const siteContext = (0, http_helpers_1.getReqSiteContext)(req);
     const backupName = (0, http_helpers_1.getHttpRequestParameter)(req, "backupName");
     const token = req.query.t;
     if (!token)
@@ -18,7 +18,6 @@ async function downloadBackupController(req, res) {
     if (backupFile !== backupName) {
         throw new api_error_handler_1.ApiError("invalid token provided", { status: 400 });
     }
-    const siteContext = await (0, site_context_1.getSiteContext)(req.hostname);
     const { fileStream, fileWeight } = await (0, connector_1.getBackup)(siteContext, backupName);
     res.status(200);
     res.append("Cache-Control", "no-store");

package/dist/modules/core/backup/backup.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"backup.controller.js","sourceRoot":"","sources":["../../../../src/modules/core/backup/backup.controller.ts"],"names":[],"mappings":";;AAOA,4DAyBC;AAhCD,mDAAqE;AAErE,yEAA6D;AAC7D,gEAAwE;AACxE,qEAAoE;AACpE,mDAAsD;AAE/C,KAAK,UAAU,wBAAwB,CAAC,GAAY,EAAE,GAAa;IACxE,MAAM,UAAU,GAAG,IAAA,sCAAuB,EAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAW,CAAC;IAEpC,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IAElD,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,IAAA,mCAAmB,EAAC,KAAK,CAAC,CAAC;IAE/D,IAAI,CAAC,IAAA,+BAAmB,EAAC,EAAE,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC,EAAE,CAAC;QAC7D,MAAM,IAAI,4BAAQ,CAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACzD,CAAC;IAED,IAAI,UAAU,KAAK,UAAU,EAAE,CAAC;QAC9B,MAAM,IAAI,4BAAQ,CAAC,wBAAwB,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACvD,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,qBAAS,EAAC,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,OAAO,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"backup.controller.js","sourceRoot":"","sources":["../../../../src/modules/core/backup/backup.controller.ts"],"names":[],"mappings":";;AAMA,4DA0BC;AAhCD,mDAAqE;AAErE,yEAA6D;AAC7D,gEAA2F;AAC3F,mDAAsD;AAE/C,KAAK,UAAU,wBAAwB,CAAC,GAAY,EAAE,GAAa;IACxE,MAAM,WAAW,GAAG,IAAA,gCAAiB,EAAC,GAAG,CAAC,CAAC;IAE3C,MAAM,UAAU,GAAG,IAAA,sCAAuB,EAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAW,CAAC;IAEpC,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IAElD,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,IAAA,mCAAmB,EAAC,KAAK,CAAC,CAAC;IAE/D,IAAI,CAAC,IAAA,+BAAmB,EAAC,EAAE,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC,EAAE,CAAC;QAC7D,MAAM,IAAI,4BAAQ,CAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACzD,CAAC;IAED,IAAI,UAAU,KAAK,UAAU,EAAE,CAAC;QAC9B,MAAM,IAAI,4BAAQ,CAAC,wBAAwB,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,qBAAS,EAAC,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,OAAO,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC9B,CAAC"}

package/dist/modules/core/backup/backup.resolver.js

@@ -2,20 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.backupResolvers = void 0;
 const connector_1 = require("@paroicms/connector");
-const site_context_1 = require("../../../site-context/site-context");
 const auth_helper_1 = require("../auth/auth.helper");
 const backup_helper_1 = require("./backup.helper");
 exports.backupResolvers = {
     Mutation: {
-        initializeBackup: async (_parent, _values, { fqdn, req }) => {
+        initializeBackup: async (_parent, _values, { siteContext, req }) => {
             (0, auth_helper_1.authGuard)(req);
-            const siteContext = await (0, site_context_1.getSiteContext)(fqdn);
             const { zipFileWeight, zipFileName } = await (0, connector_1.initNewBackup)(siteContext);
             const accessToken = (0, backup_helper_1.createDownloadToken)({
                 backupFile: zipFileName,
                 contentType: "application/zip",
             });
-            const downloadUrl = `/adm/api/v1/backup/${zipFileName}/?t=${accessToken}`;
+            const downloadUrl = `/adm/backend/backup/${zipFileName}/?t=${accessToken}`;
             return {
                 downloadUrl,
                 fileWeight: zipFileWeight,

package/dist/modules/core/backup/backup.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"backup.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/backup/backup.resolver.ts"],"names":[],"mappings":";;;AAAA,mDAAoD;AAEpD,qEAAoE;AAEpE,qDAAgD;AAChD,mDAAsD;AAOzC,QAAA,eAAe,GAAiC;IAC3D,QAAQ,EAAE;QACR,gBAAgB,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAuB,EAAE;YAC/E,IAAA,uBAAS,EAAC,GAAG,CAAC,CAAC;YACf,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,IAAI,CAAC,CAAC;YAC/C,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,MAAM,IAAA,yBAAa,EAAC,WAAW,CAAC,CAAC;YACxE,MAAM,WAAW,GAAG,IAAA,mCAAmB,EAAC;gBACtC,UAAU,EAAE,WAAW;gBACvB,WAAW,EAAE,iBAAiB;aAC/B,CAAC,CAAC;YACH,MAAM,WAAW,GAAG,sBAAsB,WAAW,OAAO,WAAW,EAAE,CAAC;YAE1E,OAAO;gBACL,WAAW;gBACX,UAAU,EAAE,aAAa;aAC1B,CAAC;QACJ,CAAC;KACF;CACF,CAAC"}
+{"version":3,"file":"backup.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/backup/backup.resolver.ts"],"names":[],"mappings":";;;AAAA,mDAAoD;AAGpD,qDAAgD;AAChD,mDAAsD;AAOzC,QAAA,eAAe,GAAiC;IAC3D,QAAQ,EAAE;QACR,gBAAgB,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,EAAuB,EAAE;YACtF,IAAA,uBAAS,EAAC,GAAG,CAAC,CAAC;YACf,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,MAAM,IAAA,yBAAa,EAAC,WAAW,CAAC,CAAC;YACxE,MAAM,WAAW,GAAG,IAAA,mCAAmB,EAAC;gBACtC,UAAU,EAAE,WAAW;gBACvB,WAAW,EAAE,iBAAiB;aAC/B,CAAC,CAAC;YACH,MAAM,WAAW,GAAG,uBAAuB,WAAW,OAAO,WAAW,EAAE,CAAC;YAE3E,OAAO;gBACL,WAAW;gBACX,UAAU,EAAE,aAAa;aAC1B,CAAC;QACJ,CAAC;KACF;CACF,CAAC"}

package/dist/modules/core/document/document.resolver.extend.js

@@ -2,14 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extendWithDocumentResolver = void 0;
 const data_format_1 = require("../../../common/data-format");
-const site_context_1 = require("../../../site-context/site-context");
 const auth_helper_1 = require("../auth/auth.helper");
 const load_documents_queries_1 = require("./load-documents.queries");
 exports.extendWithDocumentResolver = {
     NodelWrap: {
-        document: async (parent, _args, { fqdn, req }) => {
+        document: async (parent, _args, { req, siteContext }) => {
             (0, auth_helper_1.authGuard)(req);
-            const document = await (0, load_documents_queries_1.findOneDocument)(await (0, site_context_1.getSiteContext)(fqdn), {
+            const document = await (0, load_documents_queries_1.findOneDocument)(siteContext, {
                 nodeId: parent.nodeId,
                 language: parent.language,
             });
@@ -17,9 +16,9 @@ exports.extendWithDocumentResolver = {
         },
     },
     Labeling: {
-        document: async (parent, args, { fqdn, req }) => {
+        document: async (parent, args, { req, siteContext }) => {
             (0, auth_helper_1.authGuard)(req);
-            return ((await (0, load_documents_queries_1.findOneTermDocument)(await (0, site_context_1.getSiteContext)(fqdn), {
+            return ((await (0, load_documents_queries_1.findOneTermDocument)(siteContext, {
                 nodeId: parent.termId,
                 language: args.language,
             })) ?? null);

package/dist/modules/core/document/document.resolver.extend.js.map

@@ -1 +1 @@
-{"version":3,"file":"document.resolver.extend.js","sourceRoot":"","sources":["../../../../src/modules/core/document/document.resolver.extend.ts"],"names":[],"mappings":";;;AAAA,6DAAmE;AAEnE,qEAAoE;AAEpE,qDAAgD;AAGhD,qEAAgF;AAEnE,QAAA,0BAA0B,GAAiC;IACtE,SAAS,EAAE;QACT,QAAQ,EAAE,KAAK,EAAE,MAAqB,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE;YAC9D,IAAA,uBAAS,EAAC,GAAG,CAAC,CAAC;YACf,MAAM,QAAQ,GAAG,MAAM,IAAA,wCAAe,EAAC,MAAM,IAAA,6BAAc,EAAC,IAAI,CAAC,EAAE;gBACjE,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;aAC1B,CAAC,CAAC;YACH,OAAO,QAAQ,CAAC,CAAC,CAAC,IAAA,kCAAoB,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC1D,CAAC;KACF;IAED,QAAQ,EAAE;QACR,QAAQ,EAAE,KAAK,EAAE,MAAoB,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE;YAC5D,IAAA,uBAAS,EAAC,GAAG,CAAC,CAAC;YACf,OAAO,CACL,CAAC,MAAM,IAAA,4CAAmB,EAAC,MAAM,IAAA,6BAAc,EAAC,IAAI,CAAC,EAAE;gBACrD,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;aACxB,CAAC,CAAC,IAAI,IAAI,CACZ,CAAC;QACJ,CAAC;KACF;CACF,CAAC"}
+{"version":3,"file":"document.resolver.extend.js","sourceRoot":"","sources":["../../../../src/modules/core/document/document.resolver.extend.ts"],"names":[],"mappings":";;;AAAA,6DAAmE;AAGnE,qDAAgD;AAGhD,qEAAgF;AAEnE,QAAA,0BAA0B,GAAiC;IACtE,SAAS,EAAE;QACT,QAAQ,EAAE,KAAK,EAAE,MAAqB,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,EAAE;YACrE,IAAA,uBAAS,EAAC,GAAG,CAAC,CAAC;YACf,MAAM,QAAQ,GAAG,MAAM,IAAA,wCAAe,EAAC,WAAW,EAAE;gBAClD,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;aAC1B,CAAC,CAAC;YACH,OAAO,QAAQ,CAAC,CAAC,CAAC,IAAA,kCAAoB,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC1D,CAAC;KACF;IAED,QAAQ,EAAE;QACR,QAAQ,EAAE,KAAK,EAAE,MAAoB,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,EAAE;YACnE,IAAA,uBAAS,EAAC,GAAG,CAAC,CAAC;YACf,OAAO,CACL,CAAC,MAAM,IAAA,4CAAmB,EAAC,WAAW,EAAE;gBACtC,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;aACxB,CAAC,CAAC,IAAI,IAAI,CACZ,CAAC;QACJ,CAAC;KACF;CACF,CAAC"}

package/dist/modules/core/document/document.resolver.js

@@ -6,23 +6,20 @@ const internal_server_lib_1 = require("@paroicms/internal-server-lib");
 const public_anywhere_lib_1 = require("@paroicms/public-anywhere-lib");
 const public_server_lib_1 = require("@paroicms/public-server-lib");
 const data_format_1 = require("../../../common/data-format");
-const site_context_1 = require("../../../site-context/site-context");
 const make_url_1 = require("../../public-site/public-route/make-url");
 const auth_helper_1 = require("../auth/auth.helper");
 const load_documents_queries_1 = require("./load-documents.queries");
 const save_documents_queries_1 = require("./save-documents.queries");
 exports.documentResolvers = {
     Query: {
-        document: async (_parent, { id }, { fqdn, req }) => {
+        document: async (_parent, { id }, { req, siteContext }) => {
             (0, auth_helper_1.authGuard)(req);
-            const siteContext = await (0, site_context_1.getSiteContext)(fqdn);
             return (0, data_format_1.documentToObjectType)(await (0, load_documents_queries_1.getOneDocument)(siteContext, (0, public_anywhere_lib_1.parseNodelId)(id)));
         },
     },
     Mutation: {
-        updateDocumentTitle: async (_parent, { values, id }, { fqdn, req }) => {
+        updateDocumentTitle: async (_parent, { values, id }, { req, siteContext }) => {
             (0, auth_helper_1.authGuard)(req);
-            const siteContext = await (0, site_context_1.getSiteContext)(fqdn);
             const nodelId = (0, public_anywhere_lib_1.parseNodelId)(id);
             const empty = Object.values(values).every((v) => !(0, data_formatters_lib_1.isDef)(v));
             if (!empty) {
@@ -33,9 +30,8 @@ exports.documentResolvers = {
             }
             return (0, data_format_1.documentToObjectType)(await (0, load_documents_queries_1.getOneDocument)(siteContext, nodelId));
         },
-        updateDocumentMeta: async (_parent, { values, id }, { fqdn, req }) => {
+        updateDocumentMeta: async (_parent, { values, id }, { req, siteContext }) => {
             (0, auth_helper_1.authGuard)(req);
-            const siteContext = await (0, site_context_1.getSiteContext)(fqdn);
             const nodelId = (0, public_anywhere_lib_1.parseNodelId)(id);
             const empty = Object.values(values).every((v) => !(0, data_formatters_lib_1.isDef)(v));
             if (!empty) {
@@ -43,22 +39,19 @@ exports.documentResolvers = {
             }
             return (0, data_format_1.documentToObjectType)(await (0, load_documents_queries_1.getOneDocument)(siteContext, nodelId));
         },
-        deleteDocument: async (_parent, { nodelId }, { fqdn, req }) => {
+        deleteDocument: async (_parent, { nodelId }, { req, siteContext }) => {
             (0, auth_helper_1.authGuard)(req);
-            const siteContext = await (0, site_context_1.getSiteContext)(fqdn);
             const parsedId = (0, public_anywhere_lib_1.parseNodelId)(nodelId);
             await (0, save_documents_queries_1.deleteDocument)(siteContext, parsedId);
             return true;
         },
-        deleteNodeAndDocuments: async (_parent, { nodelId }, { fqdn, req }) => {
+        deleteNodeAndDocuments: async (_parent, { nodelId }, { req, siteContext }) => {
             (0, auth_helper_1.authGuard)(req);
-            const siteContext = await (0, site_context_1.getSiteContext)(fqdn);
             await (0, save_documents_queries_1.deleteNodeAndDocuments)(siteContext, (0, public_anywhere_lib_1.parseNodelId)(nodelId).nodeId);
             return true;
         },
-        createNodeWithDocument: async (_parent, { values, parentNodelId }, { fqdn, req }) => {
+        createNodeWithDocument: async (_parent, { values, parentNodelId }, { req, siteContext }) => {
             (0, auth_helper_1.authGuard)(req);
-            const siteContext = await (0, site_context_1.getSiteContext)(fqdn);
             const documentId = await (0, save_documents_queries_1.createNodeWithDocument)(siteContext, {
                 parentId: (0, public_anywhere_lib_1.parseNodelId)(parentNodelId),
                 values: {
@@ -69,9 +62,8 @@ exports.documentResolvers = {
             });
             return (0, data_format_1.documentToObjectType)(await (0, load_documents_queries_1.getOneDocument)(siteContext, documentId));
         },
-        createDocumentOnNode: async (_parent, { values, language, nodeId }, { fqdn, req }) => {
+        createDocumentOnNode: async (_parent, { values, language, nodeId }, { req, siteContext }) => {
             (0, auth_helper_1.authGuard)(req);
-            const siteContext = await (0, site_context_1.getSiteContext)(fqdn);
             const documentId = await (0, save_documents_queries_1.createDocumentOnNode)(siteContext, {
                 language,
                 nodeId,
@@ -83,8 +75,7 @@ exports.documentResolvers = {
         },
     },
     Document: {
-        async url(parent, _values, { fqdn, req }) {
-            const siteContext = await (0, site_context_1.getSiteContext)(fqdn);
+        async url(parent, _values, { req, siteContext }) {
             return (0, public_server_lib_1.toAbsoluteUrl)(siteContext, await (0, make_url_1.getUrlOfDocument)(siteContext, (0, internal_server_lib_1.createNoTracker)(), {
                 language: parent.language,
                 nodeId: parent.nodeId,

package/dist/modules/core/document/document.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"document.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/document/document.resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"document.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/document/document.resolver.ts"],"names":[],"mappings":"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"}

package/dist/modules/core/fields/fields.resolver.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extendPartWithFieldValuesResolver = exports.extendNodelWrapWithFieldValuesResolvers = exports.fieldResolvers = void 0;
 const rendering_context_1 = require("../../../liquidjs-tools/liquidjs-rendering/rendering-context");
-const site_context_1 = require("../../../site-context/site-context");
 const auth_helper_1 = require("../auth/auth.helper");
 const node_queries_1 = require("../node/node.queries");
 const load_fields_of_queries_1 = require("./load-fields-of.queries");
@@ -11,9 +10,8 @@ const preprocess_fields_1 = require("./preprocess-fields");
 const save_fields_queries_1 = require("./save-fields.queries");
 exports.fieldResolvers = {
     Mutation: {
-        setFieldValues: async (_parent, { nodeId, language, values }, { fqdn, req }) => {
+        setFieldValues: async (_parent, { nodeId, language, values }, { req, siteContext }) => {
             (0, auth_helper_1.authGuard)(req);
-            const siteContext = await (0, site_context_1.getSiteContext)(fqdn);
             const typeName = await (0, node_queries_1.getTypeNameOf)(siteContext, nodeId);
             await (0, save_fields_queries_1.saveFieldValues)(siteContext, {
                 typeName,
@@ -23,9 +21,8 @@ exports.fieldResolvers = {
             });
             return true;
         },
-        setSiteFieldValues: async (_parent, { language, values }, { fqdn, req }) => {
+        setSiteFieldValues: async (_parent, { language, values }, { req, siteContext }) => {
             (0, auth_helper_1.authGuard)(req);
-            const siteContext = await (0, site_context_1.getSiteContext)(fqdn);
             await (0, save_fields_queries_1.saveFieldValues)(siteContext, {
                 typeName: "_site",
                 nodeId: siteContext.siteIds.siteNodeId,
@@ -36,9 +33,8 @@ exports.fieldResolvers = {
         },
     },
     Query: {
-        fieldValues: async (_parent, { nodelId, fieldNames, preprocess }, { fqdn, req }) => {
+        fieldValues: async (_parent, { nodelId, fieldNames, preprocess }, { req, siteContext }) => {
             (0, auth_helper_1.authGuard)(req);
-            const siteContext = await (0, site_context_1.getSiteContext)(fqdn);
             const fieldValues = await (0, load_fields_of_queries_1.getFieldValuesOfNodel)(siteContext, {
                 nodelId,
                 fieldNames: fieldNames ?? undefined,
@@ -46,9 +42,8 @@ exports.fieldResolvers = {
             });
             return JSON.stringify(fieldValues);
         },
-        fieldValuesOfList: async (_parent, { parentNodelId, listName, fieldNames, preprocess }, { fqdn, req }) => {
+        fieldValuesOfList: async (_parent, { parentNodelId, listName, fieldNames, preprocess }, { req, siteContext }) => {
             (0, auth_helper_1.authGuard)(req);
-            const siteContext = await (0, site_context_1.getSiteContext)(fqdn);
             const map = await (0, load_fields_of_queries_1.getFieldValuesOfOneList)(siteContext, {
                 parentNodelId,
                 listName: listName ?? undefined,
@@ -60,9 +55,8 @@ exports.fieldResolvers = {
                 fieldValues: JSON.stringify(fieldValues),
             }));
         },
-        siteFieldValues: async (_parent, { language, fieldNames, preprocess }, { fqdn, req }) => {
+        siteFieldValues: async (_parent, { language, fieldNames, preprocess }, { req, siteContext }) => {
             (0, auth_helper_1.authGuard)(req);
-            const siteContext = await (0, site_context_1.getSiteContext)(fqdn);
             const fieldTypes = (0, load_fields_queries_1.getFieldTypesByNames)(siteContext, {
                 typeName: "_site",
                 fieldNames: fieldNames ?? undefined,
@@ -83,8 +77,7 @@ exports.fieldResolvers = {
 };
 exports.extendNodelWrapWithFieldValuesResolvers = {
     NodelWrap: {
-        fieldValues: async ({ nodeId, language }, { preprocess, fieldNames }, { fqdn }) => {
-            const siteContext = await (0, site_context_1.getSiteContext)(fqdn);
+        fieldValues: async ({ nodeId, language }, { preprocess, fieldNames }, { siteContext }) => {
             const typeName = await (0, node_queries_1.getTypeNameOf)(siteContext, nodeId);
             const fieldTypes = (0, load_fields_queries_1.getFieldTypesByNames)(siteContext, {
                 typeName,
@@ -106,8 +99,7 @@ exports.extendNodelWrapWithFieldValuesResolvers = {
 };
 exports.extendPartWithFieldValuesResolver = {
     Part: {
-        fieldValues: async ({ nodeId, language }, { preprocess, fieldNames }, { fqdn }) => {
-            const siteContext = await (0, site_context_1.getSiteContext)(fqdn);
+        fieldValues: async ({ nodeId, language }, { preprocess, fieldNames }, { siteContext }) => {
             const typeName = await (0, node_queries_1.getTypeNameOf)(siteContext, nodeId);
             const fieldTypes = (0, load_fields_queries_1.getFieldTypesByNames)(siteContext, {
                 typeName,

package/dist/modules/core/fields/fields.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"fields.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/fields/fields.resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fields.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/fields/fields.resolver.ts"],"names":[],"mappings":"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"}

package/dist/modules/core/labeling/labeling.resolver.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.labelingResolvers = void 0;
-const site_context_1 = require("../../../site-context/site-context");
 const auth_helper_1 = require("../auth/auth.helper");
 const labeling_queries_1 = require("./labeling.queries");
 exports.labelingResolvers = {
     Mutation: {
-        setLabeling: async (_parent, { labeledNodeId, taxonomyNodeId, terms }, { fqdn, req }) => {
+        setLabeling: async (_parent, { labeledNodeId, taxonomyNodeId, terms }, { req, siteContext }) => {
             (0, auth_helper_1.authGuard)(req);
-            await (0, labeling_queries_1.setLabeling)(await (0, site_context_1.getSiteContext)(fqdn), {
+            await (0, labeling_queries_1.setLabeling)(siteContext, {
                 labeledNodeId,
                 taxonomyNodeId,
                 terms: terms.map((term) => {

package/dist/modules/core/labeling/labeling.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"labeling.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/labeling/labeling.resolver.ts"],"names":[],"mappings":";;;AACA,qEAAoE;AAEpE,qDAAgD;AAChD,yDAAiD;AAEpC,QAAA,iBAAiB,GAAiC;IAC7D,QAAQ,EAAE;QACR,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE;YACtF,IAAA,uBAAS,EAAC,GAAG,CAAC,CAAC;YACf,MAAM,IAAA,8BAAW,EAAC,MAAM,IAAA,6BAAc,EAAC,IAAI,CAAC,EAAE;gBAC5C,aAAa;gBACb,cAAc;gBACd,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;oBACxB,OAAO;wBACL,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,SAAS;wBAChC,UAAU,EAAE,IAAI,CAAC,UAAU;qBAC5B,CAAC;gBACJ,CAAC,CAAC;aACH,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;KACF;CACF,CAAC"}
+{"version":3,"file":"labeling.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/labeling/labeling.resolver.ts"],"names":[],"mappings":";;;AAEA,qDAAgD;AAChD,yDAAiD;AAEpC,QAAA,iBAAiB,GAAiC;IAC7D,QAAQ,EAAE;QACR,WAAW,EAAE,KAAK,EAChB,OAAO,EACP,EAAE,aAAa,EAAE,cAAc,EAAE,KAAK,EAAE,EACxC,EAAE,GAAG,EAAE,WAAW,EAAE,EACpB,EAAE;YACF,IAAA,uBAAS,EAAC,GAAG,CAAC,CAAC;YACf,MAAM,IAAA,8BAAW,EAAC,WAAW,EAAE;gBAC7B,aAAa;gBACb,cAAc;gBACd,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;oBACxB,OAAO;wBACL,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,SAAS;wBAChC,UAAU,EAAE,IAAI,CAAC,UAAU;qBAC5B,CAAC;gBACJ,CAAC,CAAC;aACH,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;KACF;CACF,CAAC"}

package/dist/modules/core/login/login.controller.d.ts

@@ -1,2 +1,2 @@
 import type { Request, Response } from "express";
-export declare function loginController(req: Request, res: Response): Promise<import("../auth/auth.types").LoginSuccess | import("../auth/auth.types").LoginFailed>;
+export declare function loginController(req: Request, _res: Response): Promise<import("../auth/auth.types").LoginSuccess | import("../auth/auth.types").LoginFailed>;

package/dist/modules/core/login/login.controller.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loginController = loginController;
-const site_context_1 = require("../../../site-context/site-context");
+const http_helpers_1 = require("../../../express/http-helpers");
 const auth_service_1 = require("../auth/auth.service");
-async function loginController(req, res) {
+async function loginController(req, _res) {
+    const siteContext = (0, http_helpers_1.getReqSiteContext)(req);
     const loginInput = req.body;
-    const siteContext = await (0, site_context_1.getSiteContext)(req.hostname);
     if (loginInput.action === "loginWithPlatformToken") {
         return await (0, auth_service_1.loginByPlatformToken)(siteContext, loginInput.token);
     }

package/dist/modules/core/login/login.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"login.controller.js","sourceRoot":"","sources":["../../../../src/modules/core/login/login.controller.ts"],"names":[],"mappings":";;AAKA,0CAgBC;AApBD,qEAAoE;AACpE,uDAAoG;AAG7F,KAAK,UAAU,eAAe,CAAC,GAAY,EAAE,GAAa;IAC/D,MAAM,UAAU,GAAgB,GAAG,CAAC,IAAI,CAAC;IACzC,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAEvD,IAAI,UAAU,CAAC,MAAM,KAAK,wBAAwB,EAAE,CAAC;QACnD,OAAO,MAAM,IAAA,mCAAoB,EAAC,WAAW,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;IACnE,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QACnC,OAAO,MAAM,IAAA,wBAAS,EAAC,WAAW,EAAE;YAClC,KAAK,EAAE,UAAU,CAAC,KAAK;YACvB,QAAQ,EAAE,UAAU,CAAC,QAAQ;SAC9B,CAAC,CAAC;IACL,CAAC;IAED,OAAO,IAAA,0CAA2B,EAAC,WAAW,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;AACpE,CAAC"}
+{"version":3,"file":"login.controller.js","sourceRoot":"","sources":["../../../../src/modules/core/login/login.controller.ts"],"names":[],"mappings":";;AAKA,0CAgBC;AApBD,gEAAkE;AAClE,uDAAoG;AAG7F,KAAK,UAAU,eAAe,CAAC,GAAY,EAAE,IAAc;IAChE,MAAM,WAAW,GAAG,IAAA,gCAAiB,EAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,UAAU,GAAgB,GAAG,CAAC,IAAI,CAAC;IAEzC,IAAI,UAAU,CAAC,MAAM,KAAK,wBAAwB,EAAE,CAAC;QACnD,OAAO,MAAM,IAAA,mCAAoB,EAAC,WAAW,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;IACnE,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QACnC,OAAO,MAAM,IAAA,wBAAS,EAAC,WAAW,EAAE;YAClC,KAAK,EAAE,UAAU,CAAC,KAAK;YACvB,QAAQ,EAAE,UAAU,CAAC,QAAQ;SAC9B,CAAC,CAAC;IACL,CAAC;IAED,OAAO,IAAA,0CAA2B,EAAC,WAAW,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;AACpE,CAAC"}

package/dist/modules/core/media/media-upload.controller.js

@@ -9,12 +9,12 @@ const api_error_handler_1 = require("../../../common/api-error-handler");
 const media_handles_helpers_1 = require("../../../common/media-handles.helpers");
 const text_cache_1 = require("../../../common/text-cache");
 const context_1 = require("../../../context");
+const http_helpers_1 = require("../../../express/http-helpers");
 const utils_helper_1 = require("../../../helpers/utils-helper");
-const site_context_1 = require("../../../site-context/site-context");
 const node_queries_1 = require("../node/node.queries");
 const media_1 = require("./media");
 async function uploadMediaController(req, res) {
-    const siteContext = await (0, site_context_1.getSiteContext)(req.hostname);
+    const siteContext = (0, http_helpers_1.getReqSiteContext)(req);
     const file = req.file;
     const body = req.body;
     if (!file)