@paroicms/server 1.41.0 → 1.41.1

package/dist/helpers/make-plugin-site-context.d.ts

@@ -1,3 +1,4 @@
 import type { PluginSiteContext } from "@paroicms/plugin-lib";
 import type { SiteContext } from "../site-context/site-context.types";
 export default function makePluginSiteContext(siteContext: SiteContext): PluginSiteContext;
+export declare function createValidateRecaptchaResponseForPlugin(siteContext: Pick<SiteContext, "fqdn">): (gRecaptchaResponse: string | undefined) => Promise<boolean>;

package/dist/helpers/make-plugin-site-context.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createValidateRecaptchaResponseForPlugin = void 0;
 const sendMail_helpers_1 = require("../common/mail/sendMail.helpers");
+const context_1 = require("../context");
 const load_fields_queries_1 = require("../modules/core/fields/load-fields.queries");
 const validate_recaptcha_response_1 = require("../modules/public-api/mail/validate-recaptcha-response");
 function makePluginSiteContext(siteContext) {
@@ -11,7 +13,7 @@ function makePluginSiteContext(siteContext) {
         siteSchema: siteContext.siteSchema,
         siteUrl: siteContext.siteUrl,
         themeConf: siteContext.themeConf,
-        validateRecaptchaResponse: (0, validate_recaptcha_response_1.getValidateRecaptchaResponseCb)(siteContext),
+        validateRecaptchaResponse: createValidateRecaptchaResponseForPlugin(siteContext),
         getSiteFieldValue: async (options) => {
             return await (0, load_fields_queries_1.getSiteFieldValue)(siteContext, options);
         },
@@ -19,4 +21,12 @@ function makePluginSiteContext(siteContext) {
     };
 }
 exports.default = makePluginSiteContext;
+function createValidateRecaptchaResponseForPlugin(siteContext) {
+    if (!context_1.appConf.googleRecaptcha || context_1.appConf.googleRecaptcha.disabled) {
+        return () => Promise.resolve(true);
+    }
+    const { secretKey } = context_1.appConf.googleRecaptcha;
+    return (gRecaptchaResponse) => (0, validate_recaptcha_response_1.validateRecaptchaResponse)(siteContext, { gRecaptchaResponse, secretKey });
+}
+exports.createValidateRecaptchaResponseForPlugin = createValidateRecaptchaResponseForPlugin;
 //# sourceMappingURL=make-plugin-site-context.js.map

package/dist/helpers/make-plugin-site-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"make-plugin-site-context.js","sourceRoot":"","sources":["../../src/helpers/make-plugin-site-context.ts"],"names":[],"mappings":";;AACA,sEAA2D;AAC3D,oFAA+E;AAC/E,wGAAwG;AAGxG,SAAwB,qBAAqB,CAAC,WAAwB;IACpE,OAAO;QACL,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,YAAY,EAAE,WAAW,CAAC,YAAY;QACtC,OAAO,EAAE,WAAW,CAAC,OAAO;QAC5B,UAAU,EAAE,WAAW,CAAC,UAAU;QAClC,OAAO,EAAE,WAAW,CAAC,OAAO;QAC5B,SAAS,EAAE,WAAW,CAAC,SAAS;QAChC,yBAAyB,EAAE,IAAA,4DAA8B,EAAC,WAAW,CAAC;QACtE,iBAAiB,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YACnC,OAAO,MAAM,IAAA,uCAAiB,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QACvD,CAAC;QACD,QAAQ,EAAR,2BAAQ;KACT,CAAC;AACJ,CAAC;AAdD,wCAcC"}
+{"version":3,"file":"make-plugin-site-context.js","sourceRoot":"","sources":["../../src/helpers/make-plugin-site-context.ts"],"names":[],"mappings":";;;AACA,sEAA2D;AAC3D,wCAAqC;AACrC,oFAA+E;AAC/E,wGAAmG;AAGnG,SAAwB,qBAAqB,CAAC,WAAwB;IACpE,OAAO;QACL,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,YAAY,EAAE,WAAW,CAAC,YAAY;QACtC,OAAO,EAAE,WAAW,CAAC,OAAO;QAC5B,UAAU,EAAE,WAAW,CAAC,UAAU;QAClC,OAAO,EAAE,WAAW,CAAC,OAAO;QAC5B,SAAS,EAAE,WAAW,CAAC,SAAS;QAChC,yBAAyB,EAAE,wCAAwC,CAAC,WAAW,CAAC;QAChF,iBAAiB,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YACnC,OAAO,MAAM,IAAA,uCAAiB,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QACvD,CAAC;QACD,QAAQ,EAAR,2BAAQ;KACT,CAAC;AACJ,CAAC;AAdD,wCAcC;AACD,SAAgB,wCAAwC,CACtD,WAAsC;IAEtC,IAAI,CAAC,iBAAO,CAAC,eAAe,IAAI,iBAAO,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;QACjE,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IACD,MAAM,EAAE,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,CAAC;IAC9C,OAAO,CAAC,kBAAsC,EAAE,EAAE,CAChD,IAAA,uDAAyB,EAAC,WAAW,EAAE,EAAE,kBAAkB,EAAE,SAAS,EAAE,CAAC,CAAC;AAC9E,CAAC;AATD,4FASC"}

