🔖 Release 2.26.3 (#1203)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Clément <clem.auger@hotmail.fr>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Clément <55186402+Clemog@users.noreply.github.com>
Co-authored-by: Paul Souche <paul@bettercallpaul.fr>
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Co-authored-by: Benjamin Arias <12382534+bjlaa@users.noreply.github.com>
Co-authored-by: Bot Incubateur Ademe <153178900+incubateur-ademe-admin@users.noreply.github.com>

Author: 6 people

cypress/e2e/integration/features/i18n-middleware.cy.js

@@ -13,40 +13,42 @@ describe('i18nMiddleware - E2E Tests', () => {
       cy.visit('/fr/simulateur/bilan?lang=en')
 
       // Verify that URL has been redirected
-      cy.url().should('include', '/en/simulateur/bilan')
+      cy.url().should('include', '/en/tutoriel')
       cy.url().should('not.include', 'lang=en')
     })
 
     it('should clean URL if locale is already correct', () => {
-      cy.visit('/en/simulateur/bilan?lang=en')
+      cy.visit('/en/fin?lang=en')
 
       // Verify that lang parameter has been removed
       cy.url().should('not.include', 'lang=en')
-      cy.url().should('include', '/en/simulateur/bilan')
+      cy.url().should('include', '/en/fin')
     })
   })
 
   describe('Iframe handling', () => {
     it('should work with iframe parameter', () => {
-      cy.visit('/fr/simulateur/bilan?iframe=true')
+      cy.visit('/fr/fin?iframe=true')
 
       // Verify that page loads without 404 error
       cy.get('body').should('exist')
       cy.url().should('include', 'iframe=true')
     })
 
-    it('should handle iframes with lang parameter', () => {
-      cy.visit('/fr/simulateur/bilan?iframe=true&lang=en')
+    it('should redirect to locale-prefixed URL when using iframe and lang parameters', () => {
+      cy.visit('/simulateur/bilan?iframe=true&lang=en')
 
-      // Verify that page loads
+      // Verify that the URL has been redirected correctly
+      cy.url().should('include', '/en/tutoriel')
+      cy.url().should('not.include', 'lang=en')
+
+      // Also check that the page has loaded correctly
       cy.get('body').should('exist')
-      // Iframe parameter should prevent redirection
-      cy.url().should('include', 'iframe=true')
     })
 
     it('should detect iframes via referer', () => {
       // Simulate request with referer containing iframe=true
-      cy.visit('/fr/simulateur/bilan', {
+      cy.visit('/fr/fin', {
         headers: {
           referer: 'https://example.com/page?iframe=true',
         },
@@ -58,31 +60,31 @@ describe('i18nMiddleware - E2E Tests', () => {
 
   describe('URL construction with locale', () => {
     it('should add locale if it does not exist in path', () => {
-      cy.visit('/simulateur/bilan?lang=en')
+      cy.visit('/fin?lang=en')
 
-      cy.url().should('include', '/en/simulateur/bilan')
+      cy.url().should('include', '/en/fin')
       cy.url().should('not.include', 'lang=en')
     })
 
     it('should replace existing locale', () => {
-      cy.visit('/fr/simulateur/bilan?lang=en')
+      cy.visit('/fr/fin?lang=en')
 
-      cy.url().should('include', '/en/simulateur/bilan')
+      cy.url().should('include', '/en/fin')
       cy.url().should('not.include', '/fr/')
       cy.url().should('not.include', 'lang=en')
     })
   })
 
   describe('Cookie handling', () => {
     it('should set locale cookie', () => {
-      cy.visit('/fr/simulateur/bilan?lang=en')
+      cy.visit('/fr/fin?lang=en')
 
       // Verify that cookie has been set
       cy.getCookie('NEXT_LOCALE').should('have.property', 'value', 'en')
     })
 
     it('should preserve cookie during navigation', () => {
-      cy.visit('/fr/simulateur/bilan?lang=en')
+      cy.visit('/fr/fin?lang=en')
 
       // Navigate to another page
       cy.visit('/en/actions')
@@ -101,9 +103,9 @@ describe('i18nMiddleware - E2E Tests', () => {
     })
 
     it('should handle multiple parameters', () => {
-      cy.visit('/fr/simulateur/bilan?lang=en&other=param')
+      cy.visit('/fr/fin?lang=en&other=param')
 
-      cy.url().should('include', '/en/simulateur/bilan')
+      cy.url().should('include', '/en/fin')
       cy.url().should('include', 'other=param')
       cy.url().should('not.include', 'lang=en')
     })

package.json

@@ -1,7 +1,7 @@
 {
   "name": "nosgestesclimat-site-nextjs",
   "license": "MIT",
-  "version": "2.26.2",
+  "version": "2.26.3",
   "description": "The leading open source climate footprint calculator",
   "repository": {
     "type": "git",

src/middlewares/__tests__/i18nMiddleware.test.ts

@@ -57,7 +57,7 @@ describe('i18nMiddleware', () => {
       expect(cookie?.value).toBe('en')
     })
 
-    it('should use lang parameter for iframes', async () => {
+    it('should redirect to locale-prefixed URL for iframes with lang parameter', async () => {
       const request = createMockRequest(
         '/simulateur/bilan',
         { iframe: 'true', lang: 'en' },
@@ -66,7 +66,15 @@ describe('i18nMiddleware', () => {
 
       const response = await i18nMiddleware(request)
 
-      expect(response).toBeInstanceOf(NextResponse)
+      // It should redirect
+      expect(response.status).toBe(307)
+      const location = response.headers.get('location')
+      // The new URL should be prefixed with the locale, and keep the iframe param
+      expect(location).toContain('/en/simulateur/bilan')
+      expect(location).toContain('iframe=true')
+      // The lang param should be removed
+      expect(location).not.toContain('lang=en')
+      // The cookie should be set
       expect(response.cookies.get('NEXT_LOCALE')?.value).toBe('en')
     })
 

src/middlewares/i18nMiddleware.ts

@@ -39,7 +39,29 @@ function setLocaleCookie(response: NextResponse, locale: string): void {
 
 function i18nMiddleware(request: NextRequest) {
   const langParam = request.nextUrl.searchParams.get('lang')
-  const { locales, defaultLocale } = i18nConfig
+  const { locales } = i18nConfig
+
+  if (
+    request.nextUrl.searchParams.get('iframe') &&
+    langParam &&
+    locales.includes(langParam)
+  ) {
+    const newPath = buildUrlWithLocale(
+      request.nextUrl.pathname,
+      langParam,
+      locales
+    )
+    const url = new URL(request.url)
+    url.pathname = newPath
+    url.searchParams.delete('lang')
+
+    const redirectResponse = NextResponse.redirect(url, 307)
+    setLocaleCookie(redirectResponse, langParam)
+
+    return redirectResponse
+  }
+
+  const { defaultLocale } = i18nConfig
 
   // Check if this is an iframe request (either via iframe param or referer)
   const isIframeRequest =
@@ -105,7 +127,7 @@ function i18nMiddleware(request: NextRequest) {
     }
 
     // Clean URL if locale is already correct (non-default locales)
-    if (request.nextUrl.searchParams.has('lang')) {
+    if (request.nextUrl.searchParams.has('lang') && !isIframeRequest) {
       const url = new URL(request.url)
       url.searchParams.delete('lang')