refactor(freight): move the Fayda callback to /fayda/callback

Namespaces the OAuth landing path in all three places it exists: the API's
ack controller, both web apps' routes, and the redirect_uri env values.
A bare /callback claimed a generic top-level path in every app for one
provider's redirect.

The API side needed care. The ack controller moves to @Controller
('fayda/callback'), and the global-prefix exclusion has to name that exact
path — setGlobalPrefix's exclude is an exact route match, not a subtree, so
excluding "fayda" would have left /fayda/callback served at
/api/fayda/callback and 404ing at the registered redirect_uri, while
reading as though it covered everything under /fayda. Naming the full path
also keeps /api/fayda/verification/* prefixed, which every client calls.

Also drops a stale comment on the portal's callback route describing the
popup that no longer exists, and records why the route is public: behind
RequireAuth the onboarding gate redirects to /portal before the code+state
exchange can run.

NOT verified at runtime — this changes route registration, so boot the API
and confirm GET /fayda/callback answers un-prefixed and
/api/fayda/verification/start still resolves before relying on it.

Deploying this requires registering the new redirect_uri with eSignet
first; FAYDA_WEB_REDIRECT_URI, FAYDA_PORTAL_REDIRECT_URI and any mobile
client must be updated in step or verification breaks with a redirect_uri
mismatch.

apps/edr-freight-api/.env.example

@@ -98,10 +98,10 @@ FAYDA_PRIVATE_KEY_BASE64=
 # OAuth redirect_uri for MOBILE clients (must be registered with eSignet)
 FAYDA_REDIRECT_URI=http://localhost:3001/api/fayda/verification/complete
 # OAuth redirect_uri for WEB clients. Defaults to FAYDA_REDIRECT_URI when unset.
-FAYDA_WEB_REDIRECT_URI=http://localhost:3000/callback
+FAYDA_WEB_REDIRECT_URI=http://localhost:3000/fayda/callback
 # OAuth redirect_uri for the customer portal (its own origin — must also be
 # registered with eSignet). Defaults to FAYDA_WEB_REDIRECT_URI when unset.
-FAYDA_PORTAL_REDIRECT_URI=http://localhost:5173/callback
+FAYDA_PORTAL_REDIRECT_URI=http://localhost:5173/fayda/callback
 CLIENT_ASSERTION_TYPE=urn:ietf:params:oauth:client-assertion-type:jwt-bearer
 FAYDA_SCOPE=openid profile email phone address
 FAYDA_ACR_VALUES=mosip:idp:acr:generated-code

apps/edr-freight-api/docs/FREIGHT_MASTER_FLOW.md

@@ -21,7 +21,7 @@ flowchart TD
   S0(["Customer visits portal"]):::start
   S0 --> S1["Signup via IAM<br/>GET /auth/check-availability @Public<br/>POST /otp/send + /otp/verify (P)"]:::port
   S1 --> S2{"Identity proofing<br/>(VeriFayda)?"}:::dec
-  S2 -->|"Yes"| S3["POST /fayda/verification/start →<br/>/callback → /complete<br/>upsert iam.users (verified_by=fayda) (P)"]:::port
+  S2 -->|"Yes"| S3["POST /fayda/verification/start →<br/>/fayda/callback → /complete<br/>upsert iam.users (verified_by=fayda) (P)"]:::port
   S2 -->|"No"| S4
   S3 --> S4["POST /companies/onboarding/start<br/>draft company (placeholder TIN, PENDING) (P)"]:::port
   S4 --> S4b["Wizard: PATCH /profile, /onboarding-step,<br/>upload license + docs<br/>GET /onboarding/requirements (P)"]:::port

apps/edr-freight-api/docs/FREIGHT_SYSTEM_FLOW.md

@@ -131,7 +131,7 @@ sequenceDiagram
 `HasActiveDelegationGuard` as **global `APP_GUARD`s** — *every* route is JWT-protected unless it
 carries `@Public()`. Fine-grained `FreightPermissionGuard([perm])` decorators add permission checks
 on staff routes. Explicitly **public** endpoints: `GET /api/files/:fileId`, `POST /api/otp/{send,verify}`,
-`GET /api/auth/check-availability`, the `fayda/verification/*` + `/callback` endpoints,
+`GET /api/auth/check-availability`, the `fayda/verification/*` + `/fayda/callback` endpoints,
 `GET /api/payments/{checkout,receipt/:orderId}`, and the service-to-service `POST /api/internal/payments/mark-paid`.
 Real login / JWT issuance lives in the **external IAM package**, not this repo. (Note: `@edr/api-common`'s
 `@Public` and `@tria-plc/api-common`'s `@IsPublic` both set the same `"isPublic"` metadata key the guard reads.)
@@ -288,7 +288,7 @@ flowchart TD
   chk --> otp["POST /otp/send + /otp/verify (P) @Public"]
   otp --> fayda{"Identity proofing?"}
   fayda -->|"VeriFayda 2.0"| fstart["POST /fayda/verification/start<br/>→ eSignet authorize URL"]
-  fstart --> fcb["Fayda redirect → GET /callback (ack)<br/>→ GET /fayda/verification/complete<br/>(PKCE code exchange → upsert iam.users)"]
+  fstart --> fcb["Fayda redirect → GET /fayda/callback (ack)<br/>→ GET /fayda/verification/complete<br/>(PKCE code exchange → upsert iam.users)"]
   fcb --> onb
   fayda -->|"skip"| onb
 
@@ -313,7 +313,7 @@ drives the required document set. Booking guards elsewhere `403` if the acting p
 | POST | `/api/fayda/verification/start` | start eSignet session (PKCE) | `@Public` + OptionalJwt | (B) verifayda.service |
 | GET | `/api/fayda/verification/complete` | code→identity, upsert `iam.users` | `@Public` | (B) verifayda.service |
 | GET | `/api/fayda/verification/status` | current user's Fayda link | JwtGuard | — |
-| GET | `/callback` | passive Fayda redirect ack (no `/api`) | `@Public` | popup postMessage |
+| GET | `/fayda/callback` | passive Fayda redirect ack (no `/api`) | `@Public` | popup postMessage |
 | GET·PUT | `/api/me/signature` | reusable signature (MinIO, base64) | JwtGuard | (P)(B) signatures.service |
 | GET | `/api/test_user1` · `/api/test_user2` | permission-guard demo | `PermissionGuard` | (B) demo pages |
 | GET | `/api/companies/getInfo` · `/profile` · `/dashboard` | company info / KPIs | JwtGuard | (P) companies.service |

apps/edr-freight-api/src/main.ts

@@ -130,8 +130,11 @@ async function bootstrap() {
     maxAge: 86400, // cache preflight for 24h to cut chatter in dev
   });
 
-  // /callback stays un-prefixed: it's the Fayda OAuth redirect_uri ack endpoint.
-  app.setGlobalPrefix("api", { exclude: ["callback"] });
+  // /fayda/callback stays un-prefixed: it's the Fayda OAuth redirect_uri ack
+  // endpoint. Exact path, not "fayda" — exclusion is an exact route match, so
+  // "fayda" would leave /fayda/callback prefixed (404 at the registered
+  // redirect_uri) while still reading as if it covered the whole subtree.
+  app.setGlobalPrefix("api", { exclude: ["fayda/callback"] });
   // enableImplicitConversion is OFF: class-transformer's implicit boolean
   // coercion turns any non-empty multipart/form-data string (including the
   // literal "false") into `true`, silently corrupting flags like isHazardous

apps/edr-freight-api/src/modules/verifayda/fayda-callback.controller.ts

@@ -6,12 +6,14 @@ import { VerifaydaCallbackDto } from './verifayda.dto';
 /**
  * Plain acknowledgement endpoint for the Fayda redirect_uri when it points at
  * the API instead of the web app (e.g. MOBILE clients or connectivity checks).
- * Registered at /callback (excluded from the global /api prefix in main.ts).
+ * Registered at /fayda/callback (excluded by exact path from the global /api
+ * prefix in main.ts — the exclusion must NOT be widened to "fayda", or
+ * /api/fayda/verification/* loses its prefix too).
  * It does NOT consume the verification session — the client must still call
  * GET /api/fayda/verification/complete with the echoed code+state.
  */
 @ApiTags('Fayda Verification')