package/dist/modules/public-api/mail/validate-recaptcha-response.d.ts

@@ -1,2 +1,5 @@
 import type { SiteContext } from "../../../site-context/site-context.types";
-export declare function getValidateRecaptchaResponseCb(siteContext: Pick<SiteContext, "fqdn">): ((gRecaptchaResponse?: string | undefined) => Promise<void>) | undefined;
+export declare function validateRecaptchaResponse(siteContext: Pick<SiteContext, "fqdn">, { gRecaptchaResponse, secretKey, }: {
+    gRecaptchaResponse: string | undefined;
+    secretKey: string;
+}): Promise<boolean>;

package/dist/modules/public-api/mail/validate-recaptcha-response.js

@@ -1,37 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getValidateRecaptchaResponseCb = void 0;
+exports.validateRecaptchaResponse = void 0;
 const common_1 = require("@nestjs/common");
-const context_1 = require("../../../context");
-function getValidateRecaptchaResponseCb(siteContext) {
-    if (!context_1.appConf.googleRecaptcha || context_1.appConf.googleRecaptcha.disabled)
-        return;
-    const googleRecaptcha = context_1.appConf.googleRecaptcha;
-    return (gRecaptchaResponse) => validateRecaptchaResponse(siteContext, {
-        gRecaptchaResponse,
-        googleRecaptchaPrivateKey: googleRecaptcha.siteKey,
-    });
-}
-exports.getValidateRecaptchaResponseCb = getValidateRecaptchaResponseCb;
-async function validateRecaptchaResponse(siteContext, { gRecaptchaResponse, googleRecaptchaPrivateKey, }) {
+async function validateRecaptchaResponse(siteContext, { gRecaptchaResponse, secretKey, }) {
     if (!gRecaptchaResponse)
         throw new common_1.BadRequestException("Missing gRecaptchaResponse");
-    if (!googleRecaptchaPrivateKey) {
+    if (!secretKey) {
         throw new Error("Invalid configuration, missing 'recaptchaPrivateKey'");
     }
-    const url = `https://www.google.com/recaptcha/api/siteverify?secret=${googleRecaptchaPrivateKey}&response=${gRecaptchaResponse}`;
+    const url = `https://www.google.com/recaptcha/api/siteverify?secret=${secretKey}&response=${gRecaptchaResponse}`;
     const response = await fetch(url, {
         method: "post",
     });
     if (response.status < 200 || response.status >= 300) {
         throw new Error("Failed to call the Google Recaptcha API");
     }
-    const payload = (await response.json());
-    if (!payload.success) {
-        throw new common_1.BadRequestException("invalid recaptcha response");
-    }
-    if (payload.hostname !== siteContext.fqdn) {
+    const result = (await response.json());
+    if (result.hostname !== siteContext.fqdn) {
         throw new common_1.UnauthorizedException();
     }
+    return result.success;
 }
+exports.validateRecaptchaResponse = validateRecaptchaResponse;
 //# sourceMappingURL=validate-recaptcha-response.js.map

package/dist/modules/public-api/mail/validate-recaptcha-response.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate-recaptcha-response.js","sourceRoot":"","sources":["../../../../src/modules/public-api/mail/validate-recaptcha-response.ts"],"names":[],"mappings":";;;AAAA,2CAA4E;AAC5E,8CAA2C;AAG3C,SAAgB,8BAA8B,CAC5C,WAAsC;IAEtC,IAAI,CAAC,iBAAO,CAAC,eAAe,IAAI,iBAAO,CAAC,eAAe,CAAC,QAAQ;QAAE,OAAO;IACzE,MAAM,eAAe,GAAG,iBAAO,CAAC,eAAe,CAAC;IAChD,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAC5B,yBAAyB,CAAC,WAAW,EAAE;QACrC,kBAAkB;QAClB,yBAAyB,EAAE,eAAe,CAAC,OAAO;KACnD,CAAC,CAAC;AACP,CAAC;AAVD,wEAUC;AAeD,KAAK,UAAU,yBAAyB,CACtC,WAAsC,EACtC,EACE,kBAAkB,EAClB,yBAAyB,GAI1B;IAED,IAAI,CAAC,kBAAkB;QAAE,MAAM,IAAI,4BAAmB,CAAC,4BAA4B,CAAC,CAAC;IACrF,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;IAC1E,CAAC;IACD,MAAM,GAAG,GAAG,0DAA0D,yBAAyB,aAAa,kBAAkB,EAAE,CAAC;IACjI,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;QAChC,MAAM,EAAE,MAAM;KACf,CAAC,CAAC;IACH,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;QACpD,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAC7D,CAAC;IACD,MAAM,OAAO,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAsC,CAAC;IAC7E,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACrB,MAAM,IAAI,4BAAmB,CAAC,4BAA4B,CAAC,CAAC;IAC9D,CAAC;IACD,IAAI,OAAO,CAAC,QAAQ,KAAK,WAAW,CAAC,IAAI,EAAE,CAAC;QAC1C,MAAM,IAAI,8BAAqB,EAAE,CAAC;IACpC,CAAC;AACH,CAAC"}
+{"version":3,"file":"validate-recaptcha-response.js","sourceRoot":"","sources":["../../../../src/modules/public-api/mail/validate-recaptcha-response.ts"],"names":[],"mappings":";;;AAAA,2CAA4E;AAgBrE,KAAK,UAAU,yBAAyB,CAC7C,WAAsC,EACtC,EACE,kBAAkB,EAClB,SAAS,GAIV;IAED,IAAI,CAAC,kBAAkB;QAAE,MAAM,IAAI,4BAAmB,CAAC,4BAA4B,CAAC,CAAC;IACrF,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;IAC1E,CAAC;IACD,MAAM,GAAG,GAAG,0DAA0D,SAAS,aAAa,kBAAkB,EAAE,CAAC;IACjH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;QAChC,MAAM,EAAE,MAAM;KACf,CAAC,CAAC;IACH,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;QACpD,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAC7D,CAAC;IACD,MAAM,MAAM,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAsC,CAAC;IAC5E,IAAI,MAAM,CAAC,QAAQ,KAAK,WAAW,CAAC,IAAI,EAAE,CAAC;QACzC,MAAM,IAAI,8BAAqB,EAAE,CAAC;IACpC,CAAC;IACD,OAAO,MAAM,CAAC,OAAO,CAAC;AACxB,CAAC;AA1BD,8DA0BC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paroicms/server",
-  "version": "1.41.0",
+  "version": "1.41.1",
   "description": "The ParoiCMS server",
   "keywords": [
     "cms",
@@ -49,9 +49,9 @@
     "@paroi/data-formatters-lib": "~0.3.0",
     "@paroicms/anywhere-lib": "1.15.0",
     "@paroicms/bo": "1.32.0",
-    "@paroicms/plugin-lib": "0.5.0",
+    "@paroicms/plugin-lib": "0.5.1",
     "@paroicms/server-database-media-storage": "1.6.4",
-    "@paroicms/server-image-cache-engine": "1.9.0",
+    "@paroicms/server-image-cache-engine": "1.9.1",
     "@paroicms/server-lib": "1.5.7",
     "@paroicms/server-text-cache-system": "1.5.5",
     "@paroicms/site-app": "1.8.0",