@paroicms/site-generator-plugin 0.20.0 → 0.22.0

package/{gen-backend → backend}/dist/commands/generator-session.js

@@ -3,11 +3,16 @@ import { ApiError } from "@paroicms/public-server-lib";
 import { nanoid } from "nanoid";
 import { getInvalidSessionError } from "../db/db-read.queries.js";
 import { insertSession, updateSession } from "../db/db-write.queries.js";
+import { validateRecaptchaResponse } from "./validate-recaptcha-response.js";
 const { sign, verify } = (await import("jsonwebtoken")).default;
 export async function newSessionCommand(ctx, command) {
-    const { service } = ctx;
+    const { service, pluginConf } = ctx;
     const { recaptchaToken, language } = command;
-    const isValid = await service.validateRecaptchaResponse(recaptchaToken);
+    const isValid = !pluginConf.googleRecaptchaSecretKey ||
+        (await validateRecaptchaResponse(service, {
+            gRecaptchaResponse: recaptchaToken,
+            secretKey: pluginConf.googleRecaptchaSecretKey,
+        }));
     if (!isValid)
         throw new ApiError("Invalid reCAPTCHA token", 400);
     const date = new Date();
@@ -22,9 +27,13 @@ export async function newSessionCommand(ctx, command) {
  * Renews a session token and extends its expiration time
  */
 export async function renewSessionCommand(ctx, command) {
-    const { service } = ctx;
+    const { service, pluginConf } = ctx;
     const { recaptchaToken } = command;
-    const isValid = await service.validateRecaptchaResponse(recaptchaToken);
+    const isValid = !pluginConf.googleRecaptchaSecretKey ||
+        (await validateRecaptchaResponse(service, {
+            gRecaptchaResponse: recaptchaToken,
+            secretKey: pluginConf.googleRecaptchaSecretKey,
+        }));
     if (!isValid)
         throw new ApiError("Invalid reCAPTCHA token", 400);
     let payload;

package/backend/dist/commands/validate-recaptcha-response.js

@@ -0,0 +1,20 @@
+import { ApiError } from "@paroicms/public-server-lib";
+export async function validateRecaptchaResponse(service, { gRecaptchaResponse, secretKey, }) {
+    if (!gRecaptchaResponse)
+        throw new ApiError("Missing gRecaptchaResponse", 400);
+    if (!secretKey) {
+        throw new Error("Invalid configuration, missing 'recaptchaPrivateKey'");
+    }
+    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 result = (await response.json());
+    if (result.hostname !== service.fqdn) {
+        throw new ApiError("Unauthorized", 401);
+    }
+    return result.success;
+}

package/backend/dist/context.js

@@ -0,0 +1,5 @@
+import { esmDirName, extractPackageNameAndVersionSync } from "@paroicms/script-lib";
+import { dirname } from "node:path";
+export const projectDir = dirname(esmDirName(import.meta.url));
+export const packageDir = dirname(projectDir);
+export const { version: pluginVersion } = extractPackageNameAndVersionSync(packageDir);

package/{gen-backend → backend}/dist/data-format.js

@@ -5,8 +5,9 @@ export const GeneratorPluginConfigurationAT = type({
     anthropicApiKey: "string",
     mistralApiKey: "string",
     packName: "string",
-    "googleRecaptchaSiteKey?": "string|undefined",
     "debugDir?": "string|undefined",
+    "googleRecaptchaSiteKey?": "string|undefined",
+    "googleRecaptchaSecretKey?": "string|undefined",
     "+": "reject",
 }).pipe((data) => data);
 const BaseCommandAT = type({

package/{gen-backend → backend}/dist/generator/fake-content-generator/generate-fake-content.js

@@ -134,7 +134,7 @@ function toFakeContentOutputTag(fieldNameOrType) {
             tagDescription: "Write a title here in plain text",
         };
     }
-    if (key === "shortTitle") {
+    if (key === "buttonLabel") {
         return {
             tagName: camelToKebabCase(key),
             key,

package/{gen-backend/dist/plugin.js → backend/dist/index.js}

@@ -3,7 +3,7 @@ import { messageOf } from "@paroicms/public-anywhere-lib";
 import { ApiError, escapeHtml, makeStylesheetLinkAsyncTag, } from "@paroicms/public-server-lib";
 import { join } from "node:path";
 import { executeCommand } from "./commands/execute-command.js";
-import { packageDir, pluginVersion, SLUG } from "./context.js";
+import { packageDir, pluginVersion } from "./context.js";
 import { formatGeneratorCommand, GeneratorPluginConfigurationAT } from "./data-format.js";
 import { createOrOpenSiteGeneratorConnection } from "./db/db-init.js";
 import { initializeImageNames } from "./generator/lib/images-lib.js";
@@ -12,7 +12,6 @@ import { startSiteRemover } from "./lib/site-remover.js";
 await initializeImageNames();
 const plugin = {
     version: pluginVersion,
-    slug: SLUG,
     async siteInit(service) {
         const { cn, logNextQuery } = await createOrOpenSiteGeneratorConnection({
             sqliteFile: join(service.registeredSite.dataDir, "site-generator.sqlite"),
@@ -20,6 +19,12 @@ const plugin = {
             logger: service.logger,
         });
         const pluginConf = GeneratorPluginConfigurationAT.assert(service.configuration);
+        if (!!pluginConf.googleRecaptchaSecretKey !== !!pluginConf.googleRecaptchaSiteKey) {
+            throw new Error("[Site Generator] Invalid Google reCAPTCHA configuration");
+        }
+        if (!pluginConf.googleRecaptchaSiteKey) {
+            service.logger.warn("[Site Generator] Google reCAPTCHA keys are not set. The site generator will not be protected.");
+        }
         let debugDir = pluginConf.debugDir;
         if (debugDir) {
             if (!(await pathExists(debugDir))) {
@@ -37,7 +42,7 @@ const plugin = {
             });
             startSiteRemover(rawContext);
         });
-        service.setPublicAssetsDirectory(join(packageDir, "gen-front", "dist"));
+        service.setPublicAssetsDirectory(join(packageDir, "frontend", "dist"));
         service.registerLiquidTag("siteGeneratorApp", "injectHtml", (service) => {
             service.setRenderState("paSiteGeneratorApp", true);
             return `<div id="site-generator-app"></div>`;
@@ -46,8 +51,8 @@ const plugin = {
             if (!state.get("paSiteGeneratorApp"))
                 return;
             return [
-                makeStylesheetLinkAsyncTag(`${service.pluginAssetsUrl}/gen-front.css`),
-                `<script type="module" src="${escapeHtml(`${service.pluginAssetsUrl}/gen-front.mjs`)}" class="js-script-${SLUG}" data-google-recaptcha-site-key="${escapeHtml(pluginConf.googleRecaptchaSiteKey)}" async></script>`,
+                makeStylesheetLinkAsyncTag(`${service.pluginAssetsUrl}/frontend.css`),
+                `<script type="module" src="${escapeHtml(`${service.pluginAssetsUrl}/frontend.mjs`)}" class="js-script-site-generator" data-google-recaptcha-site-key="${escapeHtml(pluginConf.googleRecaptchaSiteKey ?? "")}" async></script>`,
             ];
         });
         service.setPublicApiHandler(async (service, httpContext, relativePath) => {

package/{gen-backend → backend}/prompts/predefined-fields.json

@@ -4,6 +4,7 @@
     "localized": true,
     "dataType": "json",
     "renderAs": "html",
+    "normalizeTypography": true,
     "description": "Lead paragraph, or \"chapo\", of a post (HTML)"
   },
   {
@@ -11,6 +12,7 @@
     "localized": true,
     "dataType": "json",
     "renderAs": "html",
+    "normalizeTypography": true,
     "description": "HTML Content"
   },
   {
@@ -18,12 +20,14 @@
     "localized": true,
     "dataType": "json",
     "renderAs": "html",
+    "normalizeTypography": true,
     "description": "A short introduction (HTML)"
   },
   {
     "fieldName": "footerMention",
     "dataType": "json",
     "renderAs": "html",
+    "normalizeTypography": true,
     "localized": true,
     "description": "The footer mention is used to display a legal notice or a disclaimer (HTML). Usually included as a site field."
   },
@@ -37,6 +41,7 @@
     "fieldName": "slogan",
     "localized": true,
     "dataType": "string",
+    "normalizeTypography": true,
     "description": "A slogan is a memorable motto or phrase as a repetitive expression of an idea or purpose"
   },
   {
@@ -55,13 +60,15 @@
     "fieldName": "title",
     "localized": true,
     "dataType": "string",
+    "normalizeTypography": true,
     "description": "Store a title"
   },
   {
-    "fieldName": "shortTitle",
+    "fieldName": "buttonLabel",
     "localized": true,
     "dataType": "string",
-    "description": "A short title can be useful for buttons or menu items"
+    "normalizeTypography": true,
+    "description": "This short label can be used in the theme for buttons or menu items"
   },
   {
     "fieldName": "gallery",