feat: add getEntityByPath

chapter-three · May 17, 2021 · 072ead7 · 072ead7 · vercel · May 17, 2021
1 parent 64662df
commit 072ead7
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 8 deletions.
diff --git a/examples/example-blog/pages/api/preview.ts b/examples/example-blog/pages/api/preview.ts
@@ -1,6 +1,10 @@
 import { NextApiRequest, NextApiResponse } from "next"
+import { getEntityByPath } from "next-drupal"
 
-export default function (request: NextApiRequest, response: NextApiResponse) {
+export default async function (
+  request: NextApiRequest,
+  response: NextApiResponse
+) {
   const { slug, resourceVersion, secret } = request.query
 
   if (secret !== process.env.DRUPAL_PREVIEW_SECRET) {
@@ -11,9 +15,16 @@ export default function (request: NextApiRequest, response: NextApiResponse) {
     return response.status(401).json({ message: "Invalid slug." })
   }
 
+  const node = await getEntityByPath(slug as string)
+
+  if (!node) {
+    return response.status(404).json({ message: "Invalid slug" })
+  }
+
   response.setPreviewData({
     resourceVersion,
   })
 
-  response.redirect(slug as string)
+  response.writeHead(307, { Location: node.path.alias })
+  response.end()
 }
diff --git a/examples/example-marketing/pages/api/preview.ts b/examples/example-marketing/pages/api/preview.ts
@@ -1,6 +1,10 @@
 import { NextApiRequest, NextApiResponse } from "next"
+import { getEntityByPath } from "next-drupal"
 
-export default function (request: NextApiRequest, response: NextApiResponse) {
+export default async function (
+  request: NextApiRequest,
+  response: NextApiResponse
+) {
   const { slug, resourceVersion, secret } = request.query
 
   if (secret !== process.env.DRUPAL_PREVIEW_SECRET) {
@@ -11,9 +15,16 @@ export default function (request: NextApiRequest, response: NextApiResponse) {
     return response.status(401).json({ message: "Invalid slug." })
   }
 
+  const node = await getEntityByPath(slug as string)
+
+  if (!node) {
+    return response.status(404).json({ message: "Invalid slug" })
+  }
+
   response.setPreviewData({
     resourceVersion,
   })
 
-  response.redirect(slug as string)
+  response.writeHead(307, { Location: node.path.alias })
+  response.end()
 }
diff --git a/packages/next-drupal/src/get-entity-from-context.ts b/packages/next-drupal/src/get-entity-from-context.ts
@@ -39,9 +39,17 @@ export async function getEntityFromContext(
   return options?.deserialize ? deserialize(entity) : entity
 }
 
+export async function getEntityByPath(path: string) {
+  const entity = await resolveEntityUsingPath(path)
+
+  if (!entity) return null
+
+  return deserialize(entity)
+}
+
 async function resolveEntityUsingPath(
   path: string,
-  options?: { resourceVersion?: string; params?: Record<string, unknown> }
+  options: { resourceVersion?: string; params?: Record<string, unknown> } = {}
 ) {
   try {
     const url = new URL(
@@ -95,6 +103,6 @@ async function resolveEntityUsingPath(
 
     return JSON.parse(json["resolvedResource#uri{0}"]?.body)
   } catch (error) {
-    //
+    // console.error(error)
   }
 }
diff --git a/starters/basic-starter/pages/api/preview.tsx b/starters/basic-starter/pages/api/preview.tsx
@@ -1,6 +1,10 @@
 import { NextApiRequest, NextApiResponse } from "next"
+import { getEntityByPath } from "next-drupal"
 
-export default function (request: NextApiRequest, response: NextApiResponse) {
+export default async function (
+  request: NextApiRequest,
+  response: NextApiResponse
+) {
   const { slug, resourceVersion, secret } = request.query
 
   if (secret !== process.env.DRUPAL_PREVIEW_SECRET) {
@@ -11,9 +15,16 @@ export default function (request: NextApiRequest, response: NextApiResponse) {
     return response.status(401).json({ message: "Invalid slug." })
   }
 
+  const node = await getEntityByPath(slug as string)
+
+  if (!node) {
+    return response.status(404).json({ message: "Invalid slug" })
+  }
+
   response.setPreviewData({
     resourceVersion,
   })
 
-  response.redirect(slug as string)
+  response.writeHead(307, { Location: node.path.alias })
+  response.end()
 }