-@Controller('callback')
+@Controller('fayda/callback')
 export class FaydaCallbackController {
   @Get()
   @IsPublic()

apps/edr-freight-web/backoffice/src/App.tsx

@@ -292,7 +292,10 @@ const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
             label: "Locomotives",
             href: "/dashboard/locomotives",
             icon: <Train />,
-            permission: [FREIGHT_PERMS.locomotives.view, FREIGHT_PERMS.fleet.view],
+            permission: [
+              FREIGHT_PERMS.locomotives.view,
+              FREIGHT_PERMS.fleet.view,
+            ],
           },
           {
             label: "Train Builder",
@@ -818,7 +821,7 @@ const App = () => {
       {UserManagementRoutes()}
       {/* <Route path="/um/*" element={<UserManagementHostPage />} /> */}
       <Route path="/health" element={<HealthCheck />} />
-      <Route path="/callback" element={<FaydaCallbackPage />} />
+      <Route path="/fayda/callback" element={<FaydaCallbackPage />} />
       <Route path="/" element={<Navigate to="/dashboard/overview" replace />} />
       <Route
         path="/dashboard"
@@ -1085,7 +1088,10 @@ const App = () => {
         <Route path="intercity" element={<IntercityPage />} />
         <Route path="trucks-on-site" element={<TrucksOnSitePage />} />
         <Route path="import-trucks" element={<ImportTrucksPage />} />
-        <Route path="edr-last-mile-returns" element={<EDRLastMileReturnsPage />} />
+        <Route
+          path="edr-last-mile-returns"
+          element={<EDRLastMileReturnsPage />}
+        />
         <Route path="container-returns" element={<ContainerReturnsPage />} />
         <Route path="loaded-inventory" element={<LoadedInventoryPage />} />
         <Route path="dispatch-queue" element={<DispatchQueuePage />} />
@@ -1173,7 +1179,9 @@ const App = () => {
         <Route
           path="routes"
           element={
-            <RequirePermission permission={[FREIGHT_PERMS.routes.view, FREIGHT_PERMS.fleet.view]}>
+            <RequirePermission
+              permission={[FREIGHT_PERMS.routes.view, FREIGHT_PERMS.fleet.view]}
+            >
               <RoutesPage />
             </RequirePermission>
           }
@@ -1181,7 +1189,12 @@ const App = () => {
         <Route
           path="locomotives"
           element={
-            <RequirePermission permission={[FREIGHT_PERMS.locomotives.view, FREIGHT_PERMS.fleet.view]}>
+            <RequirePermission
+              permission={[
+                FREIGHT_PERMS.locomotives.view,
+                FREIGHT_PERMS.fleet.view,
+              ]}
+            >
               <FleetResourcePage />
             </RequirePermission>
           }
@@ -1189,7 +1202,9 @@ const App = () => {
         <Route
           path="trains"
           element={
-            <RequirePermission permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}>
+            <RequirePermission
+              permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}
+            >
               <FleetResourcePage />
             </RequirePermission>
           }
@@ -1197,7 +1212,9 @@ const App = () => {
         <Route
           path="trains/:id"
           element={
-            <RequirePermission permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}>
+            <RequirePermission
+              permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}
+            >
               <TrainDetailPage />
             </RequirePermission>
           }
@@ -1205,7 +1222,9 @@ const App = () => {
         <Route
           path="train-builder"
           element={
-            <RequirePermission permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}>
+            <RequirePermission
+              permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}
+            >
               <TrainBuilderListPage />
             </RequirePermission>
           }
@@ -1213,7 +1232,9 @@ const App = () => {
         <Route
           path="train-builder/:id"
           element={
-            <RequirePermission permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}>
+            <RequirePermission
+              permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}
+            >
               <TrainBuilderDetailPage />
             </RequirePermission>
           }
@@ -1221,7 +1242,9 @@ const App = () => {
         <Route
           path="wagons"
           element={
-            <RequirePermission permission={[FREIGHT_PERMS.wagons.view, FREIGHT_PERMS.fleet.view]}>
+            <RequirePermission
+              permission={[FREIGHT_PERMS.wagons.view, FREIGHT_PERMS.fleet.view]}
+            >
               <FleetResourcePage />
             </RequirePermission>
           }
@@ -1242,7 +1265,12 @@ const App = () => {
         <Route
           path="containers"
           element={
-            <RequirePermission permission={[FREIGHT_PERMS.containers.view, FREIGHT_PERMS.fleet.view]}>
+            <RequirePermission
+              permission={[
+                FREIGHT_PERMS.containers.view,
+                FREIGHT_PERMS.fleet.view,
+              ]}
+            >
               <FleetResourcePage />
             </RequirePermission>
           }
@@ -1250,7 +1278,12 @@ const App = () => {
         <Route
           path="cargoes"
           element={
-            <RequirePermission permission={[FREIGHT_PERMS.cargoes.view, FREIGHT_PERMS.fleet.view]}>
+            <RequirePermission
+              permission={[
+                FREIGHT_PERMS.cargoes.view,
+                FREIGHT_PERMS.fleet.view,
+              ]}
+            >
               <FleetResourcePage />
             </RequirePermission>
           }
@@ -1336,7 +1369,9 @@ const App = () => {
         <Route
           path="routes"
           element={
-            <RequirePermission permission={[FREIGHT_PERMS.routes.view, FREIGHT_PERMS.fleet.view]}>
+            <RequirePermission
+              permission={[FREIGHT_PERMS.routes.view, FREIGHT_PERMS.fleet.view]}
+            >
               <RoutesPage />
             </RequirePermission>
           }
@@ -1424,7 +1459,12 @@ const App = () => {
         <Route
           path="locomotives"
           element={
-            <RequirePermission permission={[FREIGHT_PERMS.locomotives.view, FREIGHT_PERMS.fleet.view]}>
+            <RequirePermission
+              permission={[
+                FREIGHT_PERMS.locomotives.view,
+                FREIGHT_PERMS.fleet.view,
+              ]}
+            >
               <FleetResourcePage />
             </RequirePermission>
           }
@@ -1432,7 +1472,9 @@ const App = () => {
         <Route
           path="trains"
           element={
-            <RequirePermission permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}>
+            <RequirePermission
+              permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}
+            >
               <FleetResourcePage />
             </RequirePermission>
           }
@@ -1440,7 +1482,9 @@ const App = () => {
         <Route
           path="trains/:id"
           element={
-            <RequirePermission permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}>
+            <RequirePermission
+              permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}
+            >
               <TrainDetailPage />
             </RequirePermission>
           }
@@ -1448,7 +1492,9 @@ const App = () => {
         <Route
           path="train-builder"
           element={
-            <RequirePermission permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}>
+            <RequirePermission
+              permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}
+            >
               <TrainBuilderListPage />
             </RequirePermission>
           }
@@ -1456,7 +1502,9 @@ const App = () => {
         <Route
           path="train-builder/:id"
           element={
-            <RequirePermission permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}>
+            <RequirePermission
+              permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}
+            >
               <TrainBuilderDetailPage />
             </RequirePermission>
           }
@@ -1464,7 +1512,9 @@ const App = () => {
         <Route
           path="wagons"
           element={
-            <RequirePermission permission={[FREIGHT_PERMS.wagons.view, FREIGHT_PERMS.fleet.view]}>
+            <RequirePermission
+              permission={[FREIGHT_PERMS.wagons.view, FREIGHT_PERMS.fleet.view]}
+            >
               <FleetResourcePage />
             </RequirePermission>
           }
@@ -1485,7 +1535,12 @@ const App = () => {
         <Route
           path="containers"
           element={
-            <RequirePermission permission={[FREIGHT_PERMS.containers.view, FREIGHT_PERMS.fleet.view]}>
+            <RequirePermission
+              permission={[
+                FREIGHT_PERMS.containers.view,
+                FREIGHT_PERMS.fleet.view,
+              ]}
+            >
               <FleetResourcePage />
             </RequirePermission>
           }
@@ -1493,7 +1548,12 @@ const App = () => {
         <Route
           path="cargoes"
           element={
-            <RequirePermission permission={[FREIGHT_PERMS.cargoes.view, FREIGHT_PERMS.fleet.view]}>
+            <RequirePermission
+              permission={[
+                FREIGHT_PERMS.cargoes.view,
+                FREIGHT_PERMS.fleet.view,
+              ]}
+            >
               <FleetResourcePage />
             </RequirePermission>
           }

apps/edr-freight-web/backoffice/src/complaints/utils/complaintVerificationStorage.ts

@@ -47,7 +47,7 @@ export function isComplaintAuthContext(pathname = ""): boolean {
     pathname.startsWith("/complaints") ||
     pathname === "/complaint-form" ||
     pathname === "/follow-complaint" ||
-    pathname === "/callback"
+    pathname === "/fayda/callback"
   );
 }
 

apps/edr-freight-web/backoffice/src/components/errors/ApiErrorModal.tsx

@@ -28,7 +28,7 @@ let listener: Listener | null = null;
 /** Current-page path patterns where the global modal must stay silent. */
 const EXCLUDED_PATH_PATTERNS = [
   /^\/auth/,
-  /^\/callback/,
+  /^\/fayda/,
   /warehouse/i,
   /first-mile/i,
   /last-mile/i,

apps/edr-freight-web/backoffice/src/components/fleet/FleetFormDialog.tsx

@@ -148,7 +148,7 @@ const FleetFormDialog = ({
     });
   }, [open, fields]);
 
-  // Receive the ?code&state relayed by the /callback popup, exchange it for
+  // Receive the ?code&state relayed by the /fayda/callback popup, exchange it for
   // the verified identity, and prefill the matching form fields.
   useEffect(() => {
     if (!open || !verifyWithFayda) return;

apps/edr-freight-web/backoffice/src/pages/FaydaCallbackPage.tsx

@@ -5,7 +5,7 @@ import type { FaydaCallbackMessage } from "@/services/verifayda.service";
 
 /**
  * Landing page for the eSignet redirect_uri (FAYDA_WEB_REDIRECT_URI →
- * http://localhost:5183/callback). Runs inside the verification popup:
+ * http://localhost:5183/fayda/callback). Runs inside the verification popup:
  * relays ?code&state (or ?error) to the window that opened it via
  * postMessage, then closes itself. The opener performs the /complete call
  * so the single-use session is only consumed once, in one place.

apps/edr-freight-web/backoffice/src/services/verifayda.service.ts

@@ -17,7 +17,7 @@ export interface FaydaCompleteResult {
   userDataSaved?: boolean;
 }
 
-/** Message posted from the /callback popup back to the opener window. */
+/** Message posted from the /fayda/callback popup back to the opener window. */
 export interface FaydaCallbackMessage {
   type: 'fayda-callback';
   code?: string;

apps/edr-freight-web/backoffice/src/shared/components/FaydaCallbackDispatcher.tsx

@@ -5,7 +5,7 @@ import ExternalPortalCallback from "@/external-portal/components/Registration/Ex
 
 /**
  * Single FAYDA OIDC callback entry point.
- * Fayda only allows whitelisted redirect URIs (e.g. /callback) — route
+ * Fayda only allows whitelisted redirect URIs (e.g. /fayda/callback) — route
  * internally based on the `state` param sent during authorization.
  */
 export default function FaydaCallbackDispatcher() {

apps/edr-freight-web/backoffice/src/shared/services/sessionExpiry.ts

@@ -11,7 +11,7 @@ const PUBLIC_PATHS = [
   "/set-password",
   "/verify-otp",
   "/verification_page",
-  "/callback",
+  "/fayda/callback",
   "/complaints",
   "/complaint-form",
   "/follow-complaint",

apps/edr-freight-web/backoffice/src/shared/utils/faydaOidc.ts

@@ -12,7 +12,7 @@ const DEFAULT_CODE_CHALLENGE = "E9Melhoa2OwvFrEMTJguCHaoeK1t8URWbuGJSstw-cM";
 const DEFAULT_NONCE = "g4DEuje5Fx57Vb64dO4oqLHXGT8L8G7g";
 const DEFAULT_STATE = "ptOO76SD";
 
-/** OIDC state value that routes the shared /callback to the complaint flow (legacy sign-in). */
+/** OIDC state value that routes the shared /fayda/callback to the complaint flow (legacy sign-in). */
 export const COMPLAINT_FLOW_STATE = "complaint_flow";
 
 /** Complaint flow OIDC states — distinguish sign-in vs sign-up endpoints. */
@@ -66,9 +66,7 @@ export function startExternalPortalFaydaAuth(): void {
 export function generateFaydaAuthorizationUrl(
   options: FaydaOidcOptions = {},
 ): string {
-  const redirectUri =
-    options.redirectUri ||
-    getDefaultFaydaRedirectUri();
+  const redirectUri = options.redirectUri || getDefaultFaydaRedirectUri();
 
   const params = new URLSearchParams({
     client_id: import.meta.env.VITE_CLIENT_ID || "",
@@ -98,7 +96,7 @@ export function generateFaydaAuthorizationUrl(
 export function getDefaultFaydaRedirectUri(): string {
   return (
     import.meta.env.VITE_REDIRECT_URI ||
-    `${window.location.origin}/callback`
+    `${window.location.origin}/fayda/callback`
   );
 }
 
@@ -106,13 +104,12 @@ export function getDefaultFaydaRedirectUri(): string {
  * Returns the redirect URI registered with FAYDA for the complaint flow.
  *
  * Must exactly match a URI whitelisted in the FAYDA OIDC client — we reuse
- * the same /callback path as external-portal registration and distinguish
+ * the same /fayda/callback path as external-portal registration and distinguish
  * flows via the `state` parameter (see COMPLAINT_FLOW_STATE).
  */
 export function getComplaintFaydaRedirectUri(): string {
   return (
-    import.meta.env.VITE_COMPLAINT_REDIRECT_URI ||
-    getDefaultFaydaRedirectUri()
+    import.meta.env.VITE_COMPLAINT_REDIRECT_URI || getDefaultFaydaRedirectUri()
   );
 }
 

apps/edr-freight-web/portal/src/App.tsx

@@ -262,9 +262,11 @@ const App = () => {
           element={<CheckPaymentPage />}
         />
         {/* Payment provider browser redirects (PAYMENT_RETURN_URL / PAYMENT_FAILURE_URL) */}
-      {/* Fayda (eSignet) redirect_uri — runs in the verification popup and
-          relays the code/state back to the form that opened it. */}
-      <Route path="/callback" element={<FaydaCallbackPage />} />
+        {/* Fayda (eSignet) redirect_uri — the whole tab lands here after
+          verification, completes the code/state exchange and navigates back
+          to the page that started it. Public on purpose: behind RequireAuth
+          the onboarding gate would redirect away before the exchange ran. */}
+        <Route path="/fayda/callback" element={<FaydaCallbackPage />} />
         <Route path="/payment/success" element={<PaymentSuccessPage />} />
         <Route path="/payment/failure" element={<PaymentFailurePage />} />
 

apps/edr-freight-web/portal/src/components/FaydaVerifyPanel.tsx

@@ -61,7 +61,7 @@ function getInitials(name: string | null): string {
  * The identity is proved on eSignet, which the whole tab navigates to — no
  * popup, because a popup opened after the /start round-trip has lost its user
  * activation and iOS Safari blocks it outright. eSignet redirects back to
- * /callback, which completes the exchange and returns the user here; the API
+ * /fayda/callback, which completes the exchange and returns the user here; the API
  * writes the person's name, phone, email and address from the verified
  * payload. Nothing on this panel is typed.
  */
@@ -82,7 +82,7 @@ export default function FaydaVerifyPanel({
     try {
       const authorizationUrl = await verifaydaService.start();
       // Record who is being verified and where to come back to before the tab
-      // leaves — /callback has no other way to know either.
+      // leaves — /fayda/callback has no other way to know either.
       stashPendingVerification({
         subject,
         returnTo:
@@ -189,7 +189,13 @@ function DataRow({ icon, value }: { icon: ReactNode; value: string | null }) {
   if (!value) return null;
   return (
     <Group gap={6} wrap="nowrap">
-      <span style={{ color: "var(--mantine-color-edr-muted-6)", display: "flex", flexShrink: 0 }}>
+      <span
+        style={{
+          color: "var(--mantine-color-edr-muted-6)",
+          display: "flex",
+          flexShrink: 0,
+        }}
+      >
         {icon}
       </span>
       <Text size="xs" c="edr-muted" truncate>

apps/edr-freight-web/portal/src/pages/FaydaCallbackPage.tsx

@@ -9,7 +9,7 @@ import {
 
 /**
  * Landing page for the portal's eSignet redirect_uri
- * (FAYDA_PORTAL_REDIRECT_URI → http://localhost:5173/callback).
+ * (FAYDA_PORTAL_REDIRECT_URI → http://localhost:5173/fayda/callback).
  *
  * The verification is a full-page redirect, so the page that started it no
  * longer exists: this page completes the code+state exchange itself against

apps/edr-freight-web/portal/src/services/verifayda.pending.test.ts

@@ -7,7 +7,7 @@ import {
 
 /**
  * The stash is the only thing that survives the full-page handoff to eSignet,
- * so /callback completing against the wrong subject — or throwing on junk left
+ * so /fayda/callback completing against the wrong subject — or throwing on junk left
  * behind by an older build — would either misfile a verified identity or dead-
  * end the flow.
  */

apps/edr-freight-web/portal/src/services/verifayda.service.ts

@@ -41,8 +41,8 @@ export interface CompanyIdentityState {
 /**
  * What the panel was doing when it handed the tab over to eSignet. The
  * verification is a full-page redirect, so the page that started it is gone by
- * the time /callback runs — this is how /callback knows whose identity the
- * code+state belongs to and where to put the user back.
+ * the time /fayda/callback runs — this is how that page knows whose identity
+ * the code+state belongs to and where to put the user back.
  *
  * sessionStorage, not localStorage: it is scoped to this tab, so two tabs
  * verifying different people can't overwrite each other, and it dies with the

docker-compose.e2e.yaml

@@ -235,8 +235,8 @@ services:
       PAYMENT_API_URL: http://payment-mock-e2e:4500
       FAYDA_TOKEN_ENDPOINT: http://fayda-mock-e2e:4400/token
       FAYDA_USERINFO_ENDPOINT: http://fayda-mock-e2e:4400/userinfo
-      FAYDA_REDIRECT_URI: http://localhost:${E2E_PORTAL_PORT:-5373}/callback
-      FAYDA_PORTAL_REDIRECT_URI: http://localhost:${E2E_PORTAL_PORT:-5373}/callback
+      FAYDA_REDIRECT_URI: http://localhost:${E2E_PORTAL_PORT:-5373}/fayda/callback
+      FAYDA_PORTAL_REDIRECT_URI: http://localhost:${E2E_PORTAL_PORT:-5373}/fayda/callback
       # Throwaway e2e-only RSA JWK (client_assertion signing) — the mock
       # never verifies the signature, this just has to be well-formed.
       # Generated fresh per launch by e2e.mjs (fakeFaydaPrivateKeyBase64),