Merge branch 'master' into fix/data-export

Author: gary-van-woerkens

CHANGELOG.md

@@ -1,3 +1,16 @@
+# [3.16.0](https://github.com/SocialGouv/egapro/compare/v3.15.3...v3.16.0) (2026-03-09)
+
+
+### Bug Fixes
+
+* publication year data ([#2890](https://github.com/SocialGouv/egapro/issues/2890)) ([9af0d37](https://github.com/SocialGouv/egapro/commit/9af0d37f367bbd3884aa7a14c4d430eedae03a5e))
+* session error ([#2911](https://github.com/SocialGouv/egapro/issues/2911)) ([b6b4976](https://github.com/SocialGouv/egapro/commit/b6b497660ed023f68e615dfadd5bfd94ec7c3ff2))
+
+
+### Features
+
+* public year 2025 ([#2951](https://github.com/SocialGouv/egapro/issues/2951)) ([3926ae0](https://github.com/SocialGouv/egapro/commit/3926ae0dce6c4fdb8f367e12cc72b563123b750f))
+
 ## [3.15.3](https://github.com/SocialGouv/egapro/compare/v3.15.2...v3.15.3) (2026-03-02)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "~egapro-dev",
-  "version": "3.15.3",
+  "version": "3.16.0",
   "private": true,
   "engines": {
     "node": "20"

packages/api/egapro/constants.py

@@ -13,9 +13,9 @@
 
 # Always let the comment for us to switch between enabled read current year or not
 # PUBLIC_YEARS = YEARS
-PUBLIC_YEARS = [2018, 2019, 2020, 2021, 2022, 2023, 2024]
+PUBLIC_YEARS = [2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025]
 # PUBLIC_YEARS_REPEQ = YEARS_REPEQ
-PUBLIC_YEARS_REPEQ = [2021, 2022, 2023, 2024]
+PUBLIC_YEARS_REPEQ = [2021, 2022, 2023, 2024, 2025]
 
 REGIONS = {
     "01": "Guadeloupe",

packages/app/src/api/core-domain/infra/auth/config.ts

@@ -295,6 +295,7 @@ export const authConfig: AuthOptions = {
     async session({ session, token }) {
       session.user = JSON.parse(JSON.stringify(token.user)); // very important ! to avoid token mutation. Else the companies are added to the token and the headers will too big & rejected by nginx
       session.user.email = token.email;
+      session.user.companies = []; // Default to empty array to prevent TypeError if Redis load fails
       session.staff = {};
 
       // Load companies from Redis using the hash if it exists
@@ -314,7 +315,7 @@ export const authConfig: AuthOptions = {
         }
       }
 
-      if (token.user.staff || token.staff.impersonating) {
+      if (token.user.staff || token.staff?.impersonating) {
         session.staff = token.staff;
 
         // Load last impersonated companies if hash exists

packages/app/src/app/(default)/index-egapro/declaration/commencer/page.tsx

@@ -3,6 +3,7 @@ import { fr } from "@codegouvfr/react-dsfr";
 import Alert from "@codegouvfr/react-dsfr/Alert";
 import { config } from "@common/config";
 import Link from "next/link";
+import { redirect } from "next/navigation";
 import { getServerSession } from "next-auth";
 
 import { type FunnelKey, funnelStaticConfig } from "../declarationFunnelConfiguration";
@@ -24,7 +25,7 @@ const proconnectManageOrganisationsUrl = config.proconnect.manageOrganisationUrl
 
 const CommencerPage = async () => {
   const session = await getServerSession(authConfig);
-  if (!session) return null;
+  if (!session) redirect("/login");
   const isEmailLogin = config.api.security.auth.isEmailLogin;
 
   if (!session.user.companies.length && !session.user.staff) {

packages/app/src/app/(default)/index-egapro/declaration/declarant/page.tsx

@@ -3,6 +3,7 @@ import { fr } from "@codegouvfr/react-dsfr";
 import Alert from "@codegouvfr/react-dsfr/Alert";
 // import { config } from "@common/config";
 import Link from "next/link";
+import { redirect } from "next/navigation";
 import { getServerSession } from "next-auth";
 
 import { AlertExistingDeclaration } from "../AlertExistingDeclaration";
@@ -16,7 +17,7 @@ const proconnectPersonalInformationUrl = process.env.EGAPRO_PROCONNECT_PERSONAL_
 
 const DeclarantPage = async () => {
   const session = await getServerSession(authConfig);
-  if (!session) return null;
+  if (!session) redirect("/login");
 
   return (
     <>

packages/app/src/app/(default)/representation-equilibree/(funnel)/commencer/page.tsx

@@ -3,6 +3,7 @@ import { fr } from "@codegouvfr/react-dsfr";
 import Alert from "@codegouvfr/react-dsfr/Alert";
 import { config } from "@common/config";
 import Link from "next/link";
+import { redirect } from "next/navigation";
 import { getServerSession } from "next-auth";
 
 import { TITLES } from "../titles";
@@ -21,7 +22,7 @@ const proconnectManageOrganisationsUrl = config.proconnect.manageOrganisationUrl
 
 const CommencerPage = async () => {
   const session = await getServerSession(authConfig);
-  if (!session) return null;
+  if (!session) redirect("/login");
   const isEmailLogin = config.api.security.auth.isEmailLogin;
 
   if (!(session.user.staff || session.user.companies.length)) {

packages/app/src/app/(default)/representation-equilibree/(funnel)/declarant/page.tsx

@@ -2,6 +2,7 @@ import { authConfig } from "@api/core-domain/infra/auth/config";
 import { fr } from "@codegouvfr/react-dsfr";
 import Alert from "@codegouvfr/react-dsfr/Alert";
 import { Link } from "@design-system";
+import { redirect } from "next/navigation";
 import { getServerSession } from "next-auth";
 
 import { TITLES } from "../titles";
@@ -20,7 +21,7 @@ const proconnectPersonalInformationUrl = process.env.EGAPRO_PROCONNECT_PERSONAL_
 
 const DeclarantPage = async () => {
   const session = await getServerSession(authConfig);
-  if (!session) return null;
+  if (!session) redirect("/login");
 
   return (
     <>

packages/app/src/common/dict.ts

@@ -22,7 +22,7 @@ export const OPMC_OPEN_DURATION_AFTER_EDIT = 2;
 /** Need to be set manually because declaration are not opened on Jan 1rst */
 export const CURRENT_YEAR = 2025 as const;
 /** Need to be set */
-export const PUBLIC_CURRENT_YEAR = 2024;
+export const PUBLIC_CURRENT_YEAR = 2025;
 export const ALL_YEARS = times(CURRENT_YEAR - FIRST_YEAR + 1, idx => FIRST_YEAR + idx);
 export const YEARS = times(CURRENT_YEAR - FIRST_DECLARATION_YEAR + 1, idx => FIRST_DECLARATION_YEAR + idx);
 export const ADMIN_YEARS = times(CURRENT_YEAR - FIRST_YEAR + 1, idx => FIRST_YEAR + idx);