Compare commits

..
Author SHA1 Message Date
marcos-silva-rodrigues c8a3ace052 UPDATE: change in-factory, pi-factory, tr-factory to prod 2025-04-14 14:14:46 -03:00
Marcos Rodrigues Silva c059ac45bf Merge pull request #289 from dadosfera/fix/network-policy
FIX: send origin removing http prefix
2025-04-14 08:46:56 -03:00
Marcos Rodrigues Silva aa3a1cc300 Merge pull request #288 from dadosfera/fix/network-policy
FIX: remove host and send custom host
2025-04-14 08:32:19 -03:00
Marcos Rodrigues Silva 9f427f5873 Merge pull request #287 from dadosfera/fix/network-policy
UPDATE: send host
2025-04-11 18:03:11 -03:00
Marcos Rodrigues Silva 56a9d52466 Merge pull request #286 from dadosfera/fix/network-policy
UPDATE: send origin header
2025-04-11 17:37:56 -03:00
rafael-moraes-ddf 66affed338 Merge pull request #285 from dadosfera/feature/logs_dashboard
Feature/logs dashboard
2025-04-11 16:22:05 -03:00
Rafael Moraes a8ae07e6c4 FEAT: url fix 2025-04-11 16:06:55 -03:00
Rafael Moraes 0df286a5f7 FEAT: att docsfera 2025-04-11 15:23:41 -03:00
Marcos Rodrigues Silva 519a8feb14 Merge pull request #284 from dadosfera/fix/network-policy
UPDATE: send host
2025-04-11 15:08:01 -03:00
Marcos Rodrigues Silva 3c59602666 Merge pull request #283 from dadosfera/fix/network-policy
FIX: remove host metadata
2025-04-10 11:55:32 -03:00
Marcos Rodrigues Silva a24d29b56b Merge pull request #282 from dadosfera/fix/network-policy
FIX: send host metadata
2025-04-10 11:47:09 -03:00
Marcos Rodrigues Silva d4a6d2fb4a Merge pull request #281 from dadosfera/fix/network-policy
Fix/network policy
2025-04-10 11:34:00 -03:00
Rafael Moraes d310ec2b93 FEAT: logs_dasboard 2025-04-07 11:55:06 -03:00
Marcos Rodrigues Silva a2c1d79247 Merge pull request #276 from dadosfera/release/march
FIX: correct env
2025-04-02 17:06:25 -03:00
6 changed files with 104 additions and 75 deletions
+24 -13
View File
@@ -22,7 +22,7 @@
} }
}, },
{ {
"name": "origin", "name": "host",
"required": true, "required": true,
"in": "header", "in": "header",
"schema": { "schema": {
@@ -74,7 +74,7 @@
} }
}, },
{ {
"name": "origin", "name": "host",
"required": true, "required": true,
"in": "header", "in": "header",
"schema": { "schema": {
@@ -265,14 +265,6 @@
], ],
"type": "string" "type": "string"
} }
},
{
"name": "origin",
"required": true,
"in": "header",
"schema": {
"type": "string"
}
} }
], ],
"responses": { "responses": {
@@ -5607,6 +5599,28 @@
] ]
} }
}, },
"/customers/logs-dashboard": {
"get": {
"operationId": "CustomersController_getCustomerMixPanelLogsDashboard",
"parameters": [],
"responses": {
"200": {
"description": ""
}
},
"tags": [
"Customers"
],
"security": [
{
"access-token": []
},
{
"access-token": []
}
]
}
},
"/open-data/sharing-ocean-data": { "/open-data/sharing-ocean-data": {
"post": { "post": {
"operationId": "OpenDataController_createUser", "operationId": "OpenDataController_createUser",
@@ -5779,9 +5793,6 @@
} }
}, },
"responses": { "responses": {
"200": {
"description": ""
},
"201": { "201": {
"description": "", "description": "",
"content": { "content": {
+3 -3
View File
@@ -9,11 +9,11 @@ charts:
- name: hostname - name: hostname
value: maestro.stg.dadosfera.ai value: maestro.stg.dadosfera.ai
- name: maestro.pi_factory_url - name: maestro.pi_factory_url
value: pi-factory.stg.dadosfera.ai value: pi-factory.dadosfera.ai
- name: maestro.in_factory_url - name: maestro.in_factory_url
value: in-factory.stg.dadosfera.ai value: in-factory.dadosfera.ai
- name: maestro.tr_factory_url - name: maestro.tr_factory_url
value: in-factory.stg.dadosfera.ai value: in-factory.dadosfera.ai
- name: maestro.open_customer_id - name: maestro.open_customer_id
value: b3e3dfe5-b992-4586-a73c-c0b0c00f615d value: b3e3dfe5-b992-4586-a73c-c0b0c00f615d
- name: maestro.open_group_id - name: maestro.open_group_id
+21 -26
View File
@@ -54,6 +54,7 @@ import { LanguageEnum } from 'src/utils/languages.enum';
import { Language } from 'src/decorators/language.decorator'; import { Language } from 'src/decorators/language.decorator';
import { ApiInternalOnlyEndpoint } from 'src/decorators/swagger.decorator'; import { ApiInternalOnlyEndpoint } from 'src/decorators/swagger.decorator';
@ApiTags('Auth') @ApiTags('Auth')
@ApiHeaders([{ name: 'dadosfera-lang', enum: LanguageEnum, required: false }]) @ApiHeaders([{ name: 'dadosfera-lang', enum: LanguageEnum, required: false }])
@UseFilters(new GrpcToHttpExceptionFilter()) @UseFilters(new GrpcToHttpExceptionFilter())
@@ -62,6 +63,7 @@ export class AuthController {
logger: DadosferaLogger; logger: DadosferaLogger;
redirectUrl: string; redirectUrl: string;
constructor( constructor(
@Inject(DadosferaLogger) @Inject(DadosferaLogger)
dadosferaLogger: DadosferaLogger, dadosferaLogger: DadosferaLogger,
@@ -86,7 +88,7 @@ export class AuthController {
async signIn( async signIn(
@Body() { username, password, totp }: AuthSignInReq, @Body() { username, password, totp }: AuthSignInReq,
@Language() language: LanguageEnum, @Language() language: LanguageEnum,
@Headers('origin') origin: string, @Headers('origin') origin: string
): Promise<AuthSignInRes> { ): Promise<AuthSignInRes> {
this.logger.info('/auth - SignIn'); this.logger.info('/auth - SignIn');
const frontHost = origin.replace(/^https?:\/\//, ''); const frontHost = origin.replace(/^https?:\/\//, '');
@@ -101,15 +103,15 @@ export class AuthController {
async refreshAccessToken( async refreshAccessToken(
@Body() body: AuthRefreshAccessTokenReq, @Body() body: AuthRefreshAccessTokenReq,
@Language() language: LanguageEnum, @Language() language: LanguageEnum,
@Headers('origin') origin: string, @Headers('host') host: string
) { ) {
this.logger.info('/auth - RefreshAccessToken'); this.logger.info('/auth - RefreshAccessToken');
const { refreshToken, customerName: customer_name } = body; const { refreshToken, customerName: customer_name } = body;
const frontHost = origin.replace(/^https?:\/\//, '');
const metadata = PackTheMetadata({ const metadata = PackTheMetadata({
language,
customer_name, customer_name,
custom_host: frontHost, language,
host
}); });
return this.authClient.refreshAccessToken({ refreshToken }, metadata); return this.authClient.refreshAccessToken({ refreshToken }, metadata);
@@ -183,23 +185,16 @@ export class AuthController {
@ApiInternalOnlyEndpoint() @ApiInternalOnlyEndpoint()
@Post('confirm-reset-password') @Post('confirm-reset-password')
@HttpCode(HttpStatus.OK) @HttpCode(HttpStatus.OK)
async confirmResetPassword( async confirmResetPassword(@Body() body: AuthConfirmResetPasswordRequest) {
@Body() body: AuthConfirmResetPasswordRequest,
@Headers('origin') origin: string,
) {
this.logger.info('/auth - confirm-reset-password'); this.logger.info('/auth - confirm-reset-password');
const frontHost = origin.replace(/^https?:\/\//, '');
const metadata = PackTheMetadata({ custom_host: frontHost });
const { username, code, newPassword } = body; const { username, code, newPassword } = body;
return this.authClient.confirmResetPassword( return this.authClient.confirmResetPassword({
{ username,
username, code,
code, newPassword,
newPassword, });
},
metadata,
);
} }
@ApiInternalOnlyEndpoint() @ApiInternalOnlyEndpoint()
@@ -365,7 +360,7 @@ export class AuthController {
async blockUsers( async blockUsers(
@Language() language: LanguageEnum, @Language() language: LanguageEnum,
@User() user: RequestUser, @User() user: RequestUser,
@Body() body: BulkEditRequest, @Body() body: BulkEditRequest
) { ) {
this.logger.info('blockUsers - Starting request'); this.logger.info('blockUsers - Starting request');
@@ -375,8 +370,8 @@ export class AuthController {
this.logger.debug('Calling blockUsers service', { this.logger.debug('Calling blockUsers service', {
metadata: { metadata: {
access_token: metadata.get('access_token'), access_token: metadata.get('access_token'),
language: metadata.get('language'), language: metadata.get('language')
}, }
}); });
const result = await this.authClient.blockUsers(body.users, metadata); const result = await this.authClient.blockUsers(body.users, metadata);
@@ -385,7 +380,7 @@ export class AuthController {
} catch (error) { } catch (error) {
this.logger.error('blockUsers - Error', { this.logger.error('blockUsers - Error', {
error: error.message, error: error.message,
stack: error.stack, stack: error.stack
}); });
throw error; throw error;
} }
@@ -398,7 +393,7 @@ export class AuthController {
async unblockUsers( async unblockUsers(
@Language() language: LanguageEnum, @Language() language: LanguageEnum,
@User() user: RequestUser, @User() user: RequestUser,
@Body() body: BulkEditRequest, @Body() body: BulkEditRequest
) { ) {
this.logger.info('unblockUsers'); this.logger.info('unblockUsers');
const metadata = PackTheMetadata(user); const metadata = PackTheMetadata(user);
@@ -413,11 +408,11 @@ export class AuthController {
async resetUsers( async resetUsers(
@Language() language: LanguageEnum, @Language() language: LanguageEnum,
@User() user: RequestUser, @User() user: RequestUser,
@Body() body: BulkEditRequest, @Body() body: BulkEditRequest
) { ) {
this.logger.info('resetUsers'); this.logger.info('resetUsers');
const metadata = PackTheMetadata(user); const metadata = PackTheMetadata(user);
return this.authClient.resetUsers(body.users, metadata); return this.authClient.resetUsers(body.users, metadata);
} }
} }
+19 -30
View File
@@ -113,21 +113,19 @@ export class AuthClientService implements OnModuleInit {
); );
} }
async confirmResetPassword( async confirmResetPassword({
{ username, code, newPassword }: AuthConfirmResetPasswordRequest, username,
metadata: Metadata, code,
) { newPassword,
}: AuthConfirmResetPasswordRequest) {
this.logger.info('confirmResetPassword'); this.logger.info('confirmResetPassword');
return lastValueFrom( return lastValueFrom(
this.authService.AuthConfirmResetPassword( this.authService.AuthConfirmResetPassword({
{ username,
username, code,
code, newPassword,
newPassword, }),
},
metadata,
),
); );
} }
@@ -172,18 +170,15 @@ export class AuthClientService implements OnModuleInit {
); );
} }
async blockUsers( async blockUsers(users: string[],metadata: Metadata): Promise<BulkEditResponse> {
users: string[],
metadata: Metadata,
): Promise<BulkEditResponse> {
this.logger.info('blockUsers - Service starting'); this.logger.info('blockUsers - Service starting');
try { try {
this.logger.debug('Calling BlockUser gRPC method', { this.logger.debug('Calling BlockUser gRPC method', {
metadata: { metadata: {
access_token: metadata.get('access_token'), access_token: metadata.get('access_token'),
language: metadata.get('language'), language: metadata.get('language')
}, }
}); });
const response = await lastValueFrom<BulkEditResponse>( const response = await lastValueFrom<BulkEditResponse>(
@@ -201,32 +196,26 @@ export class AuthClientService implements OnModuleInit {
} }
} }
async unblockUsers( async unblockUsers(users: string[],metadata: Metadata): Promise<BulkEditResponse> {
users: string[],
metadata: Metadata,
): Promise<BulkEditResponse> {
this.logger.info('unblockUsers'); this.logger.info('unblockUsers');
return await lastValueFrom( return await lastValueFrom(
this.authService.UnblockUser({ users }, metadata), this.authService.UnblockUser({ users }, metadata),
); );
} }
async resetUsers( async resetUsers(users: string[], metadata: Metadata): Promise<BulkEditResponse> {
users: string[],
metadata: Metadata,
): Promise<BulkEditResponse> {
this.logger.info('resetUsers'); this.logger.info('resetUsers');
try { try {
this.logger.debug('Calling ResetUser gRPC method', { this.logger.debug('Calling ResetUser gRPC method', {
metadata: { metadata: {
access_token: metadata.get('access_token'), access_token: metadata.get('access_token'),
language: metadata.get('language'), language: metadata.get('language')
}, }
}); });
const response = await lastValueFrom<BulkEditResponse>( const response = await lastValueFrom<BulkEditResponse>(
this.authService.ResetUser({ users }, metadata), this.authService.ResetUser({ users }, metadata)
); );
this.logger.info('resetUsers - Success', { response }); this.logger.info('resetUsers - Success', { response });
@@ -234,7 +223,7 @@ export class AuthClientService implements OnModuleInit {
} catch (error) { } catch (error) {
this.logger.error('resetUsers - Error', { this.logger.error('resetUsers - Error', {
error: error.message, error: error.message,
stack: error.stack, stack: error.stack
}); });
throw error; throw error;
} }
@@ -91,4 +91,21 @@ export class CustomersController {
const metadata = PackTheMetadata(user); const metadata = PackTheMetadata(user);
return this.customersService.getMonitoringDashboardUrl(metadata); return this.customersService.getMonitoringDashboardUrl(metadata);
} }
@Get('logs-dashboard')
@Authenticated()
@RequireAllPermissions(
PERMISSIONS_GROUPS.USERS.permissions.ADMIN,
)
async getCustomerMixPanelLogsDashboard(
@User() user: RequestUser,
): Promise<{ url: string }> {
this.logger.info('getLogsDashboardUrl');
const metadata = PackTheMetadata(user);
const result = await this.customersService.getLogsDashboardUrl(metadata);
return result;
}
} }
@@ -154,6 +154,23 @@ export class CustomersService implements OnModuleInit {
); );
logger.info('Done'); logger.info('Done');
return res;
}
async getLogsDashboardUrl(metadata: Metadata) {
logger.info('CustomersService - getMixPanelLogsDashboardUrl');
const res = await lastValueFrom(
this.pipelineReadService.PipelineV2GetDashboardUrl(
{
dashboard_id: '103',
exp: '15m',
metabase_customer_name: 'dadosferatech',
},
metadata,
),
);
logger.info('Done');
return res; return res;
} }
} }