diff --git a/app/api/auth/agent-connect/callback.ts b/app/api/auth/agent-connect/callback/route.ts
similarity index 100%
rename from app/api/auth/agent-connect/callback.ts
rename to app/api/auth/agent-connect/callback/route.ts
diff --git a/app/api/auth/agent-connect/login.ts b/app/api/auth/agent-connect/login/route.ts
similarity index 92%
rename from app/api/auth/agent-connect/login.ts
rename to app/api/auth/agent-connect/login/route.ts
index f401ca4d3..fafd9b1cd 100644
--- a/app/api/auth/agent-connect/login.ts
+++ b/app/api/auth/agent-connect/login/route.ts
@@ -3,7 +3,7 @@ import { logFatalErrorInSentry } from '#utils/sentry';
 import { setPathFrom } from '#utils/session';
 import withSession from '#utils/session/with-session';
 import { NextResponse } from 'next/server';
-import { AgentConnectionFailedException } from './callback';
+import { AgentConnectionFailedException } from '../callback/route';
 
 export const GET = withSession(async function loginRoute(req) {
   try {
diff --git a/app/api/auth/agent-connect/logout-callback.ts b/app/api/auth/agent-connect/logout-callback/route.ts
similarity index 92%
rename from app/api/auth/agent-connect/logout-callback.ts
rename to app/api/auth/agent-connect/logout-callback/route.ts
index bc726affa..0be6329af 100644
--- a/app/api/auth/agent-connect/logout-callback.ts
+++ b/app/api/auth/agent-connect/logout-callback/route.ts
@@ -2,7 +2,7 @@ import logErrorInSentry from '#utils/sentry';
 import { cleanAgentSession, cleanPathFrom, getPathFrom } from '#utils/session';
 import withSession from '#utils/session/with-session';
 import { NextResponse } from 'next/server';
-import { LogoutFailedException } from './logout';
+import { LogoutFailedException } from '../logout/route';
 
 export const GET = withSession(async function logoutCallbackRoute(req) {
   try {
diff --git a/app/api/auth/agent-connect/logout.ts b/app/api/auth/agent-connect/logout/route.ts
similarity index 100%
rename from app/api/auth/agent-connect/logout.ts
rename to app/api/auth/agent-connect/logout/route.ts
diff --git a/app/api/auth/france-connect/callback.ts b/app/api/auth/france-connect/callback/route.ts
similarity index 100%
rename from app/api/auth/france-connect/callback.ts
rename to app/api/auth/france-connect/callback/route.ts
diff --git a/app/api/auth/france-connect/login.ts b/app/api/auth/france-connect/login/route.ts
similarity index 89%
rename from app/api/auth/france-connect/login.ts
rename to app/api/auth/france-connect/login/route.ts
index 50fe23db3..8efb73895 100644
--- a/app/api/auth/france-connect/login.ts
+++ b/app/api/auth/france-connect/login/route.ts
@@ -2,7 +2,7 @@ import { FranceConnectAuthorizeUrl } from '#clients/authentication/france-connec
 import { logFatalErrorInSentry } from '#utils/sentry';
 import withSession from '#utils/session/with-session';
 import { NextResponse } from 'next/server';
-import { FranceConnectFailedException } from './callback';
+import { FranceConnectFailedException } from '../callback/route';
 
 export const GET = withSession(async function loginRoute(req) {
   try {
diff --git a/app/api/auth/france-connect/logout-callback.ts b/app/api/auth/france-connect/logout-callback/route.ts
similarity index 92%
rename from app/api/auth/france-connect/logout-callback.ts
rename to app/api/auth/france-connect/logout-callback/route.ts
index 7a6e6a8e0..ef651cbdc 100644
--- a/app/api/auth/france-connect/logout-callback.ts
+++ b/app/api/auth/france-connect/logout-callback/route.ts
@@ -2,7 +2,7 @@ import logErrorInSentry from '#utils/sentry';
 import { getPathFrom } from '#utils/session';
 import withSession from '#utils/session/with-session';
 import { NextResponse } from 'next/server';
-import { LogoutFailedException } from './logout';
+import { LogoutFailedException } from '../logout/route';
 
 export const GET = withSession(async function logoutCallbackRoute(req) {
   try {
diff --git a/app/api/auth/france-connect/logout.ts b/app/api/auth/france-connect/logout/route.ts
similarity index 100%
rename from app/api/auth/france-connect/logout.ts
rename to app/api/auth/france-connect/logout/route.ts
diff --git a/app/api/download/espace-agent/documents/[slug].ts b/app/api/download/espace-agent/documents/[slug]/route.ts
similarity index 100%
rename from app/api/download/espace-agent/documents/[slug].ts
rename to app/api/download/espace-agent/documents/[slug]/route.ts
diff --git a/utils/session/with-session.ts b/utils/session/with-session.ts
index 9ea16eb63..d7f864a8e 100644
--- a/utils/session/with-session.ts
+++ b/utils/session/with-session.ts
@@ -1,5 +1,6 @@
 import { ISession } from '#models/user/session';
 import { IronSession, getIronSession } from 'iron-session';
+import { cookies } from 'next/headers';
 import { NextRequest, NextResponse } from 'next/server';
 import { sessionOptions } from '.';
 
@@ -12,8 +13,7 @@ export default function withSession(
   return async (req: NextRequest, res: NextResponse) => {
     const reqWithSession = req as IReqWithSession;
     reqWithSession.session = await getIronSession<ISession>(
-      req,
-      res,
+      cookies(),
       sessionOptions
     );
     return handler(reqWithSession, res);