Merge branch 'main' into feature/III-6325

.github/CODEOWNERS

@@ -1,7 +1,7 @@
 # CODEOWNERS are automatically assigned as possible reviewers to new PRs.
 
 # Global owners (also need to be duplicated in later rules)
-* @simon-debruijn @brampauwelyn @Anahkiasen
+* @simon-debruijn @brampauwelyn @Anahkiasen @vhande
 
 # Jenkins / deployment owners
 Gemfile* @willaerk @paulherbosch

src/layouts/index.js

@@ -67,20 +67,27 @@ const Layout = ({ children }) => {
   useChangeLanguage();
   useHandleWindowMessage({
     [WindowMessageTypes.URL_CHANGED]: ({ path }) => {
-      const currentPath = window.location.pathname;
-      const url = new URL(
+      const currentUrl = new URL(window.location.href);
+      const nextUrl = new URL(
         `${window.location.protocol}//${window.location.host}${path}`,
       );
-      const query = Object.fromEntries(url.searchParams.entries());
-      const hasPage = url.searchParams.has('page');
+
+      const areUrlsDeepEqual =
+        currentUrl.pathname === nextUrl.pathname &&
+        [...nextUrl.searchParams.entries()]
+          .filter(([key]) => key !== 'jwt' && key !== 'lang')
+          .every(([key, val]) => currentUrl.searchParams.get(key) === val);
+
+      if (areUrlsDeepEqual) {
+        return;
+      }
+
+      const hasPage = nextUrl.searchParams.has('page');
+
       if (hasPage) {
-        window.history.pushState(
-          undefined,
-          '',
-          `${window.location.protocol}//${window.location.host}${path}`,
-        );
+        window.history.pushState(undefined, '', nextUrl.toString());
       } else {
-        router.push({ pathname: url.pathname, query });
+        router.push(`${nextUrl.pathname}${nextUrl.search}`);
       }
     },
     [WindowMessageTypes.HTTP_ERROR_CODE]: ({ code }) => {

src/middleware.api.ts

@@ -45,14 +45,51 @@ export const middleware = async (request: NextRequest) => {
     return NextResponse.redirect(url);
   }
 
-  const isOwnershipPage = request.nextUrl.pathname.endsWith('ownerships');
+  const isOwnershipPage =
+    (request.nextUrl.pathname.startsWith('/organizer') &&
+      !request.nextUrl.pathname.endsWith('/ownerships')) ||
+    request.nextUrl.pathname.startsWith('/search');
 
-  if (isOwnershipPage && !process.env.NEXT_PUBLIC_OWNERSHIP_ENABLED) {
-    const url = new URL('/404', request.url);
-    return NextResponse.redirect(url);
+  if (isOwnershipPage) {
+    const isOwnershipEnabled =
+      process.env.NEXT_PUBLIC_OWNERSHIP_ENABLED === 'true';
+
+    const redirectUrl = new URL(request.nextUrl);
+    // remove the path variables from nextjs routing
+    redirectUrl.searchParams.delete('params');
+
+    if (
+      isOwnershipEnabled &&
+      redirectUrl.searchParams.get('ownership') === 'true'
+    ) {
+      return NextResponse.next();
+    }
+
+    if (
+      isOwnershipEnabled &&
+      redirectUrl.searchParams.get('ownership') !== 'true'
+    ) {
+      redirectUrl.searchParams.set('ownership', 'true');
+      return NextResponse.redirect(redirectUrl);
+    }
+
+    if (!isOwnershipEnabled && redirectUrl.searchParams.has('ownership')) {
+      redirectUrl.searchParams.delete('ownership');
+      return NextResponse.redirect(redirectUrl);
+    }
+
+    return NextResponse.next();
   }
 };
 
 export const config = {
-  matcher: ['/event', '/login', '/organizers/:id/ownerships'],
+  matcher: [
+    '/event',
+    '/login',
+    '/organizers/:id/ownerships',
+    '/organizer/(.*)',
+    '/(.*)/ownerships',
+    '/search(.*)',
+    '/[...params]',
+  ],
 };

src/pages/[...params].page.js

@@ -33,7 +33,7 @@ const Fallback = () => {
   const router = useRouter();
   const { asPath } = router;
 
-  const legacyPath = useLegacyPath();
+  const { publicRuntimeConfig } = getConfig();
 
   // Keep track of which paths were not found. Do not store as a single boolean
   // for the current path, because it's possible to navigate from a 404 path to
@@ -42,12 +42,37 @@ const Fallback = () => {
   const [notFoundPaths, setNotFoundPaths] = useState(['/404']);
   useHandleWindowMessage({
     [WindowMessageTypes.URL_UNKNOWN]: () =>
-      setNotFoundPaths([asPath, ...notFoundPaths]),
+      setNotFoundPaths([router.asPath, ...notFoundPaths]),
   });
 
   const isClientSide = useIsClient();
 
-  if (notFoundPaths.includes(asPath)) {
+  const { cookies } = useCookiesWithOptions(['token', 'udb-language']);
+  const token = cookies['token'];
+  const language = cookies['udb-language'];
+
+  const legacyPath = useMemo(() => {
+    const path = new URL(`http://localhost${router.asPath}`).pathname;
+    const { params = [], ...queryWithoutParams } = router.query;
+    const queryString = prefixWhenNotEmpty(
+      new URLSearchParams({
+        ...queryWithoutParams,
+        jwt: token,
+        lang: language,
+      }),
+      '?',
+    );
+
+    return `${publicRuntimeConfig.legacyAppUrl}${path}${queryString}`;
+  }, [
+    language,
+    publicRuntimeConfig.legacyAppUrl,
+    router.asPath,
+    router.query,
+    token,
+  ]);
+
+  if (notFoundPaths.includes(router.asPath)) {
     return <PageNotFound />;
   }