Merge pull request #34 from Jujulego/chore/pass-precomputed-flags-as-…

…queryparams Pass feature flag code by search params
Jujulego · Jul 17, 2024 · 06cb1b3 · 06cb1b3
2 parents 9a7e9da + 41d41ff
commit 06cb1b3
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 22 deletions.
diff --git a/app/[code]/layout.tsx b/app/[code]/layout.tsx
diff --git a/app/[code]/locate/[ip]/page.tsx → app/locate/[ip]/page.tsx b/app/[code]/locate/[ip]/page.tsx → app/locate/[ip]/page.tsx
@@ -20,24 +20,26 @@ import IpQualityCard from '@/src/ip-quality/IpQualityCard';
 // Page
 export interface LocateIpPageProps {
   readonly params: {
-    readonly code: string;
     readonly ip: string;
+  },
+  readonly searchParams: {
+    readonly code: string;
   }
 }
 
-export default async function LocateIpPage({ params }: LocateIpPageProps) {
+export default async function LocateIpPage({ params, searchParams }: LocateIpPageProps) {
   const ip = decodeURIComponent(params.ip);
 
   if (!ipaddr.isValid(ip)) {
     notFound();
   }
 
   const flags = {
-    showBigDataCloud: await showBigDataCloud(params.code, precomputeFlags),
-    showIpData: await showIpData(params.code, precomputeFlags),
-    showIpGeolocation: await showIpGeolocation(params.code, precomputeFlags),
-    showIpInfo: await showIpInfo(params.code, precomputeFlags),
-    showIpQuality: await showIpQuality(params.code, precomputeFlags),
+    showBigDataCloud: await showBigDataCloud(searchParams.code, precomputeFlags),
+    showIpData: await showIpData(searchParams.code, precomputeFlags),
+    showIpGeolocation: await showIpGeolocation(searchParams.code, precomputeFlags),
+    showIpInfo: await showIpInfo(searchParams.code, precomputeFlags),
+    showIpQuality: await showIpQuality(searchParams.code, precomputeFlags),
   };
 
   return (

diff --git a/app/[code]/locate/layout.tsx → app/locate/layout.tsx b/app/[code]/locate/layout.tsx → app/locate/layout.tsx
diff --git a/app/[code]/locate/loading.tsx → app/locate/loading.tsx b/app/[code]/locate/loading.tsx → app/locate/loading.tsx
diff --git a/app/[code]/page.tsx → app/page.tsx b/app/[code]/page.tsx → app/page.tsx
diff --git a/middleware.ts b/middleware.ts
@@ -25,7 +25,9 @@ export default withMiddlewareAuthRequired(async (request) => {
 
   // Precompute flags
   const code = await precompute(precomputeFlags);
-  const nextUrl = new URL(`/${code}${request.nextUrl.pathname}${request.nextUrl.search}`, request.url);
+
+  const nextUrl = new URL(request.url);
+  nextUrl.searchParams.set('code', code);
 
   return NextResponse.rewrite(nextUrl, response);
 });