Adjust changes

Sitecore · Jan 10, 2023 · a63730c · a63730c
1 parent a80557b
commit a63730c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/packages/sitecore-jss-nextjs/src/middleware/multisite-middleware.test.ts b/packages/sitecore-jss-nextjs/src/middleware/multisite-middleware.test.ts
@@ -334,10 +334,11 @@ describe('MultisiteMiddleware', () => {
       validateDebugLog('multisite middleware end: %o', {
         rewritePath: '/_site_qsFoo/styleguide',
         siteName: 'qsFoo',
-        headers: {},
+        headers: {
+          'x-sc-rewrite': '/_site_qsFoo/styleguide',
+        },
         cookies: {
           ...res.cookies,
-          sc_path: '/_site_qsFoo/styleguide',
           sc_site: 'qsFoo',
         },
       });

diff --git a/packages/sitecore-jss-nextjs/src/middleware/multisite-middleware.ts b/packages/sitecore-jss-nextjs/src/middleware/multisite-middleware.ts
@@ -94,12 +94,8 @@ export class MultisiteMiddleware {
       return response;
     }
 
-    // Site name is forced by query string parameter
-    let siteName = req.nextUrl.searchParams.get('sc_site');
-
-    if (!siteName) {
-      siteName = this.config.getSite(hostname).name;
-    }
+    // Site name can be forced by query string parameter
+    const siteName = req.nextUrl.searchParams.get('sc_site') || this.config.getSite(hostname).name;
 
     // Rewrite to site specific path
     const rewritePath = getSiteRewrite(pathname, {