@paroicms/server 1.71.0 → 1.72.0

package/dist/modules/public-api/password-reset/password-reset.controller.d.ts

@@ -1,5 +1,5 @@
-import type { Request, Response } from "express";
-export declare function setAccountPasswordController(req: Request, res: Response): Promise<void>;
-export declare function checkPasswordResetController(req: Request, res: Response): Promise<import("./password-reset.service").PasswordResetInfo | {
+import type { Request } from "express";
+export declare function setAccountPasswordController(req: Request): Promise<void>;
+export declare function checkPasswordResetController(req: Request): Promise<import("./password-reset.service").PasswordResetInfo | {
     authorized: false;
 }>;

package/dist/modules/public-api/password-reset/password-reset.controller.js

@@ -2,26 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setAccountPasswordController = setAccountPasswordController;
 exports.checkPasswordResetController = checkPasswordResetController;
-const site_context_1 = require("../../../site-context/site-context");
+const http_helpers_1 = require("../../../express/http-helpers");
 const password_reset_dto_1 = require("./password-reset.dto");
 const password_reset_service_1 = require("./password-reset.service");
-async function setAccountPasswordController(req, res) {
+async function setAccountPasswordController(req) {
+    const siteContext = (0, http_helpers_1.getReqSiteContext)(req);
     const { accountId, password, resetToken } = (0, password_reset_dto_1.formatSetAccountPasswordDto)(req.body);
     const payload = {
         accountId,
         password,
         resetToken,
     };
-    const siteContext = await (0, site_context_1.getSiteContext)(req.hostname);
     await (0, password_reset_service_1.updateAccountPassword)(siteContext, payload);
 }
-async function checkPasswordResetController(req, res) {
+async function checkPasswordResetController(req) {
+    const siteContext = (0, http_helpers_1.getReqSiteContext)(req);
     const { accountId, resetToken } = (0, password_reset_dto_1.formatCheckPasswordResetDto)(req.body);
-    const payload = {
+    return await (0, password_reset_service_1.checkAccountPasswordReset)(siteContext, {
         accountId,
         resetToken,
-    };
-    const siteContext = await (0, site_context_1.getSiteContext)(req.hostname);
-    return await (0, password_reset_service_1.checkAccountPasswordReset)(siteContext, payload);
+    });
 }
 //# sourceMappingURL=password-reset.controller.js.map

package/dist/modules/public-api/password-reset/password-reset.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"password-reset.controller.js","sourceRoot":"","sources":["../../../../src/modules/public-api/password-reset/password-reset.controller.ts"],"names":[],"mappings":";;AAKA,oEAWC;AAED,oEAUC;AA3BD,qEAAoE;AACpE,6DAAgG;AAChG,qEAA4F;AAErF,KAAK,UAAU,4BAA4B,CAAC,GAAY,EAAE,GAAa;IAC5E,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,IAAA,gDAA2B,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAElF,MAAM,OAAO,GAAG;QACd,SAAS;QACT,QAAQ;QACR,UAAU;KACX,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACvD,MAAM,IAAA,8CAAqB,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AACpD,CAAC;AAEM,KAAK,UAAU,4BAA4B,CAAC,GAAY,EAAE,GAAa;IAC5E,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,IAAA,gDAA2B,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAExE,MAAM,OAAO,GAAG;QACd,SAAS;QACT,UAAU;KACX,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACvD,OAAO,MAAM,IAAA,kDAAyB,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AAC/D,CAAC"}
+{"version":3,"file":"password-reset.controller.js","sourceRoot":"","sources":["../../../../src/modules/public-api/password-reset/password-reset.controller.ts"],"names":[],"mappings":";;AAKA,oEAWC;AAED,oEAQC;AAzBD,gEAAkE;AAClE,6DAAgG;AAChG,qEAA4F;AAErF,KAAK,UAAU,4BAA4B,CAAC,GAAY;IAC7D,MAAM,WAAW,GAAG,IAAA,gCAAiB,EAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,IAAA,gDAA2B,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAElF,MAAM,OAAO,GAAG;QACd,SAAS;QACT,QAAQ;QACR,UAAU;KACX,CAAC;IAEF,MAAM,IAAA,8CAAqB,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AACpD,CAAC;AAEM,KAAK,UAAU,4BAA4B,CAAC,GAAY;IAC7D,MAAM,WAAW,GAAG,IAAA,gCAAiB,EAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,IAAA,gDAA2B,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAExE,OAAO,MAAM,IAAA,kDAAyB,EAAC,WAAW,EAAE;QAClD,SAAS;QACT,UAAU;KACX,CAAC,CAAC;AACL,CAAC"}

package/dist/modules/public-site/feed/feed.middleware.js

@@ -5,8 +5,8 @@ const internal_server_lib_1 = require("@paroicms/internal-server-lib");
 const public_server_lib_1 = require("@paroicms/public-server-lib");
 const serve_text_or_1 = require("../../../common/serve-text-or");
 const text_cache_1 = require("../../../common/text-cache");
+const http_helpers_1 = require("../../../express/http-helpers");
 const rendering_context_1 = require("../../../liquidjs-tools/liquidjs-rendering/rendering-context");
-const site_context_1 = require("../../../site-context/site-context");
 const feed_generator_1 = require("./feed-generator");
 const feed_helpers_1 = require("./feed-helpers");
 async function feedMiddleware(req, res, next) {
@@ -15,7 +15,7 @@ async function feedMiddleware(req, res, next) {
         next();
         return;
     }
-    const siteContext = await (0, site_context_1.getSiteContext)(req.hostname);
+    const siteContext = (0, http_helpers_1.getReqSiteContext)(req);
     if (siteContext.siteSchema.isMultilingual) {
         if (!parsed.language || !siteContext.siteSchema.languages.includes(parsed.language)) {
             next();

package/dist/modules/public-site/feed/feed.middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"feed.middleware.js","sourceRoot":"","sources":["../../../../src/modules/public-site/feed/feed.middleware.ts"],"names":[],"mappings":";;AAWA,wCA2BC;AAtCD,uEAA8D;AAC9D,mEAA0D;AAE1D,iEAAqE;AACrE,2DAAkF;AAClF,oGAAsG;AACtG,qEAAoE;AAEpE,qDAAmD;AACnD,iDAA8C;AAEvC,KAAK,UAAU,cAAc,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;IAClF,MAAM,MAAM,GAAG,IAAA,2BAAY,EAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACrC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,IAAI,EAAE,CAAC;QACP,OAAO;IACT,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACvD,IAAI,WAAW,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;QAC1C,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpF,IAAI,EAAE,CAAC;YACP,OAAO;QACT,CAAC;QACD,MAAM,SAAS,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE;YACrC,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,OAAO,EAAE,IAAA,+BAAW,EAAC,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC;SACnD,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,IAAI,EAAE,CAAC;YACP,OAAO;QACT,CAAC;QACD,MAAM,SAAS,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE;YACrC,QAAQ,EAAE,WAAW,CAAC,UAAU,CAAC,eAAe;YAChD,OAAO,EAAE,IAAA,+BAAW,EAAC,WAAW,CAAC;SAClC,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,KAAK,UAAU,SAAS,CACtB,WAAwB,EACxB,GAAY,EACZ,GAAa,EACb,EAAE,QAAQ,EAAE,OAAO,EAAyC;IAE5D,MAAM,OAAO,GAAG,IAAA,mCAAa,GAAE,CAAC;IAChC,MAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,WAAW,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;IACnF,MAAM,gBAAgB,GAAG,MAAM,IAAA,0CAAsB,EAAC,WAAW,EAAE;QACjE,QAAQ;QACR,OAAO;QACP,aAAa,EAAE,IAAA,mCAAsB,EAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;KACzD,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,IAAA,oCAAoB,EAAC,WAAW,EAAE,OAAO,EAAE;QACzD,QAAQ;QACR,GAAG;QACH,GAAG;QACH,WAAW,EAAE,oCAAoC;KAClD,CAAC,CAAC;IACH,IAAI,MAAM,OAAO,CAAC,cAAc,EAAE;QAAE,OAAO;IAE3C,MAAM,IAAI,GAAG,MAAM,IAAA,gCAAe,EAAC,WAAW,EAAE,gBAAgB,EAAE;QAChE,QAAQ;QACR,OAAO;KACR,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,CAAC;AAC/E,CAAC"}
+{"version":3,"file":"feed.middleware.js","sourceRoot":"","sources":["../../../../src/modules/public-site/feed/feed.middleware.ts"],"names":[],"mappings":";;AAWA,wCA2BC;AAtCD,uEAA8D;AAC9D,mEAA0D;AAE1D,iEAAqE;AACrE,2DAAkF;AAClF,gEAAkE;AAClE,oGAAsG;AAEtG,qDAAmD;AACnD,iDAA8C;AAEvC,KAAK,UAAU,cAAc,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;IAClF,MAAM,MAAM,GAAG,IAAA,2BAAY,EAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACrC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,IAAI,EAAE,CAAC;QACP,OAAO;IACT,CAAC;IAED,MAAM,WAAW,GAAG,IAAA,gCAAiB,EAAC,GAAG,CAAC,CAAC;IAC3C,IAAI,WAAW,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;QAC1C,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpF,IAAI,EAAE,CAAC;YACP,OAAO;QACT,CAAC;QACD,MAAM,SAAS,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE;YACrC,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,OAAO,EAAE,IAAA,+BAAW,EAAC,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC;SACnD,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,IAAI,EAAE,CAAC;YACP,OAAO;QACT,CAAC;QACD,MAAM,SAAS,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE;YACrC,QAAQ,EAAE,WAAW,CAAC,UAAU,CAAC,eAAe;YAChD,OAAO,EAAE,IAAA,+BAAW,EAAC,WAAW,CAAC;SAClC,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,KAAK,UAAU,SAAS,CACtB,WAAwB,EACxB,GAAY,EACZ,GAAa,EACb,EAAE,QAAQ,EAAE,OAAO,EAAyC;IAE5D,MAAM,OAAO,GAAG,IAAA,mCAAa,GAAE,CAAC;IAChC,MAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,WAAW,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;IACnF,MAAM,gBAAgB,GAAG,MAAM,IAAA,0CAAsB,EAAC,WAAW,EAAE;QACjE,QAAQ;QACR,OAAO;QACP,aAAa,EAAE,IAAA,mCAAsB,EAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;KACzD,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,IAAA,oCAAoB,EAAC,WAAW,EAAE,OAAO,EAAE;QACzD,QAAQ;QACR,GAAG;QACH,GAAG;QACH,WAAW,EAAE,oCAAoC;KAClD,CAAC,CAAC;IACH,IAAI,MAAM,OAAO,CAAC,cAAc,EAAE;QAAE,OAAO;IAE3C,MAAM,IAAI,GAAG,MAAM,IAAA,gCAAe,EAAC,WAAW,EAAE,gBAAgB,EAAE;QAChE,QAAQ;QACR,OAAO;KACR,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,CAAC;AAC/E,CAAC"}

package/dist/modules/public-site/media-serve/media-serve.controller.js

@@ -7,12 +7,11 @@ const public_server_lib_1 = require("@paroicms/public-server-lib");
 const api_error_handler_1 = require("../../../common/api-error-handler");
 const http_constants_1 = require("../../../express/http-constants");
 const http_helpers_1 = require("../../../express/http-helpers");
-const site_context_1 = require("../../../site-context/site-context");
 const _media_serve_helpers_1 = require("./_media-serve-helpers");
 async function serveFilecontroller(req, res) {
+    const siteContext = (0, http_helpers_1.getReqSiteContext)(req);
     const mediaUid = (0, http_helpers_1.getHttpRequestParameter)(req, "mediaUid");
     const nameAndExt = (0, http_helpers_1.getHttpRequestParameter)(req, "nameAndExt");
-    const siteContext = await (0, site_context_1.getSiteContext)(req.hostname);
     const cacheControl = "max-age=0";
     const fts = await getFileToServe(siteContext, {
         mediaUid,
@@ -35,7 +34,7 @@ async function serveFilecontroller(req, res) {
     res.send(file.binaryFile);
 }
 async function serveVersionedImageController(req, res) {
-    const siteContext = await (0, site_context_1.getSiteContext)(req.hostname);
+    const siteContext = (0, http_helpers_1.getReqSiteContext)(req);
     const cacheControl = `public, max-age=${http_constants_1.HTTP_MAX_AGE}, immutable`;
     const mediaUid = (0, http_helpers_1.getHttpRequestParameter)(req, "mediaUid");
     const resourceVersion = (0, http_helpers_1.getHttpRequestParameter)(req, "resourceVersion");
@@ -74,7 +73,7 @@ async function serveVersionedImageController(req, res) {
     res.send(file.binaryFile);
 }
 async function serveUnversionedImageController(req, res) {
-    const siteContext = await (0, site_context_1.getSiteContext)(req.hostname);
+    const siteContext = (0, http_helpers_1.getReqSiteContext)(req);
     const cacheControl = "max-age=0";
     const mediaUid = (0, http_helpers_1.getHttpRequestParameter)(req, "mediaUid");
     const nameAndExt = (0, http_helpers_1.getHttpRequestParameter)(req, "nameAndExt");

package/dist/modules/public-site/media-serve/media-serve.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"media-serve.controller.js","sourceRoot":"","sources":["../../../../src/modules/public-site/media-serve/media-serve.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"media-serve.controller.js","sourceRoot":"","sources":["../../../../src/modules/public-site/media-serve/media-serve.controller.ts"],"names":[],"mappings":";;AAoBA,kDAgCC;AAED,sEAiDC;AAED,0EAqDC;AA7JD,mEAKqC;AAGrC,yEAA6D;AAC7D,oEAA+D;AAC/D,gEAKuC;AAEvC,iEAAyD;AAElD,KAAK,UAAU,mBAAmB,CAAC,GAAY,EAAE,GAAa;IACnE,MAAM,WAAW,GAAG,IAAA,gCAAiB,EAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,QAAQ,GAAG,IAAA,sCAAuB,EAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG,IAAA,sCAAuB,EAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAE9D,MAAM,YAAY,GAAG,WAAW,CAAC;IAEjC,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE;QAC5C,QAAQ;QACR,WAAW,EAAE,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC;KAC1C,CAAC,CAAC;IAEH,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QACvB,OAAO,IAAA,kCAAmB,EAAC,GAAG,EAAE;YAC9B,YAAY;YACZ,IAAI,EAAE,GAAG,CAAC,eAAe;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;IACrB,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,IAAA,sCAAkB,EAC1C,WAAW,EACX,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,EACxE,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;IACF,IAAI,QAAQ,KAAK,UAAU;QAAE,OAAO,IAAA,+BAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAE/D,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;IAC1C,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;IACzC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3C,GAAG,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AAC5B,CAAC;AAEM,KAAK,UAAU,6BAA6B,CAAC,GAAY,EAAE,GAAa;IAC7E,MAAM,WAAW,GAAG,IAAA,gCAAiB,EAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,YAAY,GAAG,mBAAmB,6BAAY,aAAa,CAAC;IAElE,MAAM,QAAQ,GAAG,IAAA,sCAAuB,EAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAC1D,MAAM,eAAe,GAAG,IAAA,sCAAuB,EAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;IACxE,MAAM,UAAU,GAAG,IAAA,sCAAuB,EAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAE9D,MAAM,MAAM,GAAG,IAAA,sCAAe,EAAC,UAAU,CAAC,CAAC;IAC3C,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,4BAAQ,CAAC,sBAAsB,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IAEzE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAE/B,MAAM,GAAG,GAAG,MAAM,sBAAsB,CAAC,WAAW,EAAE;QACpD,QAAQ;QACR,WAAW;QACX,gBAAgB,EAAE,KAAK;QACvB,WAAW,EAAE,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC;KAC1C,CAAC,CAAC;IAEH,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QACvB,OAAO,IAAA,kCAAmB,EAAC,GAAG,EAAE;YAC9B,YAAY;YACZ,IAAI,EAAE,GAAG,CAAC,eAAe;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;IAErB,MAAM,MAAM,GAAG,IAAA,yCAAqB,EAClC,WAAW,EACX;QACE,QAAQ;QACR,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,WAAW;QACX,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,IAAI,EAAE,IAAI,CAAC,IAAI;KAChB,EACD,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;IACF,IAAI,IAAI,CAAC,eAAe,KAAK,eAAe,IAAI,MAAM,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;QAC/E,OAAO,IAAA,+BAAgB,EAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;IAC3C,CAAC;IAED,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;IAC1C,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;IACzC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3C,GAAG,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AAC5B,CAAC;AAEM,KAAK,UAAU,+BAA+B,CAAC,GAAY,EAAE,GAAa;IAC/E,MAAM,WAAW,GAAG,IAAA,gCAAiB,EAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,YAAY,GAAG,WAAW,CAAC;IAEjC,MAAM,QAAQ,GAAG,IAAA,sCAAuB,EAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG,IAAA,sCAAuB,EAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAE9D,MAAM,MAAM,GAAG,IAAA,sCAAe,EAAC,UAAU,CAAC,CAAC;IAC3C,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,4BAAQ,CAAC,sBAAsB,EAAE;YACzC,MAAM,EAAE,GAAG;SACZ,CAAC,CAAC;IACL,CAAC;IAED,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAC/B,IAAI,CAAC,IAAA,iCAAa,EAAC,WAAW,CAAC;QAAE,MAAM,IAAI,4BAAQ,CAAC,sBAAsB,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IAE7F,MAAM,GAAG,GAAG,MAAM,sBAAsB,CAAC,WAAW,EAAE;QACpD,QAAQ;QACR,WAAW;QACX,gBAAgB,EAAE,IAAI;QACtB,WAAW,EAAE,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC;KAC1C,CAAC,CAAC;IAEH,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QACvB,OAAO,IAAA,kCAAmB,EAAC,GAAG,EAAE;YAC9B,YAAY;YACZ,IAAI,EAAE,GAAG,CAAC,eAAe;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;IAErB,MAAM,MAAM,GAAG,IAAA,yCAAqB,EAClC,WAAW,EACX;QACE,QAAQ;QACR,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,WAAW;QACX,eAAe,EAAE,SAAS;QAC1B,IAAI,EAAE,IAAI,CAAC,IAAI;KAChB,EACD,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;IACF,IAAI,MAAM,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;QACnC,OAAO,IAAA,+BAAgB,EAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;IAC3C,CAAC;IAED,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;IAC1C,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;IACzC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3C,GAAG,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AAC5B,CAAC;AA6BD,KAAK,UAAU,sBAAsB,CACnC,WAAwB,EACxB,OAKC;IAED,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,gBAAgB,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAEzE,IAAI,IAAI,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC,yBAAyB,CAAC;QAChE,QAAQ,EAAE,QAAQ;QAClB,WAAW;KACZ,CAAC,CAAC;IACH,IAAI,IAAI,EAAE,CAAC;QACT,IAAI,WAAW,KAAK,IAAI,CAAC,eAAe,EAAE,CAAC;YACzC,OAAO;gBACL,MAAM,EAAE,GAAG;gBACX,eAAe,EAAE,IAAI,CAAC,eAAe;aACtC,CAAC;QACJ,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,gBAAgB,EAAE,CAAC;YACrB,IAAI,GAAG,MAAM,uBAAuB,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC;QAC/E,CAAC;QACD,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,4BAAQ,CAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,OAAO;QACL,MAAM,EAAE,GAAG;QACX,IAAI;KACL,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,WAAwB,EACxB,OAAmD;IAEnD,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAC1C,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAC1E,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,4BAAQ,CAAC,UAAU,QAAQ,aAAa,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACjF,IAAI,KAAK,CAAC,eAAe,KAAK,WAAW,EAAE,CAAC;QAC1C,OAAO;YACL,MAAM,EAAE,GAAG;YACX,eAAe,EAAE,KAAK,CAAC,eAAe;SACvC,CAAC;IACJ,CAAC;IACD,OAAO;QACL,MAAM,EAAE,GAAG;QACX,IAAI,EAAE,KAAK;KACZ,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,uBAAuB,CACpC,WAAwB,EACxB,OAAuD;IAEvD,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAC1C,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;IACzE,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QACrC,MAAM,IAAI,4BAAQ,CAAC,UAAU,QAAQ,aAAa,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,MAAM,WAAW,CAAC,UAAU,CAAC,yCAAyC,CAC3E;QACE,QAAQ,EAAE,KAAK,CAAC,GAAG;QACnB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,MAAM,EAAE,KAAK,CAAC,MAAM;KACrB,EACD;QACE,oBAAoB,EAAE,WAAW,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClF,WAAW;QACX,IAAI,EAAE,IAAA,qCAAiB,EAAC,KAAK,CAAC,YAAY,CAAC;QAC3C,gBAAgB,EAAE,uBAAuB;KAC1C,CACF,CAAC;AACJ,CAAC"}

package/dist/modules/public-site/public-site.controller.d.ts

@@ -1,5 +1,2 @@
-import { type Tracker } from "@paroicms/internal-server-lib";
 import type { Request, Response } from "express";
-import type { SiteContext } from "../../site-context/site-context.types";
 export declare function indexController(req: Request, res: Response): Promise<void>;
-export declare function serveIndexPage(siteContext: SiteContext, req: Request, res: Response, tracker: Tracker): Promise<void>;

package/dist/modules/public-site/public-site.controller.js

@@ -1,17 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.indexController = indexController;
-exports.serveIndexPage = serveIndexPage;
 const internal_server_lib_1 = require("@paroicms/internal-server-lib");
 const serve_text_or_1 = require("../../common/serve-text-or");
 const text_cache_1 = require("../../common/text-cache");
 const tracker_report_1 = require("../../common/tracker-report");
+const http_helpers_1 = require("../../express/http-helpers");
 const render_liquidjs_1 = require("../../liquidjs-tools/liquidjs-rendering/render-liquidjs");
 const rendering_context_1 = require("../../liquidjs-tools/liquidjs-rendering/rendering-context");
 const make_public_payload_1 = require("../../public-payload/make-public-payload");
-const site_context_1 = require("../../site-context/site-context");
 async function indexController(req, res) {
-    const siteContext = await (0, site_context_1.getSiteContext)(req.hostname);
+    const siteContext = (0, http_helpers_1.getReqSiteContext)(req);
     const tracker = (0, internal_server_lib_1.createTracker)();
     await serveIndexPage(siteContext, req, res, tracker);
     siteContext.siteLog.stats((0, tracker_report_1.trackerReportToMessage)(tracker.toReport(), `serve ${req.url}`));

package/dist/modules/public-site/public-site.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"public-site.controller.js","sourceRoot":"","sources":["../../../src/modules/public-site/public-site.controller.ts"],"names":[],"mappings":";;AAWA,0CAKC;AAED,wCAkBC;AApCD,uEAA4E;AAE5E,8DAAkE;AAClE,wDAAuD;AACvD,gEAAqE;AACrE,6FAA+F;AAC/F,iGAAmG;AACnG,kFAAqF;AACrF,kEAAiE;AAG1D,KAAK,UAAU,eAAe,CAAC,GAAY,EAAE,GAAa;IAC/D,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACvD,MAAM,OAAO,GAAG,IAAA,mCAAa,GAAE,CAAC;IAChC,MAAM,cAAc,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IACrD,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,IAAA,uCAAsB,EAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;AAC5F,CAAC;AAEM,KAAK,UAAU,cAAc,CAClC,WAAwB,EACxB,GAAY,EACZ,GAAa,EACb,OAAgB;IAEhB,MAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,WAAW,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;IACnF,MAAM,OAAO,GAAG,IAAA,oCAAoB,EAAC,WAAW,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;IACnF,IAAI,MAAM,OAAO,CAAC,cAAc,EAAE;QAAE,OAAO;IAE3C,MAAM,gBAAgB,GAAG,MAAM,IAAA,0CAAsB,EAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;IAE1F,MAAM,IAAI,GAAG,MAAM,IAAA,sCAAoB,EAAC,WAAW,EAAE,gBAAgB,EAAE;QACrE,aAAa,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC;QACnC,OAAO,EAAE,IAAA,+CAAyB,EAAC,WAAW,EAAE,gBAAgB,CAAC;KAClE,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,CAAC;AAC/E,CAAC"}
+{"version":3,"file":"public-site.controller.js","sourceRoot":"","sources":["../../../src/modules/public-site/public-site.controller.ts"],"names":[],"mappings":";;AAWA,0CAKC;AAhBD,uEAA4E;AAE5E,8DAAkE;AAClE,wDAAuD;AACvD,gEAAqE;AACrE,6DAA+D;AAC/D,6FAA+F;AAC/F,iGAAmG;AACnG,kFAAqF;AAG9E,KAAK,UAAU,eAAe,CAAC,GAAY,EAAE,GAAa;IAC/D,MAAM,WAAW,GAAG,IAAA,gCAAiB,EAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,IAAA,mCAAa,GAAE,CAAC;IAChC,MAAM,cAAc,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IACrD,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,IAAA,uCAAsB,EAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;AAC5F,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,WAAwB,EACxB,GAAY,EACZ,GAAa,EACb,OAAgB;IAEhB,MAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,WAAW,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;IACnF,MAAM,OAAO,GAAG,IAAA,oCAAoB,EAAC,WAAW,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;IACnF,IAAI,MAAM,OAAO,CAAC,cAAc,EAAE;QAAE,OAAO;IAE3C,MAAM,gBAAgB,GAAG,MAAM,IAAA,0CAAsB,EAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;IAE1F,MAAM,IAAI,GAAG,MAAM,IAAA,sCAAoB,EAAC,WAAW,EAAE,gBAAgB,EAAE;QACrE,aAAa,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC;QACnC,OAAO,EAAE,IAAA,+CAAyB,EAAC,WAAW,EAAE,gBAAgB,CAAC;KAClE,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,CAAC;AAC/E,CAAC"}

package/dist/modules/public-site/public-site.middleware.js

@@ -5,19 +5,11 @@ const internal_server_lib_1 = require("@paroicms/internal-server-lib");
 const serve_text_or_1 = require("../../common/serve-text-or");
 const text_cache_1 = require("../../common/text-cache");
 const tracker_report_1 = require("../../common/tracker-report");
-const context_1 = require("../../context");
 const http_helpers_1 = require("../../express/http-helpers");
-const site_context_1 = require("../../site-context/site-context");
 const public_route_parser_1 = require("./public-route/public-route-parser");
 const serve_document_1 = require("./serve-document/serve-document");
 async function publicSiteMiddleware(req, res, next) {
-    if (answerHttpRedirect(req, res))
-        return;
-    if (req.hostname === context_1.appConf.googleAuth?.fqdn) {
-        next();
-        return;
-    }
-    const siteContext = await (0, site_context_1.getSiteContext)(req.hostname);
+    const siteContext = (0, http_helpers_1.getReqSiteContext)(req);
     const parsedRoute = (0, public_route_parser_1.parsePublicRoute)(siteContext, req.url);
     if (!parsedRoute) {
         next();
@@ -55,12 +47,4 @@ async function serveDocument(siteContext, req, res, parsedRoute, tracker) {
     }
     await serveOr.putInCacheAndServe(generated.html, generated.dependencyKeys);
 }
-function answerHttpRedirect(req, res) {
-    const entry = context_1.httpRedirections.get(req.hostname);
-    if (!entry)
-        return false;
-    const redirectUrl = `${entry.to}${req.originalUrl}`;
-    res.redirect(301, redirectUrl);
-    return true;
-}
 //# sourceMappingURL=public-site.middleware.js.map

package/dist/modules/public-site/public-site.middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"public-site.middleware.js","sourceRoot":"","sources":["../../../src/modules/public-site/public-site.middleware.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"public-site.middleware.js","sourceRoot":"","sources":["../../../src/modules/public-site/public-site.middleware.ts"],"names":[],"mappings":";;AAUA,oDAYC;AAtBD,uEAA4E;AAE5E,8DAAiF;AACjF,wDAAuD;AACvD,gEAAqE;AACrE,6DAAiF;AAEjF,4EAA8F;AAC9F,oEAAuE;AAEhE,KAAK,UAAU,oBAAoB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;IACxF,MAAM,WAAW,GAAG,IAAA,gCAAiB,EAAC,GAAG,CAAC,CAAC;IAE3C,MAAM,WAAW,GAAG,IAAA,sCAAgB,EAAC,WAAW,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;IAC3D,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,IAAI,EAAE,CAAC;QACP,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,mCAAa,GAAE,CAAC;IAChC,MAAM,aAAa,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACjE,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,IAAA,uCAAsB,EAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;AAC5F,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,WAAwB,EACxB,GAAY,EACZ,GAAa,EACb,WAA8B,EAC9B,OAAgB;IAEhB,MAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,WAAW,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;IACnF,MAAM,OAAO,GAAG,IAAA,oCAAoB,EAAC,WAAW,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;IACnF,IAAI,MAAM,OAAO,CAAC,cAAc,EAAE;QAAE,OAAO;IAE3C,MAAM,gBAAgB,GAAG,IAAA,yBAAY,EAAC,WAAW,CAAC,OAAO,EAAE;QACzD,IAAI,EAAE,UAAU;QAChB,MAAM,EAAE,WAAW,CAAC,WAAW;KAChC,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAC3F,IAAI,aAAa,IAAI,aAAa,CAAC,KAAK,KAAK,GAAG,CAAC,GAAG,EAAE,CAAC;QACrD,OAAO,IAAA,+BAAgB,EAAC,GAAG,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,IAAA,qCAAoB,EAC1C,WAAW,EACX,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,EAC9B,OAAO,CACR,CAAC;IAEF,IAAI,SAAS,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC7B,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CACvC;YACE,QAAQ,EAAE,gBAAgB;YAC1B,cAAc,EAAE,SAAS,CAAC,cAAc;YACxC,KAAK,EAAE,SAAS,CAAC,GAAG;SACrB,EACD,OAAO,CACR,CAAC;QACF,OAAO,IAAA,+BAAgB,EAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,SAAS,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC7B,MAAM,IAAA,6BAAa,EAAC,WAAW,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1E,OAAO;IACT,CAAC;IAED,MAAM,OAAO,CAAC,kBAAkB,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC;AAC7E,CAAC"}

package/dist/oauth/oauth-middleware.d.ts

@@ -0,0 +1,2 @@
+import type { NextFunction, Request, Response } from "express";
+export declare function oauth2ClientMiddleware(req: Request, res: Response, next: NextFunction): void;

package/dist/oauth/oauth-middleware.js

@@ -0,0 +1,23 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.oauth2ClientMiddleware = oauth2ClientMiddleware;
+const express_1 = __importDefault(require("express"));
+const context_1 = require("../context");
+const route_handler_wrapper_1 = require("../express/route-handler-wrapper");
+const oauth2_client_controller_1 = require("./oauth2-client.controller");
+const authRouter = express_1.default.Router();
+authRouter.get("/auth", (0, route_handler_wrapper_1.wrapRouteHandler)(oauth2_client_controller_1.authController));
+authRouter.get("/auth/google", (0, route_handler_wrapper_1.wrapRouteHandler)(oauth2_client_controller_1.googleLogin));
+authRouter.get("/auth/google/callback", (0, route_handler_wrapper_1.wrapRouteHandler)(oauth2_client_controller_1.googleLoginCallbackController));
+authRouter.get("/auth/site-url/:redirectTo", (0, route_handler_wrapper_1.wrapRouteHandler)(oauth2_client_controller_1.siteUrlController));
+function oauth2ClientMiddleware(req, res, next) {
+    if (req.hostname !== context_1.appConf.googleAuth?.fqdn) {
+        next();
+        return;
+    }
+    authRouter(req, res, next);
+}
+//# sourceMappingURL=oauth-middleware.js.map

package/dist/oauth/oauth-middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"oauth-middleware.js","sourceRoot":"","sources":["../../src/oauth/oauth-middleware.ts"],"names":[],"mappings":";;;;;AAiBA,wDAOC;AAvBD,sDAA8B;AAC9B,wCAAqC;AACrC,4EAAoE;AACpE,yEAKoC;AAEpC,MAAM,UAAU,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAC;AACpC,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,IAAA,wCAAgB,EAAC,yCAAc,CAAC,CAAC,CAAC;AAC1D,UAAU,CAAC,GAAG,CAAC,cAAc,EAAE,IAAA,wCAAgB,EAAC,sCAAW,CAAC,CAAC,CAAC;AAC9D,UAAU,CAAC,GAAG,CAAC,uBAAuB,EAAE,IAAA,wCAAgB,EAAC,wDAA6B,CAAC,CAAC,CAAC;AACzF,UAAU,CAAC,GAAG,CAAC,4BAA4B,EAAE,IAAA,wCAAgB,EAAC,4CAAiB,CAAC,CAAC,CAAC;AAElF,SAAgB,sBAAsB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;IACpF,IAAI,GAAG,CAAC,QAAQ,KAAK,iBAAO,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC;QAC9C,IAAI,EAAE,CAAC;QACP,OAAO;IACT,CAAC;IAED,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;AAC7B,CAAC"}

package/dist/{modules/public-site → oauth}/oauth2-client.controller.js

@@ -5,10 +5,10 @@ exports.googleLogin = googleLogin;
 exports.googleLoginCallbackController = googleLoginCallbackController;
 exports.siteUrlController = siteUrlController;
 const public_server_lib_1 = require("@paroicms/public-server-lib");
-const api_error_handler_1 = require("../../common/api-error-handler");
-const context_1 = require("../../context");
-const http_helpers_1 = require("../../express/http-helpers");
-const auth_helper_1 = require("../core/auth/auth.helper");
+const api_error_handler_1 = require("../common/api-error-handler");
+const context_1 = require("../context");
+const http_helpers_1 = require("../express/http-helpers");
+const auth_helper_1 = require("../modules/core/auth/auth.helper");
 async function authController(req, res) {
     if (!context_1.appConf.googleAuth || context_1.appConf.googleAuth.disabled || !context_1.platformAuthUrl) {
         throw new Error("Google auth is disabled");

package/dist/oauth/oauth2-client.controller.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"oauth2-client.controller.js","sourceRoot":"","sources":["../../src/oauth/oauth2-client.controller.ts"],"names":[],"mappings":";;AAOA,wCAQC;AAED,kCAEC;AAED,sEAOC;AAED,8CAaC;AA3CD,mEAAkE;AAElE,mEAAuD;AACvD,wCAAiE;AACjE,0DAAkE;AAClE,kEAA0F;AAEnF,KAAK,UAAU,cAAc,CAAC,GAAY,EAAE,GAAa;IAC9D,IAAI,CAAC,iBAAO,CAAC,UAAU,IAAI,iBAAO,CAAC,UAAU,CAAC,QAAQ,IAAI,CAAC,yBAAe,EAAE,CAAC;QAC3E,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,GAAG,CAAC,QAAQ,KAAK,iBAAO,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QAC7C,MAAM,IAAI,4BAAQ,CAAC,qBAAqB,GAAG,CAAC,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IAC3E,CAAC;IACD,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,yBAAe,CAAC,CAAC,CAAC;AAClD,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,GAAY,EAAE,GAAa;IAC3D,MAAM,IAAA,6BAAe,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAClC,CAAC;AAEM,KAAK,UAAU,6BAA6B,CAAC,GAAY,EAAE,GAAa;IAC7E,MAAM,IAAI,GAAG,MAAM,IAAA,6BAAe,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC7C,IAAI,CAAC,iBAAO,CAAC,UAAU,IAAI,iBAAO,CAAC,UAAU,CAAC,QAAQ,IAAI,CAAC,yBAAe,EAAE,CAAC;QAC3E,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,MAAM,aAAa,GAAG,IAAA,mCAAqB,EAAC,IAAI,CAAC,CAAC;IAClD,GAAG,CAAC,IAAI,CAAC,8BAA8B,CAAC,EAAE,aAAa,EAAE,eAAe,EAAf,yBAAe,EAAE,CAAC,CAAC,CAAC;AAC/E,CAAC;AAEM,KAAK,UAAU,iBAAiB,CAAC,GAAY,EAAE,IAAc;IAClE,MAAM,UAAU,GAAG,IAAA,sCAAuB,EAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAC9D,IAAI,CAAC,UAAU;QAAE,MAAM,IAAI,4BAAQ,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IAC3E,IAAI,CAAC,iBAAO,CAAC,UAAU,IAAI,iBAAO,CAAC,UAAU,CAAC,QAAQ,IAAI,CAAC,yBAAe,EAAE,CAAC;QAC3E,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,MAAM,QAAQ,GAAG,mBAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC3C,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,4BAAQ,CAAC,gBAAgB,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACrE,OAAO,IAAA,2BAAO,EAAC;QACb,QAAQ,EAAE,iBAAO,CAAC,cAAc;QAChC,IAAI,EAAE,iBAAO,CAAC,MAAM;QACpB,IAAI,EAAE,QAAQ,CAAC,IAAI;KACpB,CAAC,CAAC;AACL,CAAC;AAED,SAAS,8BAA8B,CAAC,EACtC,aAAa,EACb,eAAe,GACoC;IACnD,OAAO;;;;;;;;;;;;;;iEAcwD,IAAA,8BAAU,EAAC,aAAa,CAAC;;;;iCAIzD,IAAA,8BAAU,EAAC,eAAe,CAAC;;;;;;;;;;;;;;;;QAgBpD,CAAC;AACT,CAAC;AAED,SAAS,oBAAoB,CAAC,eAAuB;IACnD,OAAO;;;;;;;;;;;;;;+BAcsB,IAAA,8BAAU,EAAC,eAAe,CAAC;;;QAGlD,CAAC;AACT,CAAC"}