diff --git a/src/authentication/authentication.guard.ts b/src/authentication/authentication.guard.ts index 00edbd6..6236408 100644 --- a/src/authentication/authentication.guard.ts +++ b/src/authentication/authentication.guard.ts @@ -4,11 +4,12 @@ import { OnApplicationBootstrap, ExecutionContext, Logger, + Inject, } from '@nestjs/common'; import { Reflector } from '@nestjs/core'; import assert from 'assert'; import jwt from 'jsonwebtoken'; - +import { DadosferaLogger } from 'dadosfera-logs'; import { AuthClientService } from '../clients/auth/client.service'; import { Permission } from './permissions.enum'; import { @@ -24,15 +25,18 @@ import ErrorCodes from '../utils/errorCodes'; export class AuthenticationGuard implements CanActivate, OnApplicationBootstrap { - private readonly logger = new Logger(AuthenticationGuard.name); + logger: any; pems: Map; constructor( + @Inject(DadosferaLogger) + dadosferaLogger: DadosferaLogger, private reflector: Reflector, private authClient: AuthClientService, ) { this.pems = new Map(); + this.logger = dadosferaLogger.logger; } async onApplicationBootstrap() { @@ -125,7 +129,7 @@ export class AuthenticationGuard } catch (err) { // log errors if authentication is required if (mustBeAuthenticated) { - this.logger.log('Unable to verify duc access token\n' + err.stack); + this.logger.error('Unable to verify duc access token\n' + err.stack); } return false; diff --git a/src/clients/auth/client.service.ts b/src/clients/auth/client.service.ts index d4bac16..1c5397d 100644 --- a/src/clients/auth/client.service.ts +++ b/src/clients/auth/client.service.ts @@ -1,4 +1,4 @@ -import { Logger, OnModuleInit, Inject } from '@nestjs/common'; +import { OnModuleInit, Inject } from '@nestjs/common'; import { ClientGrpc } from '@nestjs/microservices'; import { DadosferaLogger } from 'dadosfera-logs'; @@ -31,10 +31,16 @@ import { import grpcHandler from '../../utils/grpcHandler'; export class AuthClientService implements OnModuleInit { - private readonly logger = new Logger(AuthClientService.name); + logger: any; private authService: AuthServiceInterface; - constructor(@Inject('DUC_PACKAGE') private readonly grpcClient: ClientGrpc) {} + constructor( + @Inject(DadosferaLogger) + dadosferaLogger: DadosferaLogger, + @Inject('DUC_PACKAGE') private readonly grpcClient: ClientGrpc, + ) { + this.logger = dadosferaLogger.logger; + } onModuleInit() { this.authService = this.grpcClient.getService( @@ -43,7 +49,7 @@ export class AuthClientService implements OnModuleInit { } async getPublicKeys() { - this.logger.log('GetPublicKeys'); + this.logger.info('GetPublicKeys'); return grpcHandler( this.authService.AuthGetPublicKeys({}), @@ -51,7 +57,7 @@ export class AuthClientService implements OnModuleInit { } async signIn({ username, password, totp }: AuthSignInRequest) { - this.logger.log('SignIn'); + this.logger.info('SignIn'); return grpcHandler( this.authService.AuthSignIn({ username, password, totp }), @@ -59,7 +65,7 @@ export class AuthClientService implements OnModuleInit { } async refreshAccessToken({ refreshToken }: AuthRefreshAccessTokenRequest) { - this.logger.log('RefreshAccessToken'); + this.logger.info('RefreshAccessToken'); return grpcHandler( this.authService.AuthRefreshAccessToken({ refreshToken }), @@ -71,7 +77,7 @@ export class AuthClientService implements OnModuleInit { oldPassword, newPassword, }: AuthChangePasswordRequest) { - this.logger.log('ChangePassword'); + this.logger.info('ChangePassword'); return grpcHandler( this.authService.AuthChangePassword({ @@ -83,7 +89,7 @@ export class AuthClientService implements OnModuleInit { } async resetPassword({ username }: AuthResetPasswordRequest) { - this.logger.log('resetPassword'); + this.logger.info('resetPassword'); return grpcHandler( this.authService.AuthResetPassword({ username }), @@ -94,7 +100,7 @@ export class AuthClientService implements OnModuleInit { username, code, }: AuthVerifyResetPasswordCodeRequest) { - this.logger.log('verifyResetPasswordCode'); + this.logger.info('verifyResetPasswordCode'); return grpcHandler( this.authService.AuthVerifyResetPasswordCode({ username, code }), @@ -106,7 +112,7 @@ export class AuthClientService implements OnModuleInit { code, newPassword, }: AuthConfirmResetPasswordRequest) { - this.logger.log('confirmResetPassword'); + this.logger.info('confirmResetPassword'); return grpcHandler( this.authService.AuthConfirmResetPassword({ @@ -118,7 +124,7 @@ export class AuthClientService implements OnModuleInit { } async enableTotpMFA({ accessToken, password }: AuthEnableTotpMfaRequest) { - this.logger.log('enableTotpMFA'); + this.logger.info('enableTotpMFA'); return grpcHandler( this.authService.AuthEnableTotpMfa({ accessToken, password }), @@ -126,7 +132,7 @@ export class AuthClientService implements OnModuleInit { } async disableTotpMFA({ accessToken, password }: AuthDisableTotpMfaRequest) { - this.logger.log('disableTotpMFA'); + this.logger.info('disableTotpMFA'); return grpcHandler( this.authService.AuthDisableTotpMfa({ accessToken, password }), @@ -134,7 +140,7 @@ export class AuthClientService implements OnModuleInit { } async dismissTotpMFA({ accessToken }: AuthDismissTotpMfaRequest) { - this.logger.log('dismissTotpMFA'); + this.logger.info('dismissTotpMFA'); return grpcHandler( this.authService.AuthDismissTotpMfa({ accessToken }), @@ -142,7 +148,7 @@ export class AuthClientService implements OnModuleInit { } async verifyTotp({ accessToken, totp }: AuthVerifyTotpMfaRequest) { - this.logger.log('disableTotpMFA'); + this.logger.info('disableTotpMFA'); return grpcHandler( this.authService.AuthVerifyTotpMfa({ accessToken, totp }), diff --git a/src/clients/connector/client.service.ts b/src/clients/connector/client.service.ts index e9b4ed1..e30af72 100644 --- a/src/clients/connector/client.service.ts +++ b/src/clients/connector/client.service.ts @@ -4,6 +4,7 @@ import { HttpException, HttpStatus, } from '@nestjs/common'; +import { DadosferaLogger } from 'dadosfera-logs'; import { ClientGrpc } from '@nestjs/microservices'; import { ConnectorManager } from '@victorradael/protospack-v2'; import { from } from 'rxjs'; @@ -11,9 +12,14 @@ import { from } from 'rxjs'; export class ConnectorClientService implements OnModuleInit { private connectorServiceRead: ConnectorManager.ReadService.ConnectorManagerReadServices; private connectorServiceWrite: ConnectorManager.WriteService.ConnectorManagerWriteServices; + logger: any; constructor( + @Inject(DadosferaLogger) + dadosferaLogger: DadosferaLogger, @Inject('CONNECTOR_PACKAGE') private readonly grpcClient: ClientGrpc, - ) {} + ) { + this.logger = dadosferaLogger.logger; + } onModuleInit() { this.connectorServiceWrite = @@ -49,22 +55,27 @@ export class ConnectorClientService implements OnModuleInit { resolve(x); }, error(err) { - console.log('Observable Error'); reject(err); }, complete() { - console.log('done'); + //console.log('done'); }, }); - }).catch((err) => { - console.log(err.details); - throw new HttpException( - err.details, - err.code === 6 ? HttpStatus.CONFLICT : 400, - ); - }); + }) + .then((res) => { + this.logger.info('Done'); + return res; + }) + .catch((err) => { + this.logger.error(err.details); + this.logger.error(err); + throw new HttpException( + err.details, + err.code === 6 ? HttpStatus.CONFLICT : 400, + ); + }); - console.log('ConnectorClientService', 'Upload'); + this.logger.info('ConnectorClientService - Upload'); return result; } @@ -86,22 +97,27 @@ export class ConnectorClientService implements OnModuleInit { resolve(x); }, error(err) { - console.log('Observable Error'); reject(err); }, complete() { - console.log('done'); + //console.log('done'); }, }); - }).catch((err) => { - console.log(err.details); - throw new HttpException( - err.details, - err.code === 6 ? HttpStatus.CONFLICT : 400, - ); - }); + }) + .then((res) => { + this.logger.info('Done'); + return res; + }) + .catch((err) => { + this.logger.error(err.details); + this.logger.error(err); + throw new HttpException( + err.details, + err.code === 6 ? HttpStatus.CONFLICT : 400, + ); + }); - console.log('ConnectorClientService', 'Upload'); + this.logger.info('ConnectorClientService - Upload'); return result; } @@ -119,21 +135,26 @@ export class ConnectorClientService implements OnModuleInit { resolve(x); }, error(err) { - console.log('Observable Error'); reject(err); }, complete() { - console.log('done'); + //console.log('done'); }, }); - }).catch((err) => { - throw new HttpException( - err.details, - err.code === 6 ? HttpStatus.CONFLICT : 400, - ); - }); + }) + .then((res) => { + this.logger.info('Done'); + return res; + }) + .catch((err) => { + this.logger.error(err); + throw new HttpException( + err.details, + err.code === 6 ? HttpStatus.CONFLICT : 400, + ); + }); - console.log('ConnectorClientService', 'getAllConnectors'); + this.logger.info('ConnectorClientService - getAllConnectors'); return result; } @@ -150,21 +171,26 @@ export class ConnectorClientService implements OnModuleInit { resolve(x); }, error(err) { - console.log('Observable Error'); reject(err); }, complete() { - console.log('done'); + //console.log('done'); }, }); - }).catch((err) => { - throw new HttpException( - err.details, - err.code === 6 ? HttpStatus.CONFLICT : 400, - ); - }); + }) + .then((res) => { + this.logger.info('Done'); + return res; + }) + .catch((err) => { + this.logger.error(err); + throw new HttpException( + err.details, + err.code === 6 ? HttpStatus.CONFLICT : 400, + ); + }); - console.log('ConnectorClientService', 'getAllConnectors'); + this.logger.info('ConnectorClientService - getAllConnectors'); return result; } @@ -181,21 +207,26 @@ export class ConnectorClientService implements OnModuleInit { resolve(x); }, error(err) { - console.log('Observable Error'); reject(err); }, complete() { - console.log('done'); + //console.log('done'); }, }); - }).catch((err) => { - throw new HttpException( - err.details, - err.code === 6 ? HttpStatus.CONFLICT : 400, - ); - }); + }) + .then((res) => { + this.logger.info('Done'); + return res; + }) + .catch((err) => { + this.logger.error(err); + throw new HttpException( + err.details, + err.code === 6 ? HttpStatus.CONFLICT : 400, + ); + }); - console.log('ConnectorClientService', 'getAllConnectors'); + this.logger.info('ConnectorClientService - getAllConnectors'); return result; } @@ -213,21 +244,26 @@ export class ConnectorClientService implements OnModuleInit { resolve(x); }, error(err) { - console.log('Observable Error'); reject(err); }, complete() { - console.log('done'); + //console.log('done'); }, }); - }).catch((err) => { - throw new HttpException( - err.details, - err.code === 6 ? HttpStatus.CONFLICT : 400, - ); - }); + }) + .then((res) => { + this.logger.info('Done'); + return res; + }) + .catch((err) => { + this.logger.error(err); + throw new HttpException( + err.details, + err.code === 6 ? HttpStatus.CONFLICT : 400, + ); + }); - console.log('ConnectorClientService', 'getAllConnectors'); + this.logger.info('ConnectorClientService - getAllConnectors'); return result; } @@ -245,21 +281,26 @@ export class ConnectorClientService implements OnModuleInit { resolve(x); }, error(err) { - console.log('Observable Error'); reject(err); }, complete() { - console.log('done'); + //console.log('done'); }, }); - }).catch((err) => { - throw new HttpException( - err.details, - err.code === 6 ? HttpStatus.CONFLICT : 400, - ); - }); + }) + .then((res) => { + this.logger.info('Done'); + return res; + }) + .catch((err) => { + this.logger.error(err); + throw new HttpException( + err.details, + err.code === 6 ? HttpStatus.CONFLICT : 400, + ); + }); - console.log('ConnectorClientService', 'getAllConnectors'); + this.logger.info('ConnectorClientService - getAllConnectors'); return result; } diff --git a/src/clients/inputs/client.service.ts b/src/clients/inputs/client.service.ts index 5855ff7..826a276 100644 --- a/src/clients/inputs/client.service.ts +++ b/src/clients/inputs/client.service.ts @@ -280,7 +280,7 @@ export class InputsClientService implements OnModuleInit { }; const { data } = await axios(axiosRequestConfig).catch((err) => { - console.log(err.response.data); + this.logger.error(err.response.data); throw new HttpException(err.response.data.message, err.response.status); }); for (const key in get_tokens_set_response) { diff --git a/src/clients/permissions/client.service.ts b/src/clients/permissions/client.service.ts index 7e9236b..a5a53ea 100644 --- a/src/clients/permissions/client.service.ts +++ b/src/clients/permissions/client.service.ts @@ -1,4 +1,4 @@ -import { Logger, OnModuleInit, Inject } from '@nestjs/common'; +import { OnModuleInit, Inject } from '@nestjs/common'; import { ClientGrpc } from '@nestjs/microservices'; import { ProtoServices } from '@victorradael/protospack-v2/dist/lib/Duc'; @@ -7,14 +7,20 @@ import { Empty, InjectPermissionsRequest, } from '@victorradael/protospack-v2/dist/lib/Duc/interfaces/messages'; - +import { DadosferaLogger } from 'dadosfera-logs'; import grpcHandler from '../../utils/grpcHandler'; export class PermissionsClientService implements OnModuleInit { - private readonly logger = new Logger(PermissionsClientService.name); + logger: any; private permissionsService: PermissionsServiceInterface; - constructor(@Inject('DUC_PACKAGE') private readonly grpcClient: ClientGrpc) {} + constructor( + @Inject(DadosferaLogger) + dadosferaLogger: DadosferaLogger, + @Inject('DUC_PACKAGE') private readonly grpcClient: ClientGrpc, + ) { + this.logger = dadosferaLogger.logger; + } onModuleInit() { this.permissionsService = @@ -24,7 +30,7 @@ export class PermissionsClientService implements OnModuleInit { } async injectPermissions({ permissions }: InjectPermissionsRequest) { - this.logger.log('InjectPermissions'); + this.logger.info('InjectPermissions'); return grpcHandler( this.permissionsService.InjectPermissions({ permissions }), diff --git a/src/clients/pipelines/client.service.ts b/src/clients/pipelines/client.service.ts index 626f013..555110e 100644 --- a/src/clients/pipelines/client.service.ts +++ b/src/clients/pipelines/client.service.ts @@ -41,17 +41,22 @@ export class PipelinesClientService implements OnModuleInit { } async create(@Payload() createPipelineDto: ICreatePipelineDto) { - console.log('PipelinesClientService', 'Create'); + this.logger.info('PipelinesClientService - Create'); const createPipelineResponse = await lastValueFrom( this.pipelineService.Create(objectSnakeToCamel(createPipelineDto)), - ).catch((error: { details: string }) => { - if (error.details.includes('INVALID_REQUEST')) { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - const [errorType, message] = error.details.split('|'); - throw new BadRequestException(message); - } - throw new InternalServerErrorException(error.details); - }); + ) + .then((res) => { + this.logger.info('Done'); + return res; + }) + .catch((error: { details: string }) => { + if (error.details.includes('INVALID_REQUEST')) { + // eslint-disable-next-line @typescript-eslint/no-unused-vars + const [errorType, message] = error.details.split('|'); + throw new BadRequestException(message); + } + throw new InternalServerErrorException(error.details); + }); return createPipelineResponse; } @@ -125,7 +130,7 @@ export class PipelinesClientService implements OnModuleInit { reject(err); }, complete() { - console.log('done'); + //console.log('done'); }, }); }) diff --git a/src/modules/auth/auth.controller.ts b/src/modules/auth/auth.controller.ts index 97e1794..712b744 100644 --- a/src/modules/auth/auth.controller.ts +++ b/src/modules/auth/auth.controller.ts @@ -1,5 +1,4 @@ import { - Logger, Body, Controller, Headers, @@ -7,6 +6,7 @@ import { HttpCode, HttpStatus, OnApplicationBootstrap, + Inject, } from '@nestjs/common'; import { ApiTags } from '@nestjs/swagger'; import { @@ -24,23 +24,26 @@ import { import { AuthClientService } from '../../clients/auth/client.service'; import { PermissionsClientService } from '../../clients/permissions/client.service'; import { Permissions } from '../../authentication/permissions.enum'; - +import { DadosferaLogger } from 'dadosfera-logs'; import ErrorBuilder from '../../utils/ErrorBuilder'; -import { LoginDto } from './dtos/login'; @ApiTags('Auth') @Controller('auth') export class AuthController implements OnApplicationBootstrap { - private readonly logger = new Logger(AuthController.name); + logger: any; constructor( + @Inject(DadosferaLogger) + dadosferaLogger: DadosferaLogger, private authClient: AuthClientService, private permissionsClient: PermissionsClientService, - ) {} + ) { + this.logger = dadosferaLogger.logger; + } // internally used to send permissions to duc on microservice startup async onApplicationBootstrap() { - this.logger.log('sending permissions to DUC...'); + this.logger.info('sending permissions to DUC...'); const permissions = Object.values(Permissions).flatMap((namespace) => Object.values(namespace), @@ -53,7 +56,7 @@ export class AuthController implements OnApplicationBootstrap { err.code === 'No connection established' && process.env.LOCAL_ENV === 'true' ) { - return this.logger.log( + return this.logger.info( "couldn't connect to DUC. suppresing in local env", ); } @@ -65,7 +68,7 @@ export class AuthController implements OnApplicationBootstrap { @Post('sign-in') @HttpCode(HttpStatus.OK) async signIn(@Body() { username, password, totp }: AuthSignInRequest) { - this.logger.log(`/auth`, 'SignIn'); + this.logger.info('/auth - SignIn'); return this.authClient.signIn({ username, password, totp }); } @@ -75,7 +78,7 @@ export class AuthController implements OnApplicationBootstrap { async refreshAccessToken( @Body() { refreshToken }: AuthRefreshAccessTokenRequest, ) { - this.logger.log(`/auth`, 'RefreshAccessToken'); + this.logger.info('/auth - RefreshAccessToken'); return this.authClient.refreshAccessToken({ refreshToken }); } @@ -86,7 +89,7 @@ export class AuthController implements OnApplicationBootstrap { @Body() body: AuthChangePasswordRequest, @Headers() headers, ) { - this.logger.log(`/auth`, 'change-password'); + this.logger.info('/auth - change-password'); const { oldPassword, newPassword } = body; const { authorization: accessToken } = headers; @@ -101,7 +104,7 @@ export class AuthController implements OnApplicationBootstrap { @Post('reset-password') @HttpCode(HttpStatus.OK) async resetPassword(@Body() body: AuthResetPasswordRequest) { - this.logger.log(`/auth`, 'reset-password'); + this.logger.info('/auth - reset-password'); const { username } = body; @@ -113,7 +116,7 @@ export class AuthController implements OnApplicationBootstrap { async verifyResetPasswordCode( @Body() body: AuthVerifyResetPasswordCodeRequest, ) { - this.logger.log(`/auth`, 'verify-reset-password-code'); + this.logger.info('/auth - verify-reset-password-code'); const { username, code } = body; @@ -123,7 +126,7 @@ export class AuthController implements OnApplicationBootstrap { @Post('confirm-reset-password') @HttpCode(HttpStatus.OK) async confirmResetPassword(@Body() body: AuthConfirmResetPasswordRequest) { - this.logger.log(`/auth`, 'confirm-reset-password'); + this.logger.info('/auth - confirm-reset-password'); const { username, code, newPassword } = body; @@ -140,7 +143,7 @@ export class AuthController implements OnApplicationBootstrap { @Body() body: AuthEnableTotpMfaRequest, @Headers() headers, ) { - this.logger.log(`/auth`, 'enable-totp'); + this.logger.info('/auth - enable-totp'); const { password } = body; const { authorization: accessToken } = headers; @@ -154,7 +157,7 @@ export class AuthController implements OnApplicationBootstrap { @Body() body: AuthDisableTotpMfaRequest, @Headers() headers, ) { - this.logger.log(`/auth`, 'disable-totp'); + this.logger.info('/auth - disable-totp'); const { password } = body; const { authorization: accessToken } = headers; @@ -165,7 +168,7 @@ export class AuthController implements OnApplicationBootstrap { @Post('dismiss-totp') @HttpCode(HttpStatus.OK) async dismissTotpMFA(@Headers() headers) { - this.logger.log(`/auth`, 'disable-totp'); + this.logger.info('/auth - disable-totp'); const { authorization: accessToken } = headers; @@ -175,7 +178,7 @@ export class AuthController implements OnApplicationBootstrap { @Post('verify-totp') @HttpCode(HttpStatus.OK) async verifyTotp(@Body() body: AuthVerifyTotpMfaRequest, @Headers() headers) { - this.logger.log(`/auth`, 'enable-totp'); + this.logger.info('/auth - enable-totp'); const { totp } = body; const { authorization: accessToken } = headers; diff --git a/src/modules/connector/connector.controller.ts b/src/modules/connector/connector.controller.ts index e5bf810..85c8da1 100644 --- a/src/modules/connector/connector.controller.ts +++ b/src/modules/connector/connector.controller.ts @@ -10,6 +10,7 @@ import { Query, UploadedFile, UseInterceptors, + Inject, } from '@nestjs/common'; import { FileInterceptor } from '@nestjs/platform-express'; import { ApiBearerAuth, ApiConsumes, ApiTags } from '@nestjs/swagger'; @@ -21,12 +22,20 @@ import { GetAllDto } from './dtos/get-all'; import { RemoveTagDto } from './dtos/remove-tag'; import { UpdateDto } from './dtos/update'; import { UploadFileDto } from './dtos/upload-file'; +import { DadosferaLogger } from 'dadosfera-logs'; @ApiTags('connectors') @ApiBearerAuth() @Controller('connectors') export class ConnectorController { - constructor(private connectorClientService: ConnectorClientService) {} + logger: any; + constructor( + @Inject(DadosferaLogger) + dadosferaLogger: DadosferaLogger, + private connectorClientService: ConnectorClientService, + ) { + this.logger = dadosferaLogger.logger; + } @Post() @ApiConsumes('multipart/form-data') @@ -35,7 +44,7 @@ export class ConnectorController { @UploadedFile() file, @Body() body: CreateConnectorDto, ) { - console.log(`/upload`, 'Upload Connector Route'); + this.logger.info('/upload - Upload Connector Route'); const response = await this.connectorClientService.uploadConnector({ file, @@ -49,7 +58,7 @@ export class ConnectorController { @ApiConsumes('multipart/form-data') @UseInterceptors(FileInterceptor('file')) async uploadFile(@UploadedFile() file, @Body() { name }: UploadFileDto) { - console.log(`/upload`, 'Upload Connector Route'); + this.logger.info('/upload - Upload Connector Route'); const response = await this.connectorClientService.uploadFile({ file, @@ -61,7 +70,7 @@ export class ConnectorController { @Get() async getAllConnectors(@Query() queries: GetAllDto) { - console.log(`/upload`, 'Upload Connector Route'); + this.logger.info('/upload - Upload Connector Route'); const { filters, search } = queries; @@ -83,7 +92,7 @@ export class ConnectorController { @Param('plugin') plugin: string, @Query('version') version: string, ) { - console.log(`/upload`, 'Upload Connector Route'); + this.logger.info('/upload - Upload Connector Route'); const pluginId = `${plugin}-${version}`; @@ -102,7 +111,7 @@ export class ConnectorController { @Param('plugin') plugin: string, @Query('version') version: string, ) { - console.log(`/upload`, 'Upload Connector Route'); + this.logger.info('/upload - Upload Connector Route'); const pluginId = `${plugin}-${version}`; @@ -122,7 +131,7 @@ export class ConnectorController { @Param('plugin') plugin: string, @Body() body: UpdateDto, ) { - console.log(`/upload`, 'Upload Connector Route'); + this.logger.info('/upload - Upload Connector Route'); const changes = body; @@ -142,7 +151,7 @@ export class ConnectorController { @Param('plugin') plugin: string, @Body() body: AddTagDto, ) { - console.log(`/upload`, 'Upload Connector Route'); + this.logger.info('/upload - Upload Connector Route'); const { tags } = body; @@ -168,7 +177,7 @@ export class ConnectorController { @Param('plugin') plugin: string, @Body() body: RemoveTagDto, ) { - console.log(`/upload`, 'Upload Connector Route'); + this.logger.info('/upload - Upload Connector Route'); const { tags } = body; const remove = tags; @@ -195,7 +204,7 @@ export class ConnectorController { @Param('plugin') plugin: string, @Body() { version }: DeleteConnectorDto, ) { - console.log(`/upload`, 'Upload Connector Route'); + this.logger.info('/upload - Upload Connector Route'); const response: any = await this.connectorClientService.deleteConnector( plugin, diff --git a/src/modules/health/health.controller.ts b/src/modules/health/health.controller.ts index 1617c9c..c272455 100644 --- a/src/modules/health/health.controller.ts +++ b/src/modules/health/health.controller.ts @@ -1,15 +1,23 @@ -import { Controller, Get } from '@nestjs/common'; +import { Controller, Get, Inject } from '@nestjs/common'; import { ApiTags } from '@nestjs/swagger'; import { HealthService } from './health.service'; +import { DadosferaLogger } from 'dadosfera-logs'; @ApiTags('Health') @Controller('health') export class HealthController { - constructor(private readonly healthService: HealthService) {} + logger: any; + constructor( + @Inject(DadosferaLogger) + dadosferaLogger: DadosferaLogger, + private readonly healthService: HealthService, + ) { + this.logger = dadosferaLogger.logger; + } @Get() check() { - console.log(`/health`, 'check'); + this.logger.info('/health - check'); return this.healthService.check(); } } diff --git a/src/modules/health/health.service.ts b/src/modules/health/health.service.ts index 8754715..449ba48 100644 --- a/src/modules/health/health.service.ts +++ b/src/modules/health/health.service.ts @@ -1,9 +1,17 @@ -import { Injectable } from '@nestjs/common'; +import { Inject, Injectable } from '@nestjs/common'; +import { DadosferaLogger } from 'dadosfera-logs'; @Injectable() export class HealthService { + logger: any; + constructor( + @Inject(DadosferaLogger) + dadosferaLogger: DadosferaLogger, + ) { + this.logger = dadosferaLogger.logger; + } check() { - console.log('HEALTH'); + this.logger.info('HEALTH'); return { message: 'Ok' }; } } diff --git a/src/modules/inputs/inputs.controller.ts b/src/modules/inputs/inputs.controller.ts index ae37db6..8e11df6 100644 --- a/src/modules/inputs/inputs.controller.ts +++ b/src/modules/inputs/inputs.controller.ts @@ -126,7 +126,7 @@ export class InputsController { @ApiOkResponse({ type: Input }) async reCreate(@Param('id') id: string, @Body() input: CreateInputReq) { if (!id) id = id; - console.log(`POST /${id}`, 'ON RECREATE ROUTE'); + this.logger.info(`POST /${id}`, 'ON RECREATE ROUTE'); const response = await this.inputService.reCreate(input);