@quintype/framework 7.18.10-webhook-data-temp.2 → 7.18.10

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [7.18.10](https://github.com/quintype/quintype-node-framework/compare/v7.18.9...v7.18.10) (2023-04-05)
+
 ### [7.18.9](https://github.com/quintype/quintype-node-framework/compare/v7.18.1...v7.18.9) (2023-03-14)
 
 ### [7.18.8](https://github.com/quintype/quintype-node-framework/compare/v7.18.7...v7.18.8) (2023-02-24)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "7.18.10-webhook-data-temp.2",
+  "version": "7.18.10",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "engines": {

package/server/handlers/isomorphic-handler.js

@@ -15,6 +15,7 @@ const { customUrlToCacheKey } = require("../caching");
 const { addLightPageHeaders } = require("../impl/light-page-impl");
 const { getOneSignalScript } = require("./onesignal-script");
 const { getRedirectUrl } = require("../redirect-url-helper");
+const { Story } = require("../impl/api-client-impl");
 
 const ABORT_HANDLER = "__ABORT__";
 function abortHandler() {
@@ -37,6 +38,7 @@ function loadDataForIsomorphicRoute(
   async function loadDataForEachRoute() {
     const redirectToLowercaseSlugsValue =
       typeof redirectToLowercaseSlugs === "function" ? redirectToLowercaseSlugs(config) : redirectToLowercaseSlugs;
+
     for (const match of matchAllRoutes(url.pathname, routes)) {
       const params = Object.assign({}, url.query, otherParams, match.params);
       /* On story pages, if the slug contains any capital letters (latin), we want to
@@ -56,6 +58,7 @@ function loadDataForIsomorphicRoute(
           },
         };
       }
+
       const result = await loadData(match.pageType, params, config, client, {
         host,
         next: abortHandler,
@@ -68,6 +71,18 @@ function loadDataForIsomorphicRoute(
 
       if (result && result.data && result.data[ABORT_HANDLER]) continue;
 
+      // Multiple url redirection
+      const story = result.data.story;
+      if (story && story.redirect && `/${story.slug}` !== url.path) {
+        console.log("Inside Redirect IF", url.path);
+        return {
+          httpStatusCode: 301,
+          data: {
+            location: `/${story.slug}`,
+          },
+        };
+      }
+
       return result;
     }
   }
@@ -291,8 +306,18 @@ exports.handleIsomorphicDataLoad = function handleIsomorphicDataLoad(
   }
 
   function returnJson(result) {
+    const statusCode = result.httpStatusCode || 200;
+    if (statusCode == 301 && result.data && result.data.location) {
+      addCacheHeadersToResult({
+        res: res,
+        cacheKeys: [customUrlToCacheKey(config["publisher-id"], "redirect")],
+        cdnProvider: cdnProvider,
+        config: config,
+        sMaxAge,
+      });
+      return res.redirect(301, result.data.location);
+    }
     return new Promise(() => {
-      const statusCode = result.httpStatusCode || 200;
       res.status(statusCode < 500 ? 200 : 500);
       res.setHeader("Content-Type", "application/json");
       addCacheHeadersToResult({

package/server/handlers/webengage-notifications.js

@@ -1,6 +1,5 @@
 const get = require("lodash/get");
 const request = require("request-promise");
-const fs = require("fs");
 
 exports.triggerWebengageNotifications = async function triggerWebengageNotifications(
   req,
@@ -10,7 +9,6 @@ exports.triggerWebengageNotifications = async function triggerWebengageNotificat
 ) {
   const eventName = get(req, ["body", "v1", "event", "name"], "");
   const url = `https://api.webengage.com/v2/accounts/${licenseCode}/business/save-event`;
-  console.log("bold-webhook-schema inside framework is --->", req.body);
 
   try {
     await request({

package/test/integration/isomorphic-data-load-test.js

@@ -98,9 +98,7 @@ describe("Isomorphic Data Load", function () {
   });
 
   it("returns an appVersion on every response", function (done) {
-    const app = createApp((pageType, params, config, client) =>
-      Promise.resolve({})
-    );
+    const app = createApp((pageType, params, config, client) => Promise.resolve({ data: { pageType } }));
 
     supertest(app)
       .get("/route-data.json?path=%2F")

package/test/integration/isomorphic-handler-test.js

@@ -13,6 +13,10 @@ function getClientStub(hostname) {
         foo: "bar",
         "sketches-host": "https://www.foo.com",
       }),
+    getStoryBySlug: (slug) =>
+      Promise.resolve({
+        story: { slug: slug, id: "123", redirect: slug === "foo-bar" ? true : false },
+      }),
     baseUrl: "https://www.foo.com",
   };
 }
@@ -51,6 +55,18 @@ function createApp(loadData, routes, opts = {}, app = express()) {
 }
 
 describe("Isomorphic Handler", function () {
+  it("when the story headline is changed, it redirects story to updated story url", (done) => {
+    const app = createApp(
+      (pageType, params, config, client, { host }) =>
+        Promise.resolve({
+          pageType,
+          data: { text: "foobar", host, location: "/foobar", story: { redirect: true, slug: "foo-bar" } },
+        }),
+      [{ pageType: "story-page", path: "/foobar", params: { storySlug: "foo-bar" } }]
+    );
+    supertest(app).get("/foobar").expect("Location", "/foo-bar").expect(301, done);
+  });
+
   it("Renders the page if the route matches", function (done) {
     const app = createApp(
       (pageType, params, config, client, { host }) =>