DIGG-512: Removing middlehand request for redirecting

diggsweden · Jan 7, 2025 · e050720 · e050720
1 parent a4d5942
commit e050720
Show file tree

Hide file tree

Showing 15 changed files with 86 additions and 190 deletions.
diff --git a/pages/api/entrystore-redirect.ts b/pages/api/entrystore-redirect.ts
diff --git a/pages/concepts/[concept]/[param].tsx b/pages/concepts/[concept]/[param].tsx
@@ -4,7 +4,7 @@ import { useContext, useEffect, useState } from "react";
 import { ConceptPage } from "@/features/entryscape/concept-page";
 import { EntrystoreProvider } from "@/providers/entrystore-provider";
 import { SettingsContext } from "@/providers/settings-provider";
-import { getEntryStoreProps } from "@/utilities/entrystore/get-entrystore-props";
+import { handleEntryStoreRedirect } from "@/utilities/entrystore/entrystore-redirect";
 
 export default function Concept() {
   const { env } = useContext(SettingsContext);
@@ -17,19 +17,18 @@ export default function Concept() {
       if (!concept || !param) return;
       const isSandbox = window.location.host.includes("sandbox");
 
-      const data = await getEntryStoreProps({
-        config: {
+      const data = await handleEntryStoreRedirect(
+        {
           pathPrefix: "/concepts",
           redirectPath: "/concepts",
           entrystorePathKey: "ENTRYSCAPE_TERMS_PATH",
           param: concept,
           secondParam: param as string,
         },
-        locale: router.locale || "sv",
-        isSandbox,
         router,
-        includeBasePath: false,
-      });
+        router.locale || "sv",
+        isSandbox,
+      );
 
       if (data?.resourceUri) {
         setResourceUri(data.resourceUri);

diff --git a/pages/concepts/[concept]/index.tsx b/pages/concepts/[concept]/index.tsx
@@ -4,7 +4,7 @@ import { useContext, useEffect, useState } from "react";
 import { ConceptPage } from "@/features/entryscape/concept-page";
 import { EntrystoreProvider } from "@/providers/entrystore-provider";
 import { SettingsContext } from "@/providers/settings-provider";
-import { getEntryStoreProps } from "@/utilities/entrystore/get-entrystore-props";
+import { handleEntryStoreRedirect } from "@/utilities/entrystore/entrystore-redirect";
 
 export default function Concept() {
   const { env } = useContext(SettingsContext);
@@ -18,18 +18,17 @@ export default function Concept() {
       if (!concept) return;
       const isSandbox = window.location.host.includes("sandbox");
 
-      const data = await getEntryStoreProps({
-        config: {
+      const data = await handleEntryStoreRedirect(
+        {
           pathPrefix: "/concepts",
           redirectPath: "/concepts",
           entrystorePathKey: "ENTRYSCAPE_TERMS_PATH",
           param: concept,
         },
-        locale: router.locale || "sv",
-        isSandbox,
         router,
-        includeBasePath: false,
-      });
+        router.locale || "sv",
+        isSandbox,
+      );
 
       if (data?.resourceUri) {
         setResourceUri(data.resourceUri);

diff --git a/pages/externalconcept/[...concept].tsx b/pages/externalconcept/[...concept].tsx
@@ -1,7 +1,7 @@
 import { useRouter } from "next/router";
 import { useEffect } from "react";
 
-import { getEntryStoreProps } from "@/utilities/entrystore/get-entrystore-props";
+import { handleEntryStoreRedirect } from "@/utilities/entrystore/entrystore-redirect";
 
 export default function Concept() {
   const router = useRouter();
@@ -12,18 +12,17 @@ export default function Concept() {
       if (!concept) return;
       const isSandbox = window.location.host.includes("sandbox");
 
-      await getEntryStoreProps({
-        config: {
+      await handleEntryStoreRedirect(
+        {
           pathPrefix: "/concepts",
           redirectPath: "/concepts",
           entrystorePathKey: "ENTRYSCAPE_TERMS_PATH",
           param: concept,
         },
-        locale: router.locale || "sv",
-        isSandbox,
         router,
-        includeBasePath: false,
-      });
+        router.locale || "sv",
+        isSandbox,
+      );
     };
 
     fetchEntryStoreProps();

diff --git a/pages/externalconcept/index.tsx b/pages/externalconcept/index.tsx
@@ -1,7 +1,7 @@
 import { useRouter } from "next/router";
 import { useEffect } from "react";
 
-import { getEntryStoreProps } from "@/utilities/entrystore/get-entrystore-props";
+import { handleEntryStoreRedirect } from "@/utilities/entrystore/entrystore-redirect";
 
 export default function Concept() {
   const router = useRouter();
@@ -12,18 +12,17 @@ export default function Concept() {
       if (!resource) return;
       const isSandbox = window.location.host.includes("sandbox");
 
-      await getEntryStoreProps({
-        config: {
+      await handleEntryStoreRedirect(
+        {
           pathPrefix: "/concepts",
           redirectPath: "/concepts",
           entrystorePathKey: "ENTRYSCAPE_TERMS_PATH",
         },
-        locale: router.locale || "sv",
-        isSandbox,
         router,
-        resourceUri: resource as string,
-        includeBasePath: false,
-      });
+        router.locale || "sv",
+        isSandbox,
+        resource as string,
+      );
     };
 
     fetchEntryStoreProps();

diff --git a/pages/externalspecification/[...specification].tsx b/pages/externalspecification/[...specification].tsx
@@ -1,7 +1,7 @@
 import { useRouter } from "next/router";
 import { useEffect } from "react";
 
-import { getEntryStoreProps } from "@/utilities/entrystore/get-entrystore-props";
+import { handleEntryStoreRedirect } from "@/utilities/entrystore/entrystore-redirect";
 
 export default function Specification() {
   const router = useRouter();
@@ -12,18 +12,17 @@ export default function Specification() {
       if (!specification) return;
       const isSandbox = window.location.host.includes("sandbox");
 
-      await getEntryStoreProps({
-        config: {
+      await handleEntryStoreRedirect(
+        {
           pathPrefix: "/concepts",
           redirectPath: "/concepts",
           entrystorePathKey: "ENTRYSCAPE_SPECS_PATH",
           param: specification,
         },
-        locale: router.locale || "sv",
-        isSandbox,
         router,
-        includeBasePath: false,
-      });
+        router.locale || "sv",
+        isSandbox,
+      );
     };
 
     fetchEntryStoreProps();

diff --git a/pages/externalspecification/index.tsx b/pages/externalspecification/index.tsx
@@ -1,7 +1,7 @@
 import { useRouter } from "next/router";
 import { useEffect } from "react";
 
-import { getEntryStoreProps } from "@/utilities/entrystore/get-entrystore-props";
+import { handleEntryStoreRedirect } from "@/utilities/entrystore/entrystore-redirect";
 
 export default function Specification() {
   const router = useRouter();
@@ -12,18 +12,17 @@ export default function Specification() {
       if (!resource) return;
       const isSandbox = window.location.host.includes("sandbox");
 
-      await getEntryStoreProps({
-        config: {
+      await handleEntryStoreRedirect(
+        {
           pathPrefix: "/specifications",
           redirectPath: "/specifications",
           entrystorePathKey: "ENTRYSCAPE_SPECS_PATH",
         },
-        locale: router.locale || "sv",
-        isSandbox,
         router,
-        resourceUri: resource as string,
-        includeBasePath: false,
-      });
+        router.locale || "sv",
+        isSandbox,
+        resource as string,
+      );
     };
 
     fetchEntryStoreProps();

diff --git a/pages/externalterminology/[...terminology].tsx b/pages/externalterminology/[...terminology].tsx
@@ -1,7 +1,7 @@
 import { useRouter } from "next/router";
 import { useEffect } from "react";
 
-import { getEntryStoreProps } from "@/utilities/entrystore/get-entrystore-props";
+import { handleEntryStoreRedirect } from "@/utilities/entrystore/entrystore-redirect";
 
 export default function Terminology() {
   const router = useRouter();
@@ -12,18 +12,17 @@ export default function Terminology() {
       if (!terminology) return;
       const isSandbox = window.location.host.includes("sandbox");
 
-      await getEntryStoreProps({
-        config: {
+      await handleEntryStoreRedirect(
+        {
           pathPrefix: "/concepts",
           redirectPath: "/terminology",
           entrystorePathKey: "ENTRYSCAPE_TERMS_PATH",
           param: terminology,
         },
-        locale: router.locale || "sv",
-        isSandbox,
         router,
-        includeBasePath: false,
-      });
+        router.locale || "sv",
+        isSandbox,
+      );
     };
 
     fetchEntryStoreProps();

diff --git a/pages/externalterminology/index.tsx b/pages/externalterminology/index.tsx
@@ -1,7 +1,7 @@
 import { useRouter } from "next/router";
 import { useEffect } from "react";
 
-import { getEntryStoreProps } from "@/utilities/entrystore/get-entrystore-props";
+import { handleEntryStoreRedirect } from "@/utilities/entrystore/entrystore-redirect";
 
 export default function Terminology() {
   const router = useRouter();
@@ -12,18 +12,17 @@ export default function Terminology() {
       if (!resource) return;
       const isSandbox = window.location.host.includes("sandbox");
 
-      await getEntryStoreProps({
-        config: {
+      await handleEntryStoreRedirect(
+        {
           pathPrefix: "/concepts",
           redirectPath: "/terminology",
           entrystorePathKey: "ENTRYSCAPE_TERMS_PATH",
         },
-        locale: router.locale || "sv",
-        isSandbox,
         router,
-        resourceUri: resource as string,
-        includeBasePath: false,
-      });
+        router.locale || "sv",
+        isSandbox,
+        resource as string,
+      );
     };
 
     fetchEntryStoreProps();

diff --git a/pages/specifications/[spec]/[param].tsx b/pages/specifications/[spec]/[param].tsx
@@ -4,7 +4,7 @@ import { useContext, useEffect, useState } from "react";
 import { SpecificationPage } from "@/features/entryscape/specification-page";
 import { EntrystoreProvider } from "@/providers/entrystore-provider";
 import { SettingsContext } from "@/providers/settings-provider";
-import { getEntryStoreProps } from "@/utilities/entrystore/get-entrystore-props";
+import { handleEntryStoreRedirect } from "@/utilities/entrystore/entrystore-redirect";
 
 export default function Specification() {
   const { env } = useContext(SettingsContext);
@@ -17,19 +17,18 @@ export default function Specification() {
       if (!spec || !param) return;
       const isSandbox = window.location.host.includes("sandbox");
 
-      const data = await getEntryStoreProps({
-        config: {
+      const data = await handleEntryStoreRedirect(
+        {
           pathPrefix: "/specifications",
           redirectPath: "/specifications",
           entrystorePathKey: "ENTRYSCAPE_SPECS_PATH",
           param: spec,
           secondParam: param as string,
         },
-        locale: router.locale || "sv",
-        isSandbox,
         router,
-        includeBasePath: false,
-      });
+        router.locale || "sv",
+        isSandbox,
+      );
 
       if (data?.resourceUri) {
         setResourceUri(data.resourceUri);

diff --git a/pages/specifications/[spec]/index.tsx b/pages/specifications/[spec]/index.tsx
@@ -4,7 +4,7 @@ import { useContext, useEffect, useState } from "react";
 import { SpecificationPage } from "@/features/entryscape/specification-page";
 import { EntrystoreProvider } from "@/providers/entrystore-provider";
 import { SettingsContext } from "@/providers/settings-provider";
-import { getEntryStoreProps } from "@/utilities/entrystore/get-entrystore-props";
+import { handleEntryStoreRedirect } from "@/utilities/entrystore/entrystore-redirect";
 
 export default function Specification() {
   const { env } = useContext(SettingsContext);
@@ -18,18 +18,17 @@ export default function Specification() {
       if (!spec) return;
       const isSandbox = window.location.host.includes("sandbox");
 
-      const data = await getEntryStoreProps({
-        config: {
+      const data = await handleEntryStoreRedirect(
+        {
           pathPrefix: "/specifications",
           redirectPath: "/specifications",
           entrystorePathKey: "ENTRYSCAPE_SPECS_PATH",
           param: spec,
         },
-        locale: router.locale || "sv",
-        isSandbox,
         router,
-        includeBasePath: false,
-      });
+        router.locale || "sv",
+        isSandbox,
+      );
 
       if (data?.resourceUri) {
         setResourceUri(data.resourceUri);

diff --git a/pages/terminology/[term]/[param].tsx b/pages/terminology/[term]/[param].tsx
@@ -4,7 +4,7 @@ import { useContext, useEffect, useState } from "react";
 import { ConceptPage } from "@/features/entryscape/concept-page";
 import { EntrystoreProvider } from "@/providers/entrystore-provider";
 import { SettingsContext } from "@/providers/settings-provider";
-import { getEntryStoreProps } from "@/utilities/entrystore/get-entrystore-props";
+import { handleEntryStoreRedirect } from "@/utilities/entrystore/entrystore-redirect";
 
 export default function Terminology() {
   const { env } = useContext(SettingsContext);
@@ -17,19 +17,18 @@ export default function Terminology() {
       if (!term || !param) return;
       const isSandbox = window.location.host.includes("sandbox");
 
-      const data = await getEntryStoreProps({
-        config: {
+      const data = await handleEntryStoreRedirect(
+        {
           pathPrefix: "/concepts",
           redirectPath: "/terminology",
           entrystorePathKey: "ENTRYSCAPE_TERMS_PATH",
           param: term,
           secondParam: param as string,
         },
-        locale: router.locale || "sv",
-        isSandbox,
         router,
-        includeBasePath: false,
-      });
+        router.locale || "sv",
+        isSandbox,
+      );
 
       if (data?.resourceUri) {
         setResourceUri(data.resourceUri);