From 43c06a9305b86c4c2ecdc5676ef0b6855f72c16b Mon Sep 17 00:00:00 2001 From: Artem Niehrieiev Date: Mon, 24 Feb 2025 10:37:49 +0000 Subject: [PATCH] Add show_test_connections field to user DTOs and services to support user test connection visibility in registration flows --- .../entities/connection/utils/build-created-connection.ds.ts | 1 + backend/src/entities/user/dto/found-user.dto.ts | 3 +++ backend/src/entities/user/user-helper.service.ts | 1 + backend/src/entities/user/utils/build-found-user.dto.ts | 1 + .../use-cases/register-invited-user-use.case.ts | 1 + .../use-cases/saas-usual-register-user.use.case.ts | 1 + 6 files changed, 8 insertions(+) diff --git a/backend/src/entities/connection/utils/build-created-connection.ds.ts b/backend/src/entities/connection/utils/build-created-connection.ds.ts index 3e5e7647c..18f6f4ce8 100644 --- a/backend/src/entities/connection/utils/build-created-connection.ds.ts +++ b/backend/src/entities/connection/utils/build-created-connection.ds.ts @@ -51,6 +51,7 @@ export function buildCreatedConnectionDs( is_2fa_enabled: user.isOTPEnabled, role: user.role, externalRegistrationProvider: user.externalRegistrationProvider, + show_test_connections: user.showTestConnections, }; }), }; diff --git a/backend/src/entities/user/dto/found-user.dto.ts b/backend/src/entities/user/dto/found-user.dto.ts index db089602d..ef67cf841 100644 --- a/backend/src/entities/user/dto/found-user.dto.ts +++ b/backend/src/entities/user/dto/found-user.dto.ts @@ -40,6 +40,9 @@ export class FoundUserDto { @ApiProperty({ enum: ExternalRegistrationProviderEnum }) externalRegistrationProvider: ExternalRegistrationProviderEnum; + + @ApiProperty({ default: true }) + show_test_connections: boolean; } export class SimpleFoundUserInfoDs { diff --git a/backend/src/entities/user/user-helper.service.ts b/backend/src/entities/user/user-helper.service.ts index be80cee99..de512c6a7 100644 --- a/backend/src/entities/user/user-helper.service.ts +++ b/backend/src/entities/user/user-helper.service.ts @@ -47,6 +47,7 @@ export class UserHelperService implements OnModuleInit { is_2fa_enabled: user.otpSecretKey !== null && user.isOTPEnabled, company: user.company ? { id: user.company.id } : null, externalRegistrationProvider: user.externalRegistrationProvider, + show_test_connections: user.showTestConnections, }; } diff --git a/backend/src/entities/user/utils/build-found-user.dto.ts b/backend/src/entities/user/utils/build-found-user.dto.ts index 3a4281e66..5d37c5db5 100644 --- a/backend/src/entities/user/utils/build-found-user.dto.ts +++ b/backend/src/entities/user/utils/build-found-user.dto.ts @@ -12,5 +12,6 @@ export function buildFoundUserDto(user: UserEntity): FoundUserDto { role: user.role, is_2fa_enabled: user.otpSecretKey !== null && user.isOTPEnabled, externalRegistrationProvider: user.externalRegistrationProvider, + show_test_connections: user.showTestConnections, }; } diff --git a/backend/src/microservices/saas-microservice/use-cases/register-invited-user-use.case.ts b/backend/src/microservices/saas-microservice/use-cases/register-invited-user-use.case.ts index d7422600d..e929eea82 100644 --- a/backend/src/microservices/saas-microservice/use-cases/register-invited-user-use.case.ts +++ b/backend/src/microservices/saas-microservice/use-cases/register-invited-user-use.case.ts @@ -82,6 +82,7 @@ export class SaasRegisterInvitedUserUseCase is_2fa_enabled: false, suspended: false, externalRegistrationProvider: savedUser.externalRegistrationProvider, + show_test_connections: savedUser.showTestConnections, }; } } diff --git a/backend/src/microservices/saas-microservice/use-cases/saas-usual-register-user.use.case.ts b/backend/src/microservices/saas-microservice/use-cases/saas-usual-register-user.use.case.ts index 46a554100..65c6b4ddd 100644 --- a/backend/src/microservices/saas-microservice/use-cases/saas-usual-register-user.use.case.ts +++ b/backend/src/microservices/saas-microservice/use-cases/saas-usual-register-user.use.case.ts @@ -108,6 +108,7 @@ export class SaasUsualRegisterUseCase is_2fa_enabled: false, suspended: false, externalRegistrationProvider: savedUser.externalRegistrationProvider, + show_test_connections: savedUser.showTestConnections, }; }