diff --git a/app/api/auth/agent-connect/callback/route.ts b/app/api/auth/agent-connect/callback/route.ts index 64892865b..4d6fe0871 100644 --- a/app/api/auth/agent-connect/callback/route.ts +++ b/app/api/auth/agent-connect/callback/route.ts @@ -2,9 +2,9 @@ import { agentConnectAuthenticate } from '#clients/authentication/agent-connect/ import { HttpForbiddenError } from '#clients/exceptions'; import { getAgent } from '#models/user/agent'; import { logFatalErrorInSentry } from '#utils/sentry'; +import { redirectTo } from '#utils/server-side-helper/app/redirect-to'; import { cleanPathFrom, getPathFrom, setAgentSession } from '#utils/session'; import withSession from '#utils/session/with-session'; -import { redirectTo } from '../../utils'; import { AgentConnectFailedException } from '../agent-connect-types'; export const GET = withSession(async function callbackRoute(req) { diff --git a/app/api/auth/agent-connect/login/route.ts b/app/api/auth/agent-connect/login/route.ts index 3839c72c5..00a787f2e 100644 --- a/app/api/auth/agent-connect/login/route.ts +++ b/app/api/auth/agent-connect/login/route.ts @@ -1,9 +1,9 @@ import { agentConnectAuthorizeUrl } from '#clients/authentication/agent-connect/strategy'; import { logFatalErrorInSentry } from '#utils/sentry'; +import { redirectTo } from '#utils/server-side-helper/app/redirect-to'; import { setPathFrom } from '#utils/session'; import withSession from '#utils/session/with-session'; import { NextResponse } from 'next/server'; -import { redirectTo } from '../../utils'; import { AgentConnectFailedException } from '../agent-connect-types'; export const GET = withSession(async function loginRoute(req) { diff --git a/app/api/auth/agent-connect/logout-callback/route.ts b/app/api/auth/agent-connect/logout-callback/route.ts index 4a47c7e2c..57c41a4e4 100644 --- a/app/api/auth/agent-connect/logout-callback/route.ts +++ b/app/api/auth/agent-connect/logout-callback/route.ts @@ -1,7 +1,7 @@ import logErrorInSentry from '#utils/sentry'; +import { redirectTo } from '#utils/server-side-helper/app/redirect-to'; import { cleanAgentSession, cleanPathFrom, getPathFrom } from '#utils/session'; import withSession from '#utils/session/with-session'; -import { redirectTo } from '../../utils'; import { AgentConnectLogoutFailedException } from '../agent-connect-types'; export const GET = withSession(async function logoutCallbackRoute(req) { diff --git a/app/api/auth/agent-connect/logout/route.ts b/app/api/auth/agent-connect/logout/route.ts index 4ae7efd55..7d3815720 100644 --- a/app/api/auth/agent-connect/logout/route.ts +++ b/app/api/auth/agent-connect/logout/route.ts @@ -1,9 +1,9 @@ import { agentConnectLogoutUrl } from '#clients/authentication/agent-connect/strategy'; import logErrorInSentry from '#utils/sentry'; +import { redirectTo } from '#utils/server-side-helper/app/redirect-to'; import { setPathFrom } from '#utils/session'; import withSession from '#utils/session/with-session'; import { NextResponse } from 'next/server'; -import { redirectTo } from '../../utils'; import { AgentConnectLogoutFailedException } from '../agent-connect-types'; export const GET = withSession(async function logoutRoute(req) { diff --git a/app/api/auth/france-connect/callback/route.ts b/app/api/auth/france-connect/callback/route.ts index 19b3d4cb2..239583ee7 100644 --- a/app/api/auth/france-connect/callback/route.ts +++ b/app/api/auth/france-connect/callback/route.ts @@ -1,8 +1,8 @@ import { franceConnectAuthenticate } from '#clients/authentication/france-connect/strategy'; import logErrorInSentry from '#utils/sentry'; +import { redirectTo } from '#utils/server-side-helper/app/redirect-to'; import { setHidePersonalDataRequestFCSession } from '#utils/session'; import withSession from '#utils/session/with-session'; -import { redirectTo } from '../../utils'; import { FranceConnectFailedException } from '../france-connect-types'; export const GET = withSession(async function callbackRoute(req) { diff --git a/app/api/auth/france-connect/login/route.ts b/app/api/auth/france-connect/login/route.ts index b631d7ee8..28be7dbb8 100644 --- a/app/api/auth/france-connect/login/route.ts +++ b/app/api/auth/france-connect/login/route.ts @@ -1,8 +1,8 @@ import { FranceConnectAuthorizeUrl } from '#clients/authentication/france-connect/strategy'; import { logFatalErrorInSentry } from '#utils/sentry'; +import { redirectTo } from '#utils/server-side-helper/app/redirect-to'; import withSession from '#utils/session/with-session'; import { NextResponse } from 'next/server'; -import { redirectTo } from '../../utils'; import { FranceConnectFailedException } from '../france-connect-types'; export const GET = withSession(async function loginRoute(req) { diff --git a/app/api/auth/france-connect/logout-callback/route.ts b/app/api/auth/france-connect/logout-callback/route.ts index 580795ea9..39bc6a38d 100644 --- a/app/api/auth/france-connect/logout-callback/route.ts +++ b/app/api/auth/france-connect/logout-callback/route.ts @@ -1,7 +1,7 @@ import logErrorInSentry from '#utils/sentry'; +import { redirectTo } from '#utils/server-side-helper/app/redirect-to'; import { getPathFrom } from '#utils/session'; import withSession from '#utils/session/with-session'; -import { redirectTo } from '../../utils'; import { FranceConnectLogoutFailedException } from '../france-connect-types'; export const GET = withSession(async function logoutCallbackRoute(req) { diff --git a/app/api/auth/france-connect/logout/route.ts b/app/api/auth/france-connect/logout/route.ts index 64db23e1f..143e8718b 100644 --- a/app/api/auth/france-connect/logout/route.ts +++ b/app/api/auth/france-connect/logout/route.ts @@ -1,9 +1,9 @@ import { franceConnectLogoutUrl } from '#clients/authentication/france-connect/strategy'; import logErrorInSentry from '#utils/sentry'; +import { redirectTo } from '#utils/server-side-helper/app/redirect-to'; import { setPathFrom } from '#utils/session'; import withSession from '#utils/session/with-session'; import { NextResponse } from 'next/server'; -import { redirectTo } from '../../utils'; import { FranceConnectLogoutFailedException } from '../france-connect-types'; export const GET = withSession(async function logoutRoute(req) { diff --git a/app/api/auth/utils.ts b/utils/server-side-helper/app/redirect-to.ts similarity index 100% rename from app/api/auth/utils.ts rename to utils/server-side-helper/app/redirect-to.ts