Merge pull request #1294 from Sitecore/bug/multi-site-fails-with-pers…

…onalize-rewrite Ensure multisite response is persisted in rewrite middleware
Sitecore · Jan 17, 2023 · d70be9b · d70be9b
2 parents 909025a + f9137b3
commit d70be9b
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 4 deletions.
diff --git a/...ages/create-sitecore-jss/src/templates/nextjs-sxa/src/lib/middleware/plugins/redirects.ts b/...ages/create-sitecore-jss/src/templates/nextjs-sxa/src/lib/middleware/plugins/redirects.ts
@@ -32,8 +32,8 @@ class RedirectsPlugin implements MiddlewarePlugin {
    * @param req<NextRequest>
    * @returns Promise<NextResponse>
    */
-  async exec(req: NextRequest): Promise<NextResponse> {
-    return this.redirectsMiddleware.getHandler()(req);
+  async exec(req: NextRequest, res?:NextResponse): Promise<NextResponse> {
+    return this.redirectsMiddleware.getHandler()(req, res);
   }
 }
 

diff --git a/packages/sitecore-jss-nextjs/src/middleware/redirects-middleware.test.ts b/packages/sitecore-jss-nextjs/src/middleware/redirects-middleware.test.ts
@@ -352,6 +352,67 @@ describe('RedirectsMiddleware', () => {
         expect(finalRes.status).to.equal(res.status);
       });
 
+      it('should preserve site name from response data when provided, if no redirect type defined', async () => {
+        const res = NextResponse.next();
+        const site = 'learn2grow';
+        res.cookies.set('sc_site', site);
+        const req = createRequest({
+          nextUrl: {
+            pathname: '/not-found',
+            locale: 'en',
+            clone() {
+              return Object.assign({}, req.nextUrl);
+            },
+          },
+        });
+
+        const { middleware, fetchRedirects, getSite } = createMiddleware({
+          pattern: 'not-found',
+          target: 'http://localhost:3000/found',
+          redirectType: 'default',
+          isQueryStringPreserved: true,
+          locale: 'en',
+        });
+
+        const finalRes = await middleware.getHandler()(req, res);
+        // eslint-disable-next-line no-unused-expressions
+        expect(getSite).to.not.be.called;
+        // eslint-disable-next-line no-unused-expressions
+        expect(fetchRedirects.called).to.be.true;
+        expect(finalRes.cookies.get('sc_site')).to.equal(site);
+      });
+
+      it('should preserve site name from response data when provided, if handler is disabled', async () => {
+        const res = NextResponse.next();
+        const site = 'learn2grow';
+        res.cookies.set('sc_site', site);
+        const req = createRequest({
+          nextUrl: {
+            pathname: '/not-found',
+            locale: 'en',
+            clone() {
+              return Object.assign({}, req.nextUrl);
+            },
+          },
+        });
+
+        const { middleware, fetchRedirects, getSite } = createMiddleware({
+          pattern: 'not-found',
+          target: 'http://localhost:3000/found',
+          redirectType: 'default',
+          isQueryStringPreserved: true,
+          locale: 'en',
+          disabled: () => true,
+        });
+
+        const finalRes = await middleware.getHandler()(req, res);
+        // eslint-disable-next-line no-unused-expressions
+        expect(getSite).to.not.be.called;
+        // eslint-disable-next-line no-unused-expressions
+        expect(fetchRedirects.called).to.be.false;
+        expect(finalRes.cookies.get('sc_site')).to.equal(site);
+      });
+
       it('default fallback hostname is used', async () => {
         const res = NextResponse.redirect('http://localhost:3000/found', 301);
         const req = createRequest({

diff --git a/packages/sitecore-jss-nextjs/src/middleware/redirects-middleware.ts b/packages/sitecore-jss-nextjs/src/middleware/redirects-middleware.ts
@@ -95,13 +95,13 @@ export class RedirectsMiddleware {
         this.excludeRoute(req.nextUrl.pathname) ||
         (this.config.excludeRoute && this.config.excludeRoute(req.nextUrl.pathname))
       ) {
-        return NextResponse.next();
+        return res || NextResponse.next();
       }
       // Find the redirect from result of RedirectService
       const existsRedirect = await this.getExistsRedirect(req, siteName);
 
       if (!existsRedirect) {
-        return NextResponse.next();
+        return res || NextResponse.next();
       }
 
       const url = req.nextUrl.clone();