From 48db0b240b7ab78ad997d2b8400c35782af0bd2d Mon Sep 17 00:00:00 2001
From: natib21 <yaschalew10@gmail.com>
Date: Fri, 3 Jul 2026 09:32:41 +0000
Subject: [PATCH] fix fayda

---
 apps/edr-freight-api/src/main.ts              |  3 +-
 .../verifayda/fayda-callback.controller.ts    | 31 +++++++++++++++++++
 .../src/modules/verifayda/verifayda.module.ts |  3 +-
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 apps/edr-freight-api/src/modules/verifayda/fayda-callback.controller.ts

diff --git a/apps/edr-freight-api/src/main.ts b/apps/edr-freight-api/src/main.ts
index 0107956e4..0fa1056dd 100644
--- a/apps/edr-freight-api/src/main.ts
+++ b/apps/edr-freight-api/src/main.ts
@@ -38,7 +38,8 @@ async function bootstrap() {
     maxAge: 86400, // cache preflight for 24h to cut chatter in dev
   });
 
-  app.setGlobalPrefix("api");
+  // /callback stays un-prefixed: it's the Fayda OAuth redirect_uri ack endpoint.
+  app.setGlobalPrefix("api", { exclude: ["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
diff --git a/apps/edr-freight-api/src/modules/verifayda/fayda-callback.controller.ts b/apps/edr-freight-api/src/modules/verifayda/fayda-callback.controller.ts
new file mode 100644
index 000000000..71b0dc4b0
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/verifayda/fayda-callback.controller.ts
@@ -0,0 +1,31 @@
+import { Controller, Get, Query } from '@nestjs/common';
+import { ApiOkResponse, ApiOperation, ApiTags } from '@nestjs/swagger';
+import { IsPublic } from '@tria-plc/api-common/modules/auth/decorators/public.decorator';
+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).
+ * 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')
+export class FaydaCallbackController {
+  @Get()
+  @IsPublic()
+  @ApiOperation({ summary: 'Acknowledge a Fayda redirect (returns OK, echoes code/state)' })
+  @ApiOkResponse({
+    schema: { example: { status: 'ok', code: '...', state: '...' } },
+  })
+  ok(@Query() query: VerifaydaCallbackDto) {
+    return {
+      status: 'ok',
+      ...(query.code ? { code: query.code } : {}),
+      ...(query.state ? { state: query.state } : {}),
+      ...(query.error ? { error: query.error } : {}),
+      ...(query.error_description ? { error_description: query.error_description } : {}),
+    };
+  }
+}
diff --git a/apps/edr-freight-api/src/modules/verifayda/verifayda.module.ts b/apps/edr-freight-api/src/modules/verifayda/verifayda.module.ts
index b87b90e16..82fb9435c 100644
--- a/apps/edr-freight-api/src/modules/verifayda/verifayda.module.ts
+++ b/apps/edr-freight-api/src/modules/verifayda/verifayda.module.ts
@@ -1,12 +1,13 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { VerifaydaController } from './verifayda.controller';
+import { FaydaCallbackController } from './fayda-callback.controller';
 import { VerifaydaService } from './verifayda.service';
 import { FaydaVerificationSession } from './entities/fayda-verification-session.entity';
 
 @Module({
   imports: [TypeOrmModule.forFeature([FaydaVerificationSession])],
-  controllers: [VerifaydaController],
+  controllers: [VerifaydaController, FaydaCallbackController],
   providers: [VerifaydaService],
   exports: [VerifaydaService],
 })