Compare commits

...
Author SHA1 Message Date
marcos-silva-rodrigues f661055ae8 FIX: send all metadata 2025-04-08 13:49:10 -03:00
Marcos Rodrigues Silva 67a15b36b3 Merge pull request #275 from dadosfera/release/march
FIX: correct env
2025-04-02 14:07:52 -03:00
marcos-silva-rodrigues f396cdb2d3 FIX: correct env 2025-04-02 14:01:54 -03:00
Guilherme Maioli 01da6becff Merge pull request #274 from dadosfera/UPDATE/helmfile
UPDATE: return variable to stg.
2025-03-31 14:08:00 -03:00
Guilherme Maioli 003c9b176c UPDATE: return variable to stg. 2025-03-31 14:04:34 -03:00
Marcos Rodrigues Silva 0a5315fb95 Merge pull request #273 from dadosfera/feature/block_and_reset_users
FEAT: block, unblock and reset users
2025-03-28 17:00:49 -03:00
marcos-silva-rodrigues 5a4d578d13 FEAT: block, unblock and reset users 2025-03-28 12:30:55 -03:00
7 changed files with 34 additions and 44 deletions
+2 -2
View File
@@ -15,8 +15,8 @@ charts:
- name: maestro.tr_factory_url - name: maestro.tr_factory_url
value: in-factory.dadosfera.ai value: in-factory.dadosfera.ai
- name: maestro.open_customer_id - name: maestro.open_customer_id
value: f239718a-a271-4ef9-ae7e-02a2f0f3aa6e value: b3e3dfe5-b992-4586-a73c-c0b0c00f615d
- name: maestro.open_group_id - name: maestro.open_group_id
value: 401573bb-334f-44b2-b30e-88d4cea31ae9 value: c0afdcce-c5be-40d0-9d1d-2d271121f14a
- name: replicaCount - name: replicaCount
value: 2 value: 2
+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.dadosfera.ai value: pi-factory.stg.dadosfera.ai
- name: maestro.in_factory_url - name: maestro.in_factory_url
value: in-factory.dadosfera.ai value: in-factory.stg.dadosfera.ai
- name: maestro.tr_factory_url - name: maestro.tr_factory_url
value: in-factory.dadosfera.ai value: in-factory.stg.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
+4 -4
View File
@@ -12,7 +12,7 @@
"@aws-sdk/client-secrets-manager": "^3.414.0", "@aws-sdk/client-secrets-manager": "^3.414.0",
"@dadosfera/dadosfera-logs": "^1.0.0-beta.4", "@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
"@dadosfera/protospack": "2.5.3", "@dadosfera/protospack": "2.5.3",
"@dadosfera/protospack-v2": "3.37.0-alpha.18", "@dadosfera/protospack-v2": "3.37.0-alpha.19",
"@grpc/grpc-js": "^1.9.3", "@grpc/grpc-js": "^1.9.3",
"@grpc/proto-loader": "^0.7.9", "@grpc/proto-loader": "^0.7.9",
"@nestjs/cli": "^9.5.0", "@nestjs/cli": "^9.5.0",
@@ -1397,9 +1397,9 @@
} }
}, },
"node_modules/@dadosfera/protospack-v2": { "node_modules/@dadosfera/protospack-v2": {
"version": "3.37.0-alpha.18", "version": "3.37.0-alpha.19",
"resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.37.0-alpha.18.tgz", "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.37.0-alpha.19.tgz",
"integrity": "sha512-hhcskw1DT9jtmJcQXrFwgUnTti6ZALZM04YevJgqQNR6yS+C6040UZf3c/6vcjRm5/9h9OMiJJApzivPTBK46g==", "integrity": "sha512-+F2sMJszfXRqWuN5ae+v7MqHhJyg7TgVvnuFBKUOwHvBoWCfAUnIm9XGEA/YjPpRUa1gM0nnKL8SpBFf43Q1aA==",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@grpc/grpc-js": "^1.9.3", "@grpc/grpc-js": "^1.9.3",
+1 -1
View File
@@ -30,7 +30,7 @@
"@aws-sdk/client-secrets-manager": "^3.414.0", "@aws-sdk/client-secrets-manager": "^3.414.0",
"@dadosfera/dadosfera-logs": "^1.0.0-beta.4", "@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
"@dadosfera/protospack": "2.5.3", "@dadosfera/protospack": "2.5.3",
"@dadosfera/protospack-v2": "3.37.0-alpha.18", "@dadosfera/protospack-v2": "3.37.0-alpha.19",
"@grpc/grpc-js": "^1.9.3", "@grpc/grpc-js": "^1.9.3",
"@grpc/proto-loader": "^0.7.9", "@grpc/proto-loader": "^0.7.9",
"@nestjs/cli": "^9.5.0", "@nestjs/cli": "^9.5.0",
+11 -18
View File
@@ -43,6 +43,7 @@ import {
AuthRefreshAccessTokenRes, AuthRefreshAccessTokenRes,
AuthSignInReq, AuthSignInReq,
AuthSignInRes, AuthSignInRes,
BulkEditRequest,
} from './dtos/login'; } from './dtos/login';
import { PackTheMetadata } from 'src/utils/ PackTheMetadata'; import { PackTheMetadata } from 'src/utils/ PackTheMetadata';
import { AuthGuard } from '@nestjs/passport'; import { AuthGuard } from '@nestjs/passport';
@@ -52,9 +53,7 @@ import jwt from 'jsonwebtoken';
import { LanguageEnum } from 'src/utils/languages.enum'; 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';
import { Metadata } from '@grpc/grpc-js';
import { lastValueFrom } from 'rxjs';
import { UserOneResponse } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages';
@ApiTags('Auth') @ApiTags('Auth')
@ApiHeaders([{ name: 'dadosfera-lang', enum: LanguageEnum, required: false }]) @ApiHeaders([{ name: 'dadosfera-lang', enum: LanguageEnum, required: false }])
@@ -356,14 +355,12 @@ export class AuthController {
async blockUsers( async blockUsers(
@Language() language: LanguageEnum, @Language() language: LanguageEnum,
@User() user: RequestUser, @User() user: RequestUser,
@Body() body: BulkEditRequest
) { ) {
this.logger.info('blockUsers - Starting request'); this.logger.info('blockUsers - Starting request');
try { try {
const metadata = PackTheMetadata({ const metadata = PackTheMetadata(user);
customer_id: user.customer_id,
language,
});
this.logger.debug('Calling blockUsers service', { this.logger.debug('Calling blockUsers service', {
metadata: { metadata: {
@@ -372,7 +369,7 @@ export class AuthController {
} }
}); });
const result = await this.authClient.blockUsers(metadata); const result = await this.authClient.blockUsers(body.users, metadata);
this.logger.info('blockUsers - Success', { result }); this.logger.info('blockUsers - Success', { result });
return result; return result;
} catch (error) { } catch (error) {
@@ -391,14 +388,12 @@ export class AuthController {
async unblockUsers( async unblockUsers(
@Language() language: LanguageEnum, @Language() language: LanguageEnum,
@User() user: RequestUser, @User() user: RequestUser,
@Body() body: BulkEditRequest
) { ) {
this.logger.info('unblockUsers'); this.logger.info('unblockUsers');
const metadata = PackTheMetadata({ const metadata = PackTheMetadata(user);
customer_id: user.customer_id,
language,
});
return this.authClient.unblockUsers(metadata); return this.authClient.unblockUsers(body.users, metadata);
} }
@ApiInternalOnlyEndpoint() @ApiInternalOnlyEndpoint()
@@ -408,13 +403,11 @@ export class AuthController {
async resetUsers( async resetUsers(
@Language() language: LanguageEnum, @Language() language: LanguageEnum,
@User() user: RequestUser, @User() user: RequestUser,
@Body() body: BulkEditRequest
) { ) {
this.logger.info('resetUsers'); this.logger.info('resetUsers');
const metadata = PackTheMetadata({ const metadata = PackTheMetadata(user);
access_token: user.access_token,
language,
});
return this.authClient.resetUsers( metadata); return this.authClient.resetUsers(body.users, metadata);
} }
} }
+9 -9
View File
@@ -20,7 +20,7 @@ import {
} from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages'; } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages';
import { DucClient } from '../duc/client.config'; import { DucClient } from '../duc/client.config';
import { Metadata } from '@grpc/grpc-js'; import { Metadata } from '@grpc/grpc-js';
import { UserActionRequest, UserActionResponse } from './dtos/login'; import { BulkEditResponse } from './dtos/login';
@Injectable() @Injectable()
export class AuthClientService implements OnModuleInit { export class AuthClientService implements OnModuleInit {
@@ -170,7 +170,7 @@ export class AuthClientService implements OnModuleInit {
); );
} }
async blockUsers(metadata: Metadata): Promise<UserActionResponse> { async blockUsers(users: string[],metadata: Metadata): Promise<BulkEditResponse> {
this.logger.info('blockUsers - Service starting'); this.logger.info('blockUsers - Service starting');
try { try {
@@ -181,8 +181,8 @@ export class AuthClientService implements OnModuleInit {
} }
}); });
const response = await lastValueFrom<UserActionResponse>( const response = await lastValueFrom<BulkEditResponse>(
this.authService.BlockUser({}, metadata), this.authService.BlockUser({ users }, metadata),
); );
this.logger.info('blockUsers - Service success', { response }); this.logger.info('blockUsers - Service success', { response });
@@ -196,14 +196,14 @@ export class AuthClientService implements OnModuleInit {
} }
} }
async unblockUsers(metadata: Metadata): Promise<UserActionResponse> { async unblockUsers(users: string[],metadata: Metadata): Promise<BulkEditResponse> {
this.logger.info('unblockUsers'); this.logger.info('unblockUsers');
return await lastValueFrom( return await lastValueFrom(
this.authService.UnblockUser({}, metadata), this.authService.UnblockUser({ users }, metadata),
); );
} }
async resetUsers(metadata: Metadata): Promise<UserActionResponse> { async resetUsers(users: string[], metadata: Metadata): Promise<BulkEditResponse> {
this.logger.info('resetUsers'); this.logger.info('resetUsers');
try { try {
@@ -214,8 +214,8 @@ export class AuthClientService implements OnModuleInit {
} }
}); });
const response = await lastValueFrom<UserActionResponse>( const response = await lastValueFrom<BulkEditResponse>(
this.authService.ResetUser({}, metadata) this.authService.ResetUser({ users }, metadata)
); );
this.logger.info('resetUsers - Success', { response }); this.logger.info('resetUsers - Success', { response });
+3 -6
View File
@@ -129,14 +129,11 @@ export class AuthRefreshAccessTokenRes {
accessToken: string; accessToken: string;
} }
export interface UserActionRequest { export interface BulkEditRequest {
users: { users: string[];
userIds: string[];
};
defaultPassword?: string;
} }
export interface UserActionResponse { export interface BulkEditResponse {
message: string; message: string;
successfulUsers: string[]; successfulUsers: string[];
failedUsers: string[]; failedUsers: string[];