@websolutespa/payload-plugin-bowl 1.7.3 → 1.7.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @websolutespa/payload-plugin-bowl
 
+## 1.7.5
+
+### Patch Changes
+
+- Modified: Label collection title -> text
+
+## 1.7.4
+
+### Patch Changes
+
+- Fixing: findRoute redirects
+
 ## 1.7.3
 
 ### Patch Changes

package/dist/index.d.ts

@@ -13,6 +13,7 @@ import { TreeItemIndex, TreeItem, TreeItemRenderContext, TreeInformation, TreeDa
 import { Props as Props$4 } from 'payload/dist/admin/components/views/collections/List/types';
 import { User } from 'payload/dist/auth';
 import { PaginatedDocs } from 'payload/database';
+import { Response, NextFunction } from 'express';
 import { ContextType } from 'payload/dist/admin/components/utilities/DocumentInfo/types';
 import { Props as Props$2 } from 'payload/components/views/Cell';
 import { Props as Props$3 } from 'payload/components/fields/Text';
@@ -167,7 +168,7 @@ declare function getRouteByItemAndLocale(req: PayloadRequest<any>, item: ICatego
 declare function getRouteByCategoryAndLocale(req: PayloadRequest<any>, item: ICategory, localeId: string, slug: string): Promise<IRoute[]>;
 declare const routeGet: Endpoint;
 declare const routePost: Endpoint;
-declare function routePostHandler(request: any, response: any, next: any): Promise<any>;
+declare function routePostHandler(request: PayloadRequest, response: Response, next: NextFunction): Promise<Response<any, Record<string, any>>>;
 declare function getEachMarketLocale(req: PayloadRequest<any>, callback: (market: IMarket, locale: ILocale, markets: IMarket[], locales: ILocale[]) => void): Promise<void>;
 declare function getPages(req: PayloadRequest<any>): Promise<IMemoryStore<ICategorized>>;
 

package/dist/index.js

@@ -1479,10 +1479,41 @@ var routePost = {
   method: "post",
   handler: routePostHandler
 };
+var trimTerminalSlash = /* @__PURE__ */ __name((path3) => {
+  return path3.replace(/\/+$/, "");
+}, "trimTerminalSlash");
+var sanitizeHref = /* @__PURE__ */ __name((url, urlBeforeRedirect) => {
+  if (urlBeforeRedirect) {
+    const sanitizedUrl = new URL(urlBeforeRedirect);
+    sanitizedUrl.protocol = url.protocol;
+    return trimTerminalSlash(sanitizedUrl.href);
+  } else {
+    return trimTerminalSlash(url.href);
+  }
+}, "sanitizeHref");
+var sanitizeRedirectFrom = /* @__PURE__ */ __name((path3, url, urlBeforeRedirect) => {
+  path3 = trimTerminalSlash(path3);
+  if (urlBeforeRedirect) {
+    return path3.replace(/^(\^?)((https?:\/\/)+)/, `$1${url.protocol}//`);
+  } else {
+    return path3.replace(/^(\^?)((https?:\/\/)+(\w|\.|:)+)/, `$1${url.origin}`);
+  }
+}, "sanitizeRedirectFrom");
+var sanitizeRedirectTo = /* @__PURE__ */ __name((path3) => {
+  return path3 ? trimTerminalSlash(path3) : void 0;
+}, "sanitizeRedirectTo");
+var sanitizeRedirectUrl = /* @__PURE__ */ __name((path3, url) => {
+  if (path3 != null) {
+    path3 = trimTerminalSlash(path3);
+    return path3.match(/^((https?:\/\/)+)/) ? path3 : `${url.origin}${path3}`;
+  } else {
+    return path3;
+  }
+}, "sanitizeRedirectUrl");
 async function routePostHandler(request, response, next) {
-  if (request.body.pathname && request.body.href) {
-    try {
-      const { pathname, href } = request.body;
+  try {
+    const { pathname, href, hrefBeforeRedirect } = request.body;
+    if (pathname && href) {
       const routes = await getRoutes(request);
       const route = routes.find((x) => x.id === pathname);
       if (route !== void 0) {
@@ -1500,17 +1531,9 @@ async function routePostHandler(request, response, next) {
         if (splatRoute) {
           return response.status(200).json(splatRoute);
         }
-        const exactMatchResolver = /* @__PURE__ */ __name((redirect) => {
-          const status = parseInt(redirect.status) || 307;
-          if (status < 400) {
-            const redirectUrl = redirect.to;
-            return response.status(status).send({
-              redirectUrl
-            });
-          } else {
-            return response.status(status).send("gone");
-          }
-        }, "exactMatchResolver");
+        const url = new URL(href);
+        const urlBeforeRedirect = hrefBeforeRedirect ? new URL(hrefBeforeRedirect) : null;
+        const sanitizedHref = sanitizeHref(url, urlBeforeRedirect);
         const { payload } = request;
         const payloadResponse = await payload.find({
           collection: options.slug.redirect,
@@ -1523,10 +1546,26 @@ async function routePostHandler(request, response, next) {
           depth: 0,
           limit: 1e4,
           pagination: false,
-          request
+          req: request
         });
-        const redirects = payloadResponse.docs ? payloadResponse.docs : [];
-        const exactMatchRedirect = redirects.find((x) => x.from === href);
+        let redirects = payloadResponse.docs ? payloadResponse.docs : [];
+        redirects = redirects.map((x) => ({
+          ...x,
+          from: sanitizeRedirectFrom(x.from, url, urlBeforeRedirect),
+          to: sanitizeRedirectTo(x.to)
+        }));
+        const exactMatchResolver = /* @__PURE__ */ __name((redirect) => {
+          const status = parseInt(redirect.status) || 307;
+          if (status < 400) {
+            const redirectUrl = sanitizeRedirectUrl(redirect.to, url);
+            return response.status(status).send({
+              redirectUrl
+            });
+          } else {
+            return response.status(status).send("gone");
+          }
+        }, "exactMatchResolver");
+        const exactMatchRedirect = redirects.find((x) => x.from === sanitizedHref);
         if (exactMatchRedirect !== void 0) {
           return exactMatchResolver(exactMatchRedirect);
         }
@@ -1538,7 +1577,7 @@ async function routePostHandler(request, response, next) {
             let redirectUrl = redirect.to.replace(/\*/g, (...rest) => {
               return `$${++i}`;
             });
-            redirectUrl = href.replace(regexp, redirectUrl);
+            redirectUrl = sanitizedHref.replace(regexp, redirectUrl);
             return response.status(status).send({
               redirectUrl
             });
@@ -1552,22 +1591,22 @@ async function routePostHandler(request, response, next) {
           expression = `^${expression.replace(/(^\^)|(\$$)/g, "")}$`;
           x.from = expression;
         });
-        const firstMatch = redirects.find((x) => href.match(x.from));
+        const firstMatch = redirects.find((x) => sanitizedHref.match(x.from));
         if (firstMatch) {
           return patternMatchResolver(firstMatch);
         }
         return response.status(404).send("not found");
       }
-    } catch (error) {
-      if (error.status === 404) {
-        return response.status(404).send("not found");
-      } else {
-        console.error("storeHandler.error.500", error);
-        throw error;
-      }
+    } else {
+      return response.status(400).send("bad request");
+    }
+  } catch (error) {
+    if (error.status === 404) {
+      return response.status(404).send("not found");
+    } else {
+      console.error("storeHandler.error.500", error);
+      throw error;
     }
-  } else {
-    return response.status(400).send("bad request");
   }
 }
 __name(routePostHandler, "routePostHandler");
@@ -4368,12 +4407,12 @@ var Label = /* @__PURE__ */ __name((options2) => ({
   admin: {
     group: options2.group.config,
     useAsTitle: "id",
-    defaultColumns: ["id", "title"]
+    defaultColumns: ["id", "text"]
   },
   fields: [
     // inherited fields: id, createdAt, updatedAt
     { type: "withId", required: true },
-    { type: "withTitle", required: true }
+    { type: "withText", required: true, localized: true }
   ]
 }), "Label");
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/payload-plugin-bowl",
-  "version": "1.7.3",
+  "version": "1.7.5",
   "description": "Bowl PayloadCms plugin of the BOM Repository",
   "keywords": [
     "payload",