fix Sorts active key; referrer cookies workaround; structure for territory domains editing

Author: Soxasora

components/nav/index.js

@@ -7,12 +7,18 @@ import { PriceCarouselProvider } from './price-carousel'
 export default function Navigation ({ sub }) {
   const router = useRouter()
   const path = router.asPath.split('?')[0]
+  // TODO: this works but it can be better
+  const isCustomDomain = sub && !path.includes(`/~${sub}`)
   const props = {
     prefix: sub ? `/~${sub}` : '',
     path,
     pathname: router.pathname,
-    topNavKey: path.split('/')[sub ? 2 : 1] ?? '',
-    dropNavKey: path.split('/').slice(sub ? 2 : 1).join('/'),
+    topNavKey: isCustomDomain
+      ? path.split('/')[1] ?? ''
+      : path.split('/')[sub ? 2 : 1] ?? '',
+    dropNavKey: isCustomDomain
+      ? path.split('/').slice(1).join('/')
+      : path.split('/').slice(sub ? 2 : 1).join('/'),
     sub
   }
 

components/territory-domains.js

@@ -56,7 +56,7 @@ export default function CustomDomainForm ({ sub }) {
       <div className='d-flex align-items-center gap-2'>
         <Input
           label={
-            <div className='d-flex align-items-center'>
+            <div className='d-flex align-items-center gap-2'>
               <span>domain</span>
               {error && <Info variant='danger'>error</Info>}
               {success && <Info variant='success'>Domain settings updated successfully!</Info>}

components/territory-form.js

@@ -257,7 +257,7 @@ export default function TerritoryForm ({ sub }) {
                       </ol>
                     </Info>
                   </div>
-          }
+                }
                 name='moderated'
                 groupClassName='ms-1'
               />
@@ -273,10 +273,17 @@ export default function TerritoryForm ({ sub }) {
                       </ol>
                     </Info>
                   </div>
-          }
+                }
                 name='nsfw'
                 groupClassName='ms-1'
               />
+            </>
+          }
+        />
+        <AccordianItem
+          header={<div style={{ fontWeight: 'bold', fontSize: '92%' }}>personalization</div>}
+          body={
+            <>
               <TerritoryDomains sub={sub} />
               {sub?.customDomain?.verificationState === 'VERIFIED' &&
                 <>
@@ -286,8 +293,7 @@ export default function TerritoryForm ({ sub }) {
                   <div className='mb-3'>WIP</div>
                 </>}
             </>
-
-}
+          }
         />
         <div className='mt-3 d-flex justify-content-end'>
           <FeeButton

middleware.js

@@ -77,13 +77,24 @@ export async function customDomainMiddleware (request, referrerResp) {
       const authResp = customDomainAuthMiddleware(request, url)
       if (authResp && authResp.status !== 200) {
         // copy referrer cookies to auth redirect
-        for (const [key, value] of referrerResp.cookies.getAll()) {
-          authResp.cookies.set(key, value.value, value)
+        console.log('referrerResp', referrerResp)
+        for (const cookie of referrerResp.cookies.getAll()) {
+          authResp.cookies.set(
+            cookie.name,
+            cookie.value,
+            {
+              maxAge: cookie.maxAge,
+              expires: cookie.expires,
+              path: cookie.path
+            }
+          )
         }
         return authResp
       }
     }
 
+    // TODO: preserve referrer cookies in a DRY way
+
     const internalUrl = new URL(url)
 
     // rewrite to the territory path if we're at the root
@@ -98,9 +109,16 @@ export async function customDomainMiddleware (request, referrerResp) {
   // create redirect response but preserve referrer cookies
   const redirectResp = NextResponse.redirect(new URL(pathname, mainDomain))
 
-  // copy referrer cookies
-  for (const [key, value] of referrerResp.cookies.getAll()) {
-    redirectResp.cookies.set(key, value.value, value)
+  for (const cookie of referrerResp.cookies.getAll()) {
+    redirectResp.cookies.set(
+      cookie.name,
+      cookie.value,
+      {
+        maxAge: cookie.maxAge,
+        expires: cookie.expires,
+        path: cookie.path
+      }
+    )
   }
 
   return redirectResp
@@ -279,6 +297,8 @@ export async function middleware (request) {
     return applySecurityHeaders(customDomainResp)
   }
 
+  console.log('applying security headers')
+
   return applySecurityHeaders(referrerResp)
 }