FIX: new route for synchronizing connections with platform

This commit is contained in:
Gabriel Rosa
2022-09-11 13:07:21 -03:00
parent 0b14221d5a
commit 69af7ba626
26 changed files with 235 additions and 116 deletions
+2 -2
View File
@@ -21,7 +21,7 @@ import {
AuthVerifyTotpMfaRequest,
} from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages';
import { PERMISSIONS } from 'src/authentication/permissions.enum';
import { PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum';
import { RequireAllPermissions } from 'src/authentication/authentication.decorator';
import { AuthClientService } from './auth.service';
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
@@ -43,7 +43,7 @@ export class AuthController {
}
@Post('/sso/snowflake')
@RequireAllPermissions(PERMISSIONS.SNOWFLAKE.permissions.OPEN)
@RequireAllPermissions(PERMISSIONS_GROUPS.SNOWFLAKE.permissions.OPEN)
@HttpCode(HttpStatus.OK)
async snowflakeSignIn(
@User() user: RequestUser,
+2 -2
View File
@@ -10,7 +10,7 @@ import {
} from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
import { AuthenticateCondition } from '../../authentication/authentication.decorator';
import { PERMISSIONS } from '../../authentication/permissions.enum';
import { PERMISSIONS_GROUPS } from '../../authentication/permissions.enum';
import { CatalogService } from './catalog.service';
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
@@ -33,7 +33,7 @@ import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
}
return user.permissions.includes(
PERMISSIONS.CATALOG.permissions[action].seqid,
PERMISSIONS_GROUPS.CATALOG.permissions[action].seqid,
);
})
export class CatalogController {
@@ -0,0 +1,16 @@
import { Controller, Get } from '@nestjs/common';
import { RequireAllPermissions } from 'src/authentication/authentication.decorator';
import { PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum';
import { ConnectionMigrationsService } from './connection-migrations.service';
@Controller('connection-migrations')
export class ConnectionMigrationsController {
constructor(
private connectionMigrationsService: ConnectionMigrationsService,
) {}
@Get()
@RequireAllPermissions(PERMISSIONS_GROUPS.DADOSFERA.permissions.ADMIN)
async getAllCustomersPlatformConnections() {
return this.connectionMigrationsService.synchronizeConnections();
}
}
@@ -0,0 +1,13 @@
import { Module } from '@nestjs/common';
import { ConnectionMigrationsService } from './connection-migrations.service';
import { ConnectionMigrationsController } from './connection-migrations.controller';
import { UsersModule } from '../users/users.module';
import { ConnectionModule } from '../connection/connection.module';
import { ConnectorModule } from '../connector/connector.module';
@Module({
imports: [UsersModule, ConnectionModule, ConnectorModule],
providers: [ConnectionMigrationsService],
controllers: [ConnectionMigrationsController],
})
export class ConnectionMigrationsModule {}
@@ -0,0 +1,44 @@
import { Injectable } from '@nestjs/common';
import { ConnectionClientService } from '../connection/client.service';
import { ConnectorClientService } from '../connector/client.service';
import { UsersService } from '../users/users.service';
@Injectable()
export class ConnectionMigrationsService {
constructor(
private usersService: UsersService,
private connectionsService: ConnectionClientService,
private connectorService: ConnectorClientService,
) {}
async synchronizeConnections() {
const { connectors } = await this.connectorService
.getAllConnectors({
search: undefined,
filters: undefined,
language: 'pt-br',
page: 1,
size: 500,
})
.then(({ connectors }) => ({ connectors: JSON.parse(connectors) }));
const { customers } = await this.usersService.findaAllCustomers();
const promises: Promise<{
customer_name: string;
productConnections: Record<string, any>;
platformConnections: Record<string, any>;
}>[] = [];
customers.forEach((c) => {
const customer_name = c.name;
promises.push(
this.connectionsService
.INTERNAL_getAllConnections({ customer_name })
.then((res) => ({
customer_name,
platformConnections: JSON.parse(res.platformConnections),
productConnections: JSON.parse(res.productConnections),
})),
);
});
const customer_connections = await Promise.all(promises);
return { customer_connections, connectors };
}
}
+15 -2
View File
@@ -14,7 +14,10 @@ import {
UpdateConnectionDto,
} from './dtos/connection';
import { ConnectionClientConfiguration } from './client.config';
import { GetConnectionDetailsResponse } from '@dadosfera/protospack-v2/dist/lib/ConnectionManager/interfaces/messages';
import {
GetConnectionDetailsResponse,
INTERNAL_GetAllConnectionsResponse,
} from '@dadosfera/protospack-v2/dist/lib/ConnectionManager/interfaces/messages';
export class ConnectionClientService implements OnModuleInit {
private connectionServiceRead: ConnectionManager.ReadService.ConnectionManagerReadServices;
@@ -119,7 +122,7 @@ export class ConnectionClientService implements OnModuleInit {
});
}
async getAllConnection({ body, metadata }): Promise<ConnectionsRes> {
async getAllConnections({ body, metadata }): Promise<ConnectionsRes> {
const { search, filters, size, page } = body;
return lastValueFrom(
@@ -150,4 +153,14 @@ export class ConnectionClientService implements OnModuleInit {
);
});
}
async INTERNAL_getAllConnections({
customer_name,
}: {
customer_name: string;
}): Promise<INTERNAL_GetAllConnectionsResponse> {
return lastValueFrom(
this.connectionServiceRead.INTERNAL_GetAllConnections({ customer_name }),
);
}
}
@@ -17,7 +17,7 @@ import {
Authenticated,
RequireAllPermissions,
} from 'src/authentication/authentication.decorator';
import { PERMISSIONS } from 'src/authentication/permissions.enum';
import { PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum';
import { RequestUser, User } from 'src/authentication/user.decorator';
import { ValidationPipe } from '../../pipes/object-validation.pipe';
import {
@@ -29,6 +29,7 @@ import {
import { CreateConnectionDto } from './dtos/connection';
import { PackTheMetadata } from 'src/utils/ PackTheMetadata';
const connectionPermissions = PERMISSIONS_GROUPS.CONNECTION.permissions;
@ApiTags('connections')
@ApiBearerAuth()
@Authenticated()
@@ -44,7 +45,7 @@ export class ConnectionController {
}
@Post()
// @RequireAllPermissions(Permissions.CONNECTIONS.CREATE)
@RequireAllPermissions(connectionPermissions.CREATE)
async createConnection(
@User() user: RequestUser,
@Body(new ValidationPipe()) body: CreateConnectionDto,
@@ -68,7 +69,7 @@ export class ConnectionController {
}
@Put('/:id')
// @RequireAllPermissions(Permissions.CONNECTIONS.CREATE)
@RequireAllPermissions(connectionPermissions.CREATE)
async updateConnection(
@User() user: RequestUser,
@Headers('Dadosfera-Lang') language: string,
@@ -97,7 +98,7 @@ export class ConnectionController {
}
@Delete('/:id')
// @RequireAllPermissions(Permissions.CONNECTIONS.CREATE)
@RequireAllPermissions(connectionPermissions.DELETE)
async deleteConnection(
@User() user: RequestUser,
@Param('id') id: string,
@@ -121,8 +122,7 @@ export class ConnectionController {
}
@Get()
// @RequireAllPermissions(Permissions.CONNECTIONS.CREATE)
async getAllConnection(
async getAllConnections(
@User() user: RequestUser,
@Headers('Dadosfera-Lang') language,
@Query() queries,
@@ -135,12 +135,12 @@ export class ConnectionController {
const metadata = PackTheMetadata({
user_id,
customer_id,
customer_name,
customer_name: 'dadosfera_local',
language,
username,
});
const response = await this.clientService.getAllConnection({
const response = await this.clientService.getAllConnections({
body: { search, size, page, filters },
metadata,
});
@@ -149,7 +149,6 @@ export class ConnectionController {
}
@Get('/:id')
// @RequireAllPermissions(Permissions.CONNECTIONS.CREATE)
async getConnectionDetails(
@Headers('Dadosfera-Lang') language,
@User() user: RequestUser,
+28 -28
View File
@@ -30,7 +30,7 @@ import {
RequireAllPermissions,
RequireSomePermission,
} from 'src/authentication/authentication.decorator';
import { PERMISSIONS } from 'src/authentication/permissions.enum';
import { PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum';
@ApiTags('connectors')
@ApiBearerAuth()
@@ -47,7 +47,7 @@ export class ConnectorController {
}
@Post()
@RequireAllPermissions(PERMISSIONS.CONNECTORS.permissions.CREATE)
@RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.CREATE)
@ApiConsumes('multipart/form-data')
@UseInterceptors(FileInterceptor('file'))
async uploadConnector(
@@ -65,7 +65,7 @@ export class ConnectorController {
}
@Post('/uploads')
@RequireAllPermissions(PERMISSIONS.CONNECTORS.permissions.CREATE)
@RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.CREATE)
@ApiConsumes('multipart/form-data')
@UseInterceptors(FilesInterceptor('files'))
async uploadFile(@UploadedFiles() files) {
@@ -82,7 +82,7 @@ export class ConnectorController {
}
@Post('/multiple-connectors-upload')
@RequireAllPermissions(PERMISSIONS.CONNECTORS.permissions.CREATE)
@RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.CREATE)
@ApiConsumes('multipart/form-data')
@UseInterceptors(FileInterceptor('file'))
async uploadConnectorsFile(@UploadedFile() file: UploadConnectorsFileDto) {
@@ -97,11 +97,11 @@ export class ConnectorController {
@Get()
@RequireSomePermission(
PERMISSIONS.CONNECTORS.permissions.GET,
PERMISSIONS.PIPELINE.permissions.CREATE,
PERMISSIONS.PIPELINE.permissions.GET,
PERMISSIONS.PIPELINE.permissions.UPDATE,
PERMISSIONS.PIPELINE.permissions.DELETE,
PERMISSIONS_GROUPS.CONNECTORS.permissions.GET,
PERMISSIONS_GROUPS.PIPELINE.permissions.CREATE,
PERMISSIONS_GROUPS.PIPELINE.permissions.GET,
PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE,
PERMISSIONS_GROUPS.PIPELINE.permissions.DELETE,
)
async getAllConnectors(
@Headers('dadosfera-lang') language,
@@ -130,11 +130,11 @@ export class ConnectorController {
@Get('/tags')
@RequireSomePermission(
PERMISSIONS.CONNECTORS.permissions.GET,
PERMISSIONS.PIPELINE.permissions.CREATE,
PERMISSIONS.PIPELINE.permissions.GET,
PERMISSIONS.PIPELINE.permissions.UPDATE,
PERMISSIONS.PIPELINE.permissions.DELETE,
PERMISSIONS_GROUPS.CONNECTORS.permissions.GET,
PERMISSIONS_GROUPS.PIPELINE.permissions.CREATE,
PERMISSIONS_GROUPS.PIPELINE.permissions.GET,
PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE,
PERMISSIONS_GROUPS.PIPELINE.permissions.DELETE,
)
async getConnectorsTags() {
return await this.connectorClientService.getConnectorsTags();
@@ -142,11 +142,11 @@ export class ConnectorController {
@Get('/:plugin')
@RequireSomePermission(
PERMISSIONS.CONNECTORS.permissions.GET,
PERMISSIONS.PIPELINE.permissions.CREATE,
PERMISSIONS.PIPELINE.permissions.GET,
PERMISSIONS.PIPELINE.permissions.UPDATE,
PERMISSIONS.PIPELINE.permissions.DELETE,
PERMISSIONS_GROUPS.CONNECTORS.permissions.GET,
PERMISSIONS_GROUPS.PIPELINE.permissions.CREATE,
PERMISSIONS_GROUPS.PIPELINE.permissions.GET,
PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE,
PERMISSIONS_GROUPS.PIPELINE.permissions.DELETE,
)
async getConnector(
@Headers('dadosfera-lang') language,
@@ -171,11 +171,11 @@ export class ConnectorController {
@Get('/:plugin/details')
@RequireSomePermission(
PERMISSIONS.CONNECTORS.permissions.GET,
PERMISSIONS.PIPELINE.permissions.CREATE,
PERMISSIONS.PIPELINE.permissions.GET,
PERMISSIONS.PIPELINE.permissions.UPDATE,
PERMISSIONS.PIPELINE.permissions.DELETE,
PERMISSIONS_GROUPS.CONNECTORS.permissions.GET,
PERMISSIONS_GROUPS.PIPELINE.permissions.CREATE,
PERMISSIONS_GROUPS.PIPELINE.permissions.GET,
PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE,
PERMISSIONS_GROUPS.PIPELINE.permissions.DELETE,
)
async getConnectorDetails(
@Headers('dadosfera-lang') language,
@@ -199,7 +199,7 @@ export class ConnectorController {
}
@Put('/:plugin')
@RequireAllPermissions(PERMISSIONS.CONNECTORS.permissions.UPDATE)
@RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.UPDATE)
@ApiConsumes('multipart/form-data')
async updateConnector(
@Param('plugin') plugin: string,
@@ -221,7 +221,7 @@ export class ConnectorController {
}
@Put('/:plugin/add-tag')
@RequireAllPermissions(PERMISSIONS.CONNECTORS.permissions.UPDATE)
@RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.UPDATE)
async addTagOnConnector(
@Param('plugin') plugin: string,
@Body() body: AddTagDto,
@@ -248,7 +248,7 @@ export class ConnectorController {
}
@Put('/:plugin/remove-tag')
@RequireAllPermissions(PERMISSIONS.CONNECTORS.permissions.UPDATE)
@RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.UPDATE)
async removeTagOnConnector(
@Param('plugin') plugin: string,
@Body() body: RemoveTagDto,
@@ -276,7 +276,7 @@ export class ConnectorController {
}
@Delete('/:plugin')
@RequireAllPermissions(PERMISSIONS.CONNECTORS.permissions.DELETE)
@RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.DELETE)
async deleteConnector(
@Param('plugin') plugin: string,
@Body() { version }: DeleteConnectorDto,
@@ -11,5 +11,6 @@ const client = new ConnectorClientConfiguration();
controllers: [ConnectorController],
providers: [ConnectorClientService, DadosferaLogger],
imports: [ClientsModule.register([client.providerOptions])],
exports: [ConnectorClientService],
})
export class ConnectorModule {}
+6 -6
View File
@@ -10,7 +10,7 @@ import {
} from '@nestjs/common';
import { InputsService } from './inputs.service';
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
import { PERMISSIONS } from '../../authentication/permissions.enum';
import { PERMISSIONS_GROUPS } from '../../authentication/permissions.enum';
import { AuthenticateCondition } from 'src/authentication/authentication.decorator';
import { ApiOkResponse, ApiTags } from '@nestjs/swagger';
import {
@@ -36,20 +36,20 @@ import { Info } from '@dadosfera/protospack-v2/dist/lib/Input/interfaces/entitie
case 'PATCH':
return (
user.permissions.includes(
PERMISSIONS.PIPELINE.permissions.CREATE.seqid,
PERMISSIONS_GROUPS.PIPELINE.permissions.CREATE.seqid,
) ||
user.permissions.includes(PERMISSIONS.PIPELINE.permissions.UPDATE.seqid)
user.permissions.includes(PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE.seqid)
);
default:
return (
user.permissions.includes(
PERMISSIONS.PIPELINE.permissions.CREATE.seqid,
PERMISSIONS_GROUPS.PIPELINE.permissions.CREATE.seqid,
) ||
user.permissions.includes(
PERMISSIONS.PIPELINE.permissions.UPDATE.seqid,
PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE.seqid,
) ||
user.permissions.includes(PERMISSIONS.PIPELINE.permissions.GET.seqid)
user.permissions.includes(PERMISSIONS_GROUPS.PIPELINE.permissions.GET.seqid)
);
}
})
@@ -6,7 +6,7 @@ import {
RequireAllPermissions,
} from 'src/authentication/authentication.decorator';
import {
PERMISSIONS,
PERMISSIONS_GROUPS,
PermissionUsages,
} from 'src/authentication/permissions.enum';
import { RequestUser, User } from 'src/authentication/user.decorator';
@@ -36,7 +36,7 @@ export class PermissionsController {
@Get()
@ApiOkResponse({ type: GetPublicPermissionsRes })
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
getPublicPermissions(
@User() user: RequestUser,
@Headers('dadosfera-lang') language,
@@ -12,7 +12,7 @@ import { PermissionsProtoService as PermissionsServiceInterface } from '@dadosfe
import { InjectPermissionsRequest } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages';
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
import {
PERMISSIONS,
PERMISSIONS_GROUPS,
PermissionUsages,
PermissionsObjectGroup,
PermissionsObjectPermissionTranslated,
@@ -48,7 +48,7 @@ export class PermissionsService
async onApplicationBootstrap() {
this.logger.info('sending permissions to DUC...');
const permissions = Object.values(PERMISSIONS).flatMap((namespace) =>
const permissions = Object.values(PERMISSIONS_GROUPS).flatMap((namespace) =>
Object.values(namespace.permissions),
);
@@ -80,8 +80,8 @@ export class PermissionsService
language: LanguageEnum = LanguageEnum.ptbr,
): PermissionGroup[] {
const groups: PermissionGroup[] = [];
for (const key in PERMISSIONS) {
const permissionGroup: PermissionsObjectGroup = PERMISSIONS[key];
for (const key in PERMISSIONS_GROUPS) {
const permissionGroup: PermissionsObjectGroup = PERMISSIONS_GROUPS[key];
const title = permissionGroup.title[language];
const permissions: PermissionGroupPermission[] = Object.values(
permissionGroup.permissions,
@@ -100,8 +100,8 @@ export class PermissionsService
}
getAllPermissions(language: LanguageEnum = LanguageEnum.ptbr) {
let permissions: PermissionsObjectPermissionTranslated[] = [];
for (const key in PERMISSIONS) {
const permissionGroup: PermissionsObjectGroup = PERMISSIONS[key];
for (const key in PERMISSIONS_GROUPS) {
const permissionGroup: PermissionsObjectGroup = PERMISSIONS_GROUPS[key];
const permissionGroupPermissions: PermissionsObjectPermissionTranslated[] =
Object.values(permissionGroup.permissions).map((p) => ({
...p,
@@ -10,7 +10,7 @@ import {
} from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
import { AuthenticateCondition } from 'src/authentication/authentication.decorator';
import { PERMISSIONS } from '../../authentication/permissions.enum';
import { PERMISSIONS_GROUPS } from '../../authentication/permissions.enum';
import { PipelinesService } from './pipelines.service';
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
import { RequestUser, User } from 'src/authentication/user.decorator';
@@ -34,7 +34,7 @@ import { RequestUser, User } from 'src/authentication/user.decorator';
}
return user.permissions.includes(
PERMISSIONS.PIPELINE.permissions[action].seqid,
PERMISSIONS_GROUPS.PIPELINE.permissions[action].seqid,
);
})
export class PipelinesController {
@@ -12,7 +12,7 @@ import {
} from '@nestjs/common';
import { ApiCreatedResponse, ApiTags } from '@nestjs/swagger';
import { AuthenticateCondition } from 'src/authentication/authentication.decorator';
import { PERMISSIONS } from '../../authentication/permissions.enum';
import { PERMISSIONS_GROUPS } from '../../authentication/permissions.enum';
import { PipelinesService } from './pipelines.service';
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
import { Messages } from '@dadosfera/protospack-v2/dist/lib/PipelineV2';
@@ -40,7 +40,7 @@ import { ICreatePipelineV2Req, IPipelineV2 } from './interfaces';
}
return user.permissions.includes(
PERMISSIONS.PIPELINE.permissions[action].seqid,
PERMISSIONS_GROUPS.PIPELINE.permissions[action].seqid,
);
})
export class PipelinesController {
+10 -10
View File
@@ -39,7 +39,7 @@ import {
SetRoleUsersReq,
} from './dto/entities';
import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter';
import { PERMISSIONS } from 'src/authentication/permissions.enum';
import { PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum';
import {
Authenticated,
RequireAllPermissions,
@@ -69,7 +69,7 @@ export class RolesController {
@Get()
@ApiOkResponse({ type: GetRolesByCustomerRes })
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
async searchRoles(
@User() user: RequestUser,
@Query() filters: GetRolesByCustomerReq,
@@ -82,7 +82,7 @@ export class RolesController {
@Post()
@ApiCreatedResponse({ type: CreateRoleRes })
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
async createRole(
@User() user: RequestUser,
@Body() body: CreateRoleReq,
@@ -95,7 +95,7 @@ export class RolesController {
@Put('permissions')
@ApiOkResponse({ type: GrantPermissionsToRoleRes })
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
async grantPermissionsToRole(
@User() user: RequestUser,
@Body() body: GrantPermissionsToRoleReq,
@@ -108,7 +108,7 @@ export class RolesController {
@Delete('permissions')
@ApiOkResponse({ type: RevokePermissionsFromRoleRes })
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
async revokePermissionsFromRole(
@User() user: RequestUser,
@Body() body: RevokePermissionsFromRoleReq,
@@ -121,7 +121,7 @@ export class RolesController {
@Patch('permissions')
@ApiOkResponse({ type: SetRolePermissionsRes })
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
async setRolePermissions(
@User() user: RequestUser,
@Body() body: SetRolePermissionsReq,
@@ -134,7 +134,7 @@ export class RolesController {
@Patch('users')
@ApiOkResponse({ type: SetRoleUsersRes })
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
async setRoleUsers(
@User() user: RequestUser,
@Body() body: SetRoleUsersReq,
@@ -147,7 +147,7 @@ export class RolesController {
@Get(':id')
@ApiOkResponse({ type: RoleDto })
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
async getRoleById(
@User() user: RequestUser,
@Param('id') id: string,
@@ -159,7 +159,7 @@ export class RolesController {
}
@Delete(':id')
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
async deleteRole(
@User() user: RequestUser,
@Param('id') id: string,
@@ -172,7 +172,7 @@ export class RolesController {
@Patch(':id')
@ApiOkResponse({ type: UpdateRoleRes })
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
async updateRole(
@User() user: RequestUser,
@Param('id') id: string,
@@ -12,7 +12,7 @@ import { ApiTags } from '@nestjs/swagger';
import { TransformationsClientService } from './client.service';
import { IIdRequest } from './interfaces';
import { AuthenticateCondition } from 'src/authentication/authentication.decorator';
import { PERMISSIONS } from '../../authentication/permissions.enum';
import { PERMISSIONS_GROUPS } from '../../authentication/permissions.enum';
import { TransformationsService } from './transformations.service';
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
import { RequestUser, User } from 'src/authentication/user.decorator';
@@ -36,7 +36,7 @@ import { RequestUser, User } from 'src/authentication/user.decorator';
}
return user.permissions.includes(
PERMISSIONS.TRANSFORMATIONS.permissions[action].seqid,
PERMISSIONS_GROUPS.TRANSFORMATIONS.permissions[action].seqid,
);
})
export class TransformationsController {
+14 -14
View File
@@ -22,7 +22,7 @@ import {
} from '@nestjs/swagger';
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
import { RequireAllPermissions } from 'src/authentication/authentication.decorator';
import { PERMISSIONS } from 'src/authentication/permissions.enum';
import { PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum';
import { RequestUser, User } from 'src/authentication/user.decorator';
import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter';
import { LanguageEnum } from 'src/utils/languages.enum';
@@ -68,7 +68,7 @@ export class UsersController {
}
@Get()
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
@ApiOkResponse({
type: GetAllUsersByCustomerIdRes,
description: 'List of users of a customer',
@@ -83,7 +83,7 @@ export class UsersController {
}
@Get('hierarchies')
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
@ApiOkResponse({ type: GetAllHierarchiesRes })
async getAllHierarchies(
@User() user: RequestUser,
@@ -95,7 +95,7 @@ export class UsersController {
}
@Get('departments')
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
@ApiOkResponse({ type: GetAllDepartmentsRes })
async getAllDepartments(
@User() user: RequestUser,
@@ -107,7 +107,7 @@ export class UsersController {
}
@Get('jobTitles')
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
@ApiOkResponse({ type: GetAllDepartmentsRes })
async getAllJobTitles(
@User() user: RequestUser,
@@ -119,7 +119,7 @@ export class UsersController {
}
@Get(':id')
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
@ApiOkResponse({
type: UserByCustomer,
})
@@ -134,7 +134,7 @@ export class UsersController {
}
@Post()
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
@ApiCreatedResponse({ type: CreateUserRes })
async createUser(
@User() user: RequestUser,
@@ -147,7 +147,7 @@ export class UsersController {
}
@Post('batch')
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
@ApiCreatedResponse({ type: BatchCreateUserRes })
async batchCreateUser(
@User() user: RequestUser,
@@ -160,7 +160,7 @@ export class UsersController {
}
@Post(':id/resend-invite')
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
@HttpCode(HttpStatus.OK)
async resendInvite(
@User() user: RequestUser,
@@ -173,7 +173,7 @@ export class UsersController {
}
@Delete('role')
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
async unassignRoleToUser(
@User() user: RequestUser,
@Query() request: UnassignRoleToUserReq,
@@ -185,7 +185,7 @@ export class UsersController {
}
@Delete(':id')
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
@ApiOkResponse({ type: DeleteUserRes })
async deleteUser(
@User() user: RequestUser,
@@ -198,7 +198,7 @@ export class UsersController {
}
@Patch('roles')
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
@ApiOkResponse({ type: SetUserRolesRes })
async setUserRoles(
@User() user: RequestUser,
@@ -211,7 +211,7 @@ export class UsersController {
}
@Put('role')
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
async assignRoleToUser(
@User() user: RequestUser,
@Body() body: AssignRoleToUserReq,
@@ -223,7 +223,7 @@ export class UsersController {
}
@Patch(':id')
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
@ApiOkResponse({ type: UpdateUserRes })
async updateUser(
@User() user: RequestUser,
+1
View File
@@ -17,5 +17,6 @@ const client = new DucClient();
],
controllers: [UsersController],
providers: [UsersService, DadosferaLogger],
exports: [UsersService],
})
export class UsersModule {}
+13 -2
View File
@@ -3,7 +3,10 @@ import { ClientGrpc } from '@nestjs/microservices';
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
import { ProtoServices } from '@dadosfera/protospack-v2/dist/lib/Duc';
import { UsersProtoService } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/write-service';
import {
CustomersProtoService,
UsersProtoService,
} from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/write-service';
import {
AssignRoleToUserRequest,
IdRequest,
@@ -31,6 +34,7 @@ export class UsersService implements OnModuleInit {
language: LanguageEnum = LanguageEnum.ptbr;
private usersClientService: UsersProtoService;
private customersClientService: CustomersProtoService;
constructor(
@Inject(DadosferaLogger)
dadosferaLogger: DadosferaLogger,
@@ -41,9 +45,12 @@ export class UsersService implements OnModuleInit {
}
onModuleInit() {
this.usersClientService = this.grpcClient.getService<UsersProtoService>(
this.usersClientService = this.grpcClient.getService(
ProtoServices.UsersProtoService,
);
this.customersClientService = this.grpcClient.getService(
ProtoServices.CustomersProtoService,
);
}
setLanguage(l: LanguageEnum = LanguageEnum.ptbr) {
@@ -200,4 +207,8 @@ export class UsersService implements OnModuleInit {
};
});
}
async findaAllCustomers() {
return await lastValueFrom(this.customersClientService.CustomerFindAll({}));
}
}