Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha

apps/edr-passenger-api/src/modules/packages/packages.controller.ts

@@ -1,5 +1,6 @@
 import { Body, Controller, Get, Param, Post, Patch, Delete, UseGuards, Request, Query } from '@nestjs/common';
 import { ApiTags, ApiOperation, ApiBearerAuth } from '@nestjs/swagger';
+import { IsPublic } from '@tria-plc/api-common/modules/auth/decorators/public.decorator';
 import { PackagesService } from './packages.service';
 import { CreatePackageDto, BookPackageDto, CreatePriceTierDto, UpdatePriceTierDto } from './packages.dto';
 import { JwtGuard } from '../../common/jwt.guard';
@@ -11,6 +12,7 @@ export class PackagesController {
   constructor(private readonly service: PackagesService) {}
 
   @Get()
+  @IsPublic()
   @ApiOperation({ summary: 'List active packages' })
   listActive() {
     return this.service.listActive();
@@ -33,12 +35,14 @@ export class PackagesController {
   }
 
   @Get('booking/:ref')
+  @IsPublic()
   @ApiOperation({ summary: 'Get package booking by reference' })
   getBookingByRef(@Param('ref') ref: string) {
     return this.service.getBookingByRef(ref);
   }
 
   @Get(':id')
+  @IsPublic()
   @ApiOperation({ summary: 'Get package details' })
   getById(@Param('id') id: string) {
     return this.service.getById(id);
@@ -93,6 +97,7 @@ export class PackagesController {
   }
 
   @Post('book')
+  @IsPublic()
   @UseGuards(OptionalJwtGuard)
   @ApiBearerAuth('JWT-auth')
   @ApiOperation({ summary: 'Book a package (public or authenticated)' })

apps/edr-passenger-api/src/modules/verifayda/verifayda.controller.ts

@@ -17,6 +17,7 @@ import {
 } from '@nestjs/swagger';
 import { Throttle } from '@nestjs/throttler';
 import type { TCurrentUser } from '@tria-plc/api-common/modules/auth/types/current-user.type';
+import { IsPublic } from '@tria-plc/api-common/modules/auth/decorators/public.decorator';
 import { JwtGuard } from '../../common/jwt.guard';
 import { OptionalJwtGuard } from './optional-jwt.guard';
 import {
@@ -43,6 +44,7 @@ export class VerifaydaController {
   constructor(private readonly service: VerifaydaService) {}
 
   @Post('start')
+  @IsPublic()
   @HttpCode(HttpStatus.OK)
   @UseGuards(OptionalJwtGuard)
   @ApiBearerAuth('JWT-auth')
@@ -77,6 +79,7 @@ export class VerifaydaController {
   }
 
   @Get('complete')
+  @IsPublic()
   @ApiOperation({
     summary: 'Complete a verification (Fayda redirect / client callback lands here)',
     description: `This is the registered Fayda \`redirect_uri\`. Fayda redirects the browser here with \`?code&state\``,

apps/edr-passenger-api/src/seed/edr-passenger-org.seeder.ts

@@ -7,6 +7,7 @@ import {
   Role,
   RolePermission,
 } from '@tria-plc/iamapi-common';
+import { InjectDataSource } from '@nestjs/typeorm';
 import { DataSource, EntityManager, In } from 'typeorm';
 import { ERoleKey } from '@tria-plc/api-common/utils/enums/seed.enum';
 import {
@@ -25,7 +26,7 @@ type SeedOrganization = { id: string; key: string };
 export class EdrPassengerOrgSeeder {
   private readonly logger = new Logger(EdrPassengerOrgSeeder.name);
 
-  constructor(private readonly dataSource: DataSource) {}
+  constructor(@InjectDataSource() private readonly dataSource: DataSource) {}
 
   async run() {
     if (process.env[SEED_FLAG]?.trim().toLowerCase() !== 'true') {

apps/edr-passenger-api/src/seed/passenger-staff-users.seeder.ts

@@ -9,6 +9,7 @@ import {
   UserCredential,
   UserRole,
 } from '@tria-plc/iamapi-common';
+import { InjectDataSource } from '@nestjs/typeorm';
 import { DataSource } from 'typeorm';
 
 const SEED_FLAG = 'SEED_PASSENGER_STAFF';
@@ -25,7 +26,7 @@ const STAFF_USERS = [
 export class PassengerStaffUsersSeeder {
   private readonly logger = new Logger(PassengerStaffUsersSeeder.name);
 
-  constructor(private readonly dataSource: DataSource) {}
+  constructor(@InjectDataSource() private readonly dataSource: DataSource) {}
 
   async run() {
     if (process.env[SEED_FLAG]?.trim().toLowerCase() !== 'true') {