diff --git a/docsfera.json b/docsfera.json index b333454..96612ac 100644 --- a/docsfera.json +++ b/docsfera.json @@ -5001,6 +5001,509 @@ ] } }, + "/customers/{id}/mfa": { + "post": { + "operationId": "CustomersController_enableMfaEnforce", + "parameters": [ + { + "name": "id", + "required": true, + "in": "path", + "schema": { + "type": "string" + } + } + ], + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/EnforceMfa" + } + } + } + }, + "responses": { + "201": { + "description": "", + "content": { + "application/json": { + "schema": { + "type": "object" + } + } + } + } + }, + "tags": [ + "Customers" + ], + "security": [ + { + "access-token": [] + }, + { + "access-token": [] + }, + { + "access-token": [] + } + ] + } + }, + "/customers/{id}/links": { + "get": { + "operationId": "CustomersController_getCustomerLinks", + "parameters": [ + { + "name": "id", + "required": true, + "in": "path", + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CustomerLinksResponse" + } + } + } + } + }, + "tags": [ + "Customers" + ], + "security": [ + { + "access-token": [] + } + ] + }, + "put": { + "operationId": "CustomersController_setCustomerLinks", + "parameters": [ + { + "name": "id", + "required": true, + "in": "path", + "schema": { + "type": "string" + } + } + ], + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CustomerLinkRequest" + } + } + } + }, + "responses": { + "200": { + "description": "" + } + }, + "tags": [ + "Customers" + ], + "security": [ + { + "access-token": [] + }, + { + "access-token": [] + } + ] + } + }, + "/customers/token": { + "get": { + "operationId": "CustomersController_getCustomerToken", + "parameters": [ + { + "name": "exp", + "required": true, + "in": "query", + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "", + "content": { + "text/plain": { + "schema": { + "type": "string" + } + } + } + } + }, + "tags": [ + "Customers" + ], + "security": [ + { + "access-token": [] + }, + { + "access-token": [] + } + ] + } + }, + "/customers/monitoring-dashboard": { + "get": { + "operationId": "CustomersController_getCustomerMonitoringDashboard", + "parameters": [], + "responses": { + "200": { + "description": "" + } + }, + "tags": [ + "Customers" + ], + "security": [ + { + "access-token": [] + }, + { + "access-token": [] + } + ] + } + }, + "/customers/logs-dashboard": { + "get": { + "operationId": "CustomersController_getCustomerMixPanelLogsDashboard", + "parameters": [], + "responses": { + "200": { + "description": "" + } + }, + "tags": [ + "Customers" + ], + "security": [ + { + "access-token": [] + }, + { + "access-token": [] + }, + { + "access-token": [] + } + ] + } + }, + "/customers/access-dashboard": { + "get": { + "operationId": "CustomersController_getAccessDashboard", + "parameters": [], + "responses": { + "200": { + "description": "" + } + }, + "tags": [ + "Customers" + ], + "security": [ + { + "access-token": [] + }, + { + "access-token": [] + }, + { + "access-token": [] + } + ] + } + }, + "/catalog/data-asset/share/{id}": { + "get": { + "operationId": "ShareController_getShareDataAsset", + "parameters": [ + { + "name": "dadosfera-lang", + "in": "header", + "required": false, + "schema": { + "enum": [ + "pt-br", + "en-us" + ], + "type": "string" + } + }, + { + "name": "id", + "required": true, + "in": "path", + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "" + } + }, + "tags": [ + "Catalog" + ] + } + }, + "/catalog/data-asset/share/{id}/columns-metadata": { + "get": { + "operationId": "ShareController_getShareDataAssetColumnsMetadata", + "parameters": [ + { + "name": "dadosfera-lang", + "in": "header", + "required": false, + "schema": { + "enum": [ + "pt-br", + "en-us" + ], + "type": "string" + } + }, + { + "name": "id", + "required": true, + "in": "path", + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/IColumnsMetadataResponse" + } + } + } + } + }, + "tags": [ + "Catalog" + ] + } + }, + "/catalog/data-asset/share/{id}/preview": { + "get": { + "operationId": "ShareController_getShareDataAssetPreview", + "parameters": [ + { + "name": "dadosfera-lang", + "in": "header", + "required": false, + "schema": { + "enum": [ + "pt-br", + "en-us" + ], + "type": "string" + } + }, + { + "name": "id", + "required": true, + "in": "path", + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/IPreviewResponse" + } + } + } + } + }, + "tags": [ + "Catalog" + ] + } + }, + "/catalog/data-asset/share/{id}/docs": { + "get": { + "operationId": "ShareController_getShareDataAssetDocs", + "parameters": [ + { + "name": "dadosfera-lang", + "in": "header", + "required": false, + "schema": { + "enum": [ + "pt-br", + "en-us" + ], + "type": "string" + } + }, + { + "name": "id", + "required": true, + "in": "path", + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/IDocsResponse" + } + } + } + } + }, + "tags": [ + "Catalog" + ] + } + }, + "/share": { + "put": { + "operationId": "ShareMetadataController_findOrcreate", + "parameters": [], + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CreateShareMetadataDto" + } + } + } + }, + "responses": { + "200": { + "description": "", + "content": { + "application/json": { + "schema": { + "type": "object" + } + } + } + } + }, + "security": [ + { + "access-token": [] + } + ] + }, + "patch": { + "operationId": "ShareMetadataController_updateShareType", + "parameters": [], + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/UpdateShareMetadataDto" + } + } + } + }, + "responses": { + "200": { + "description": "", + "content": { + "application/json": { + "schema": { + "type": "object" + } + } + } + } + }, + "security": [ + { + "access-token": [] + } + ] + } + }, + "/share/{id}": { + "get": { + "operationId": "ShareMetadataController_get", + "parameters": [ + { + "name": "id", + "required": true, + "in": "path", + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "", + "content": { + "application/json": { + "schema": { + "type": "object" + } + } + } + } + }, + "security": [ + { + "access-token": [] + } + ] + } + }, + "/trackEvent/{id}": { + "post": { + "operationId": "MixpanelController_trackEvent", + "parameters": [], + "responses": { + "201": { + "description": "" + } + } + } + }, "/terms-of-use/token": { "get": { "operationId": "TermsOfUseController_getToken", @@ -5495,257 +5998,6 @@ ] } }, - "/trackEvent/{id}": { - "post": { - "operationId": "MixpanelController_trackEvent", - "parameters": [], - "responses": { - "201": { - "description": "" - } - }, - "security": [ - { - "access-token": [] - } - ] - } - }, - "/customers/{id}/mfa": { - "post": { - "operationId": "CustomersController_enableMfaEnforce", - "parameters": [ - { - "name": "id", - "required": true, - "in": "path", - "schema": { - "type": "string" - } - } - ], - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/EnforceMfa" - } - } - } - }, - "responses": { - "201": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "object" - } - } - } - } - }, - "tags": [ - "Customers" - ], - "security": [ - { - "access-token": [] - }, - { - "access-token": [] - }, - { - "access-token": [] - } - ] - } - }, - "/customers/{id}/links": { - "get": { - "operationId": "CustomersController_getCustomerLinks", - "parameters": [ - { - "name": "id", - "required": true, - "in": "path", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CustomerLinksResponse" - } - } - } - } - }, - "tags": [ - "Customers" - ], - "security": [ - { - "access-token": [] - } - ] - }, - "put": { - "operationId": "CustomersController_setCustomerLinks", - "parameters": [ - { - "name": "id", - "required": true, - "in": "path", - "schema": { - "type": "string" - } - } - ], - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CustomerLinkRequest" - } - } - } - }, - "responses": { - "200": { - "description": "" - } - }, - "tags": [ - "Customers" - ], - "security": [ - { - "access-token": [] - }, - { - "access-token": [] - } - ] - } - }, - "/customers/token": { - "get": { - "operationId": "CustomersController_getCustomerToken", - "parameters": [ - { - "name": "exp", - "required": true, - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "", - "content": { - "text/plain": { - "schema": { - "type": "string" - } - } - } - } - }, - "tags": [ - "Customers" - ], - "security": [ - { - "access-token": [] - }, - { - "access-token": [] - } - ] - } - }, - "/customers/monitoring-dashboard": { - "get": { - "operationId": "CustomersController_getCustomerMonitoringDashboard", - "parameters": [], - "responses": { - "200": { - "description": "" - } - }, - "tags": [ - "Customers" - ], - "security": [ - { - "access-token": [] - }, - { - "access-token": [] - } - ] - } - }, - "/customers/logs-dashboard": { - "get": { - "operationId": "CustomersController_getCustomerMixPanelLogsDashboard", - "parameters": [], - "responses": { - "200": { - "description": "" - } - }, - "tags": [ - "Customers" - ], - "security": [ - { - "access-token": [] - }, - { - "access-token": [] - }, - { - "access-token": [] - } - ] - } - }, - "/customers/access-dashboard": { - "get": { - "operationId": "CustomersController_getAccessDashboard", - "parameters": [], - "responses": { - "200": { - "description": "" - } - }, - "tags": [ - "Customers" - ], - "security": [ - { - "access-token": [] - }, - { - "access-token": [] - }, - { - "access-token": [] - } - ] - } - }, "/open-data/sharing-ocean-data": { "post": { "operationId": "OpenDataController_createUser", @@ -5865,20 +6117,6 @@ ] } }, - "/health": { - "get": { - "operationId": "HealthController_check", - "parameters": [], - "responses": { - "200": { - "description": "" - } - }, - "tags": [ - "Health" - ] - } - }, "/network-policy": { "get": { "operationId": "NetworkPolicyController_getNetworks", @@ -5969,6 +6207,72 @@ ] } }, + "/assign/public-key": { + "put": { + "operationId": "AssignController_create", + "parameters": [], + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CreateAssignDto" + } + } + } + }, + "responses": { + "200": { + "description": "", + "content": { + "application/json": { + "schema": { + "type": "object" + } + } + } + } + }, + "security": [ + { + "access-token": [] + }, + { + "access-token": [] + }, + { + "access-token": [] + } + ] + }, + "get": { + "operationId": "AssignController_get", + "parameters": [], + "responses": { + "200": { + "description": "", + "content": { + "application/json": { + "schema": { + "type": "object" + } + } + } + } + }, + "security": [ + { + "access-token": [] + }, + { + "access-token": [] + }, + { + "access-token": [] + } + ] + } + }, "/api-key": { "post": { "operationId": "ApiKeyController_create", @@ -6120,6 +6424,20 @@ } ] } + }, + "/health": { + "get": { + "operationId": "HealthController_check", + "parameters": [], + "responses": { + "200": { + "description": "" + } + }, + "tags": [ + "Health" + ] + } } }, "info": { @@ -8579,6 +8897,101 @@ "updated_by" ] }, + "EnforceMfa": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean" + } + }, + "required": [ + "enabled" + ] + }, + "CustomerLink": { + "type": "object", + "properties": { + "href": { + "type": "string" + }, + "name": { + "type": "string" + }, + "description": { + "type": "string" + }, + "iconSrc": { + "type": "string" + } + }, + "required": [ + "href", + "name", + "description" + ] + }, + "CustomerLinksResponse": { + "type": "object", + "properties": { + "links": { + "type": "array", + "items": { + "$ref": "#/components/schemas/CustomerLink" + } + } + }, + "required": [ + "links" + ] + }, + "CustomerLinkRequest": { + "type": "object", + "properties": { + "links": { + "type": "array", + "items": { + "$ref": "#/components/schemas/CustomerLink" + } + } + }, + "required": [ + "links" + ] + }, + "CreateShareMetadataDto": { + "type": "object", + "properties": { + "assetId": { + "type": "string" + }, + "proposedId": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "required": [ + "assetId", + "proposedId", + "type" + ] + }, + "UpdateShareMetadataDto": { + "type": "object", + "properties": { + "shareId": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "required": [ + "shareId", + "type" + ] + }, "ConnectionTestPingReq": { "type": "object", "properties": { @@ -8873,67 +9286,6 @@ "tags" ] }, - "EnforceMfa": { - "type": "object", - "properties": { - "enabled": { - "type": "boolean" - } - }, - "required": [ - "enabled" - ] - }, - "CustomerLink": { - "type": "object", - "properties": { - "href": { - "type": "string" - }, - "name": { - "type": "string" - }, - "description": { - "type": "string" - }, - "iconSrc": { - "type": "string" - } - }, - "required": [ - "href", - "name", - "description" - ] - }, - "CustomerLinksResponse": { - "type": "object", - "properties": { - "links": { - "type": "array", - "items": { - "$ref": "#/components/schemas/CustomerLink" - } - } - }, - "required": [ - "links" - ] - }, - "CustomerLinkRequest": { - "type": "object", - "properties": { - "links": { - "type": "array", - "items": { - "$ref": "#/components/schemas/CustomerLink" - } - } - }, - "required": [ - "links" - ] - }, "CustomerThemeRequest": { "type": "object", "properties": { @@ -9001,6 +9353,17 @@ "policies" ] }, + "CreateAssignDto": { + "type": "object", + "properties": { + "publicKey": { + "type": "string" + } + }, + "required": [ + "publicKey" + ] + }, "CreateApiKeyDto": { "type": "object", "properties": { diff --git a/src/app.module.ts b/src/app.module.ts index 0555eaf..bae7a4e 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -29,6 +29,8 @@ import { CustomersModule } from './modules/customers/customers.module'; import { OpenDataModule } from './modules/open-data/open-data.module'; import { ThemeModule } from './modules/theme/theme.module'; import { NetworkPolicyModule } from './modules/network-policy/network-policy.module'; +import { AssignModule } from './modules/assign/assign.module'; +import { ShareMetadataModule } from './modules/share-metadata/share-metadata.module'; import { ApiKeyModule } from './modules/api-key/api-key.module'; @Module({ @@ -63,10 +65,13 @@ import { ApiKeyModule } from './modules/api-key/api-key.module'; CustomersModule, OpenDataModule, ThemeModule, + NetworkPolicyModule, + AssignModule, + ShareMetadataModule, + NetworkPolicyModule, + ApiKeyModule, //Always leave HealthModule last, so it is on the bottom of swagger HealthModule, - NetworkPolicyModule, - ApiKeyModule ], }) export class AppModule {} diff --git a/src/authentication/permissions.enum.ts b/src/authentication/permissions.enum.ts index ee74e22..839a52b 100644 --- a/src/authentication/permissions.enum.ts +++ b/src/authentication/permissions.enum.ts @@ -614,7 +614,8 @@ export const DADOSFERA_MODULES_KEYS = { LOG_DASHBOARD: 'logs-dashboard', ACCESS_DASHBOARD: 'access-dashboard', DANGER_ZONE: 'danger-zone', - PII: 'pii' + PII: 'pii', + PUBLIC_ASSIGN_EMBED: 'public-assign-embed', } export const DADOSFERA_MODULES: Array = [ diff --git a/src/modules/api-key/api-key.service.ts b/src/modules/api-key/api-key.service.ts index ea96801..3e92053 100644 --- a/src/modules/api-key/api-key.service.ts +++ b/src/modules/api-key/api-key.service.ts @@ -3,10 +3,10 @@ import { ClientGrpc } from '@nestjs/microservices'; import { CreateApiKeyDto, CreateApiKeyResponseDto, ApiKeyBaseResponseDto } from './dto/api-key.dto'; import { RequestUser } from 'src/decorators/user.decorator'; import { DucClient } from '../duc/client.config'; -import { PackTheMetadata } from '../../utils/ PackTheMetadata'; import { ApiKeyWriteProtoService } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/write-service'; import { lastValueFrom } from 'rxjs'; import { ProtoServices } from '@dadosfera/protospack-v2/dist/lib/Duc'; +import { PackTheMetadata } from 'src/utils/PackTheMetadata'; @Injectable() export class ApiKeyService implements OnModuleInit { diff --git a/src/modules/assign/assign.controller.ts b/src/modules/assign/assign.controller.ts new file mode 100644 index 0000000..361524c --- /dev/null +++ b/src/modules/assign/assign.controller.ts @@ -0,0 +1,33 @@ +import { Controller, Post, Body, Put, Get} from '@nestjs/common'; +import { AssignService } from './assign.service'; +import { CreateAssignDto } from './dto/create-assign.dto'; +import { Authenticated, RequireModule, RequireSomePermission } from 'src/decorators/authentication.decorator'; +import { RequestUser, User } from 'src/decorators/user.decorator'; +import { DADOSFERA_MODULES_KEYS, PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum'; +import { PackTheMetadata } from 'src/utils/PackTheMetadata'; + +@Controller('assign') +@Authenticated() +export class AssignController { + constructor(private readonly assignService: AssignService) {} + + @Put('/public-key') + @RequireSomePermission( + PERMISSIONS_GROUPS.USERS.permissions.ADMIN + ) + @RequireModule(DADOSFERA_MODULES_KEYS.PUBLIC_ASSIGN_EMBED) + create(@Body() createAssignDto: CreateAssignDto, @User() user: RequestUser) { + const metadata = PackTheMetadata(user); + return this.assignService.create(createAssignDto, metadata); + } + + @Get('/public-key') + @RequireSomePermission( + PERMISSIONS_GROUPS.USERS.permissions.ADMIN + ) + @RequireModule(DADOSFERA_MODULES_KEYS.PUBLIC_ASSIGN_EMBED) + async get(@User() user: RequestUser) { + const metadata = PackTheMetadata(user); + return await this.assignService.get(metadata); + } +} diff --git a/src/modules/assign/assign.module.ts b/src/modules/assign/assign.module.ts new file mode 100644 index 0000000..3b0fb09 --- /dev/null +++ b/src/modules/assign/assign.module.ts @@ -0,0 +1,15 @@ +import { Module } from '@nestjs/common'; +import { AssignService } from './assign.service'; +import { AssignController } from './assign.controller'; +import DadosferaLogger from '@dadosfera/dadosfera-logs'; +import { ClientsModule } from '@nestjs/microservices'; +import { DucClient } from '../duc/client.config'; + +const client = new DucClient(); + +@Module({ + imports: [ClientsModule.register([client.providerOptions])], + controllers: [AssignController], + providers: [AssignService, DadosferaLogger] +}) +export class AssignModule {} diff --git a/src/modules/assign/assign.service.ts b/src/modules/assign/assign.service.ts new file mode 100644 index 0000000..01a8c20 --- /dev/null +++ b/src/modules/assign/assign.service.ts @@ -0,0 +1,38 @@ +import { Inject, Injectable, OnModuleInit } from '@nestjs/common'; +import { CreateAssignDto } from './dto/create-assign.dto'; +import { Metadata } from '@grpc/grpc-js'; +import DadosferaLogger from '@dadosfera/dadosfera-logs'; +import { ClientGrpc } from '@nestjs/microservices'; +import { DucClient } from 'src/modules/duc/client.config'; +import { ProtoServices } from '@dadosfera/protospack-v2/dist/lib/Duc'; +import { lastValueFrom } from 'rxjs';import { AssingProtoService } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/write-service'; + +@Injectable() +export class AssignService implements OnModuleInit { + + ducService: AssingProtoService; + logger: DadosferaLogger; + + constructor( + @Inject(DadosferaLogger) + dadosferaLogger: DadosferaLogger, + @Inject(DucClient.name) private readonly grpcClient: ClientGrpc, + ) { + this.logger = dadosferaLogger.logger; + } + + onModuleInit() { + this.ducService =this.grpcClient.getService( + ProtoServices.AssingProtoService, + ); + } + + async create(createAssignDto: CreateAssignDto, metadata: Metadata) { + const data = await lastValueFrom(this.ducService.CreateOrUpdateAssignPublicKey(createAssignDto, metadata)) + return data; + } + + async get(metadata: Metadata) { + return await lastValueFrom(this.ducService.GetAssignPublicKey(metadata)) + } +} diff --git a/src/modules/assign/dto/create-assign.dto.ts b/src/modules/assign/dto/create-assign.dto.ts new file mode 100644 index 0000000..67b784e --- /dev/null +++ b/src/modules/assign/dto/create-assign.dto.ts @@ -0,0 +1,3 @@ +export class CreateAssignDto { + publicKey: string; +} diff --git a/src/modules/auth/auth.controller.ts b/src/modules/auth/auth.controller.ts index 66870d5..edefd98 100644 --- a/src/modules/auth/auth.controller.ts +++ b/src/modules/auth/auth.controller.ts @@ -45,7 +45,7 @@ import { AuthSignInRes, BulkEditRequest, } from './dtos/login'; -import { PackTheMetadata } from 'src/utils/ PackTheMetadata'; +import { PackTheMetadata } from 'src/utils/PackTheMetadata'; import { AuthGuard } from '@nestjs/passport'; import { Request } from 'express'; import ErrorCodes, { OauthErrors } from 'src/utils/errorCodes'; diff --git a/src/modules/catalog/catalog.controller.ts b/src/modules/catalog/catalog.controller.ts index 09daa16..f0727f0 100644 --- a/src/modules/catalog/catalog.controller.ts +++ b/src/modules/catalog/catalog.controller.ts @@ -32,7 +32,7 @@ import { import { DADOSFERA_MODULES_KEYS, PERMISSIONS_GROUPS } from '../../authentication/permissions.enum'; import { CatalogService } from './catalog.service'; import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; -import { PackTheMetadata } from 'src/utils/ PackTheMetadata'; +import { PackTheMetadata } from 'src/utils/PackTheMetadata'; import { RequestUser, User } from 'src/decorators/user.decorator'; import { BatchRemoveRlsRulesRequest, @@ -885,4 +885,4 @@ export class CatalogController { this.logger.error(error.message); } } -} +} \ No newline at end of file diff --git a/src/modules/catalog/catalog.module.ts b/src/modules/catalog/catalog.module.ts index 45cc06e..8ce1579 100644 --- a/src/modules/catalog/catalog.module.ts +++ b/src/modules/catalog/catalog.module.ts @@ -3,12 +3,15 @@ import { Module } from '@nestjs/common'; import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { CatalogController } from './catalog.controller'; -import { CatalogService } from './catalog.service'; import { CatalogClientConfiguration } from './catalog-client'; import { ClientsModule } from '@nestjs/microservices'; import { PipelinesModule as OldPipelineModule } from 'src/modules/pipelines/pipelines.module'; import { UsersModule } from '../users/users.module'; import { RolesModule } from '../roles/roles.module'; +import { CustomersModule } from '../customers/customers.module'; +import { ShareModule } from './share/share.module'; +import { CatalogService } from './catalog.service'; +import { MixpanelModule } from '../mixpanel/mixpanel.module'; const client = new CatalogClientConfiguration(); @@ -18,6 +21,8 @@ const client = new CatalogClientConfiguration(); OldPipelineModule, UsersModule, RolesModule, + CustomersModule, + ShareModule, ], controllers: [CatalogController], providers: [CatalogService, DadosferaLogger], diff --git a/src/modules/catalog/catalog.service.ts b/src/modules/catalog/catalog.service.ts index a3db9cc..9bf0047 100644 --- a/src/modules/catalog/catalog.service.ts +++ b/src/modules/catalog/catalog.service.ts @@ -35,12 +35,6 @@ import { GetRlsRulesRequest, PiiMetadata, } from '@dadosfera/protospack-v2/dist/lib/Catalog/interfaces/messages'; -import { writeFileSync } from 'fs'; -import path from 'path'; -import { HtmlParser } from 'src/utils/FileParser/html-parser'; -import { PiiDto } from './dtos/pii.dto'; -import { CsvParser } from 'src/utils/FileParser/csv-parser'; -import { PDFParser } from 'src/utils/FileParser/pdf-parser'; import { TypeParser } from 'src/utils/FileParser/parser-types'; import { ParserBuilder } from 'src/utils/FileParser/parser.builder'; @@ -316,7 +310,7 @@ class CatalogService implements OnModuleInit { const { documentation } = await lastValueFrom( this.catalogReadService.GetDatasetDoc({ id, type: undefined }, metadata), ); - console.log(documentation); + const docs = JSON.parse(documentation); return docs; } @@ -584,4 +578,4 @@ class CatalogService implements OnModuleInit { } } -export { CatalogService }; +export { CatalogService }; \ No newline at end of file diff --git a/src/modules/catalog/share/share.controller.ts b/src/modules/catalog/share/share.controller.ts new file mode 100644 index 0000000..efc394e --- /dev/null +++ b/src/modules/catalog/share/share.controller.ts @@ -0,0 +1,90 @@ +import { + Controller, + Get, + Inject, + Param, + Req, + UseFilters, +} from '@nestjs/common'; +import { + ApiHeaders, + ApiTags, +} from '@nestjs/swagger'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; +import { RequestUser, User } from 'src/decorators/user.decorator'; +import { + IColumnsMetadataResponse, + IDocsResponse, + IPreviewResponse, + +} from '../dtos'; +import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter'; +import { Language } from 'src/decorators/language.decorator'; +import { LanguageEnum } from 'src/utils/languages.enum'; +import { ShareService } from './share.service'; +import { Request } from 'express'; + +@ApiTags('Catalog') +@ApiHeaders([{ name: 'dadosfera-lang', enum: LanguageEnum, required: false }]) +@Controller('catalog/data-asset/share') +@UseFilters(new GrpcToHttpExceptionFilter()) +export class ShareController { + logger: DadosferaLogger; + constructor( + @Inject(DadosferaLogger) + dadosferaLogger: DadosferaLogger, + private catalogShareService: ShareService, + ) { + this.logger = dadosferaLogger.logger; + } + + @Get('/:id') + async getShareDataAsset( + @Param('id') id: string, + @User() user: RequestUser, + @Req() request: Request + ) { + this.logger.info(`GET //:id`); + return await this.catalogShareService.getOneDataAssetPublic(id, user, request); + } + + @Get('/:id/columns-metadata') + async getShareDataAssetColumnsMetadata( + @Language() language: LanguageEnum, + @Param('id') id: string, + @User() user: RequestUser + ): Promise { + this.logger.info(`GET /:id/columns-metadata`); + + const columns_metadata = + await this.catalogShareService.getDatasetColumnsMetadata(id, user); + + + return { columns_metadata }; + } + + @Get('/:id/preview') + async getShareDataAssetPreview( + @Language() language: LanguageEnum, + @Param('id') id: string, + @User() user: RequestUser + ): Promise { + this.logger.info(`GET /:id/preview`); + const preview = await this.catalogShareService.getDatasetPreview(id, user); + + return { preview }; + } + + @Get('/:id/docs') + async getShareDataAssetDocs( + @Language() language: LanguageEnum, + @Param('id') id: string, + @User() user: RequestUser + ): Promise { + this.logger.info(`GET /:id/docs`); + const docs = await this.catalogShareService.getDataDocs(id, user); + + return { docs }; + } + +} diff --git a/src/modules/catalog/share/share.module.ts b/src/modules/catalog/share/share.module.ts new file mode 100644 index 0000000..ce7021c --- /dev/null +++ b/src/modules/catalog/share/share.module.ts @@ -0,0 +1,28 @@ +import { Module } from "@nestjs/common"; +import { CatalogClientConfiguration } from "../catalog-client"; +import { ClientsModule } from "@nestjs/microservices"; +import { RolesModule } from "src/modules/roles/roles.module"; +import { UsersModule } from "src/modules/users/users.module"; +import { CustomersModule } from "src/modules/customers/customers.module"; +import { ShareMetadataModule } from "src/modules/share-metadata/share-metadata.module"; +import { ShareController } from "./share.controller"; +import DadosferaLogger from "@dadosfera/dadosfera-logs"; +import { ShareService } from "./share.service"; +import { MixpanelModule } from "src/modules/mixpanel/mixpanel.module"; + +const client = new CatalogClientConfiguration(); + +@Module({ + imports: [ + ClientsModule.register([client.providerOptions]), + UsersModule, + RolesModule, + CustomersModule, + ShareMetadataModule, + MixpanelModule + ], + controllers: [ShareController], + providers: [ShareService, DadosferaLogger], + exports: [ShareModule], +}) +export class ShareModule {} \ No newline at end of file diff --git a/src/modules/catalog/share/share.service.ts b/src/modules/catalog/share/share.service.ts new file mode 100644 index 0000000..da8d3fe --- /dev/null +++ b/src/modules/catalog/share/share.service.ts @@ -0,0 +1,247 @@ +import DadosferaLogger from '@dadosfera/dadosfera-logs'; +import { + ProtoServices, + ReadService, +} from '@dadosfera/protospack-v2/dist/lib/Catalog'; +import { + ForbiddenException, + Inject, + NotFoundException, + OnModuleInit, +} from '@nestjs/common'; +import { CatalogClientConfiguration } from '../catalog-client'; +import { ClientGrpc } from '@nestjs/microservices'; +import { UsersService } from 'src/modules/users/users.service'; +import { RolesService } from 'src/modules/roles/roles.service'; +import { RequestUser } from 'src/decorators/user.decorator'; +import { PackTheMetadata } from 'src/utils/PackTheMetadata'; +import { PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum'; +import { Metadata } from '@grpc/grpc-js'; +import { lastValueFrom } from 'rxjs'; +import { ShareMetadataService } from 'src/modules/share-metadata/share-metadata.service'; +import { isJWT } from 'class-validator'; +import { MixpanelService } from 'src/modules/mixpanel/mixpanel.service'; +import { Request } from 'express'; + +export class ShareService implements OnModuleInit { + catalogReadService: ReadService.CatalogReadServices; + logger: DadosferaLogger; + + constructor( + @Inject(DadosferaLogger) + dadosferaLogger: DadosferaLogger, + @Inject(CatalogClientConfiguration.name) + private readonly grpcClient: ClientGrpc, + private readonly userService: UsersService, + private readonly roleService: RolesService, + private readonly shareMetadataService: ShareMetadataService, + private readonly mixpanelService: MixpanelService, + ) { + this.logger = dadosferaLogger.logger; + } + + onModuleInit() { + this.catalogReadService = + this.grpcClient.getService( + ProtoServices.CatalogReadServices, + ); + } + + async getDatasetColumnsMetadata(id: string, user: RequestUser) { + const shareMetadata = await this.getShareMetadata(id, user); + const metadata = PackTheMetadata({ + customer_id: shareMetadata.customerId, + customer_name: shareMetadata.customerName, + }); + const { columns_metadata } = await lastValueFrom( + this.catalogReadService.GetDatasetColumnsMetadata( + { id: shareMetadata.assetId, type: undefined }, + metadata, + ), + ); + const result = JSON.parse(columns_metadata); + return result; + } + + async getDatasetPreview(id: string, user: RequestUser) { + const shareMetadata = await this.getShareMetadata(id, user); + const metadata = PackTheMetadata({ + customer_id: shareMetadata.customerId, + customer_name: shareMetadata.customerName, + }); + const { preview } = await lastValueFrom( + this.catalogReadService.GetDatasetPreview( + { id: shareMetadata.assetId, type: undefined }, + metadata, + ), + ); + const result = JSON.parse(preview); + return result; + } + + async getOneDataAssetPublic(id: string, user: RequestUser, request: Request) { + this.logger.info("getOneDataAssetPublic: " + JSON.stringify({ + id, + userId: user?.user_id, + customerId: user?.customer_id + })) + try { + const shareMetadata = await this.getShareMetadata(id, user); + + const mixpanelTracker = { + asset: shareMetadata.assetId, + type: isJWT(id) ? 'assigned' : shareMetadata.type, + customer: shareMetadata.customerName + } + + if (user) { + await this.mixpanelService.track("share_page", user, request, mixpanelTracker); + } else { + await this.mixpanelService.trackShare(request, mixpanelTracker); + } + + this.logger.info("shareMetadata: " + JSON.stringify(shareMetadata)) + const metadata = PackTheMetadata({ + customer_id: shareMetadata.customerId, + customer_name: shareMetadata.customerName, + }); + + const { data_asset } = await this.getOneDataAsset({ + customer_id: shareMetadata.customerId, + id: shareMetadata.assetId, + metadata, + }); + this.logger.info('found asset: ' + JSON.stringify(data_asset)); + delete data_asset.p_roles; + delete data_asset.p_users; + data_asset.share_type = 'public'; + if (data_asset.share_type !== 'public') throw new NotFoundException(); + + return { data_asset }; + } catch (error) { + this.logger.error(error); + throw error; + } + + } + + private async getOneDataAsset(data: { + id: string; + customer_id: string; + metadata: Metadata; + }) { + const { customer_id, id, metadata } = data; + const { data_asset } = await lastValueFrom( + this.catalogReadService.GetOneDataAsset( + { id, type: undefined }, + metadata, + ), + ); + let asset = JSON.parse(data_asset); + asset = { + ...asset, + p_roles: asset.roles, + p_users: asset.users, + }; + asset = await this.getAssetsUsersAndRoles([asset], customer_id); + + return { data_asset: asset[0] }; + } + + async getDataDocs(id: string, user: RequestUser) { + const shareMetadata = await this.getShareMetadata(id, user); + const metadata = PackTheMetadata({ + customer_id: shareMetadata.customerId, + customer_name: shareMetadata.customerName, + }); + + const { documentation } = await lastValueFrom( + this.catalogReadService.GetDatasetDoc({ id, type: undefined }, metadata), + ); + console.log(documentation); + const docs = JSON.parse(documentation); + return docs; + } + + private async getAssetsUsersAndRoles( + data_assets: Array, + customer_id: string, + ) { + const { users: customer_users } = + await this.userService.findAllUsersByCustomerId(customer_id); + const { roles: customer_roles } = await this.roleService.roleSearch( + {}, + { customer_id }, + ); + return data_assets.map((data_asset) => { + const owner = customer_users.find( + (u) => u.id === data_asset.owner, + )?.username; + + const roles = []; + const users = []; + for (const role_id of data_asset.roles) { + const role = customer_roles.find((r) => r.id === role_id); + if (role) roles.push({ id: role.id, name: role.name }); + } + for (const user_id of data_asset.users) { + const user = customer_users.find((r) => r.id === user_id); + if (user) users.push({ id: user.id, username: user.username }); + } + return { + ...data_asset, + roles, + users, + owner, + } as typeof data_asset; + }); + } + + // private async validateShareAssign(token: string) { + // const tokenDecoded = jwt.decode(token, { + // complete: true, + // }); + + // jwt.verify(token, this.pemValue, { + // algorithms: ['RS256'], + // }); + + // const shareId = (tokenDecoded.payload as JwtPayload).sub; + // const metadata = PackTheMetadata({}); + // return await this.shareMetadataService.get(shareId, metadata); + // } + + private async getShareMetadata(id: string, user: RequestUser) { + const metadata = PackTheMetadata({}); + this.logger.info('GET share metadata') + const info = await this.shareMetadataService.get(id, metadata); + if (isJWT(id) && info ){ + return info; + } + + if (info.type === 'private') { + if (!user) { + throw new ForbiddenException( + 'You do not have permission to access this data asset.', + ); + } + + const is_data_manager = user.permissions.includes( + PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER.seqid, + ); + + const is_get = user.permissions.includes( + PERMISSIONS_GROUPS.CATALOG.permissions.GET.seqid, + ); + + if (is_data_manager || is_get) { + return info; + } + + throw new ForbiddenException( + 'You do not have permission to access this data asset.', + ); + } + return info; + } +} diff --git a/src/modules/connection-test/connection-test.service.ts b/src/modules/connection-test/connection-test.service.ts index 310555a..3b92e12 100644 --- a/src/modules/connection-test/connection-test.service.ts +++ b/src/modules/connection-test/connection-test.service.ts @@ -20,7 +20,7 @@ import { DatabaseConnectionPropertiesDto, } from '../connection/dtos/connection'; import { RequestUser } from 'src/decorators/user.decorator'; -import { PackTheMetadata } from 'src/utils/ PackTheMetadata'; +import { PackTheMetadata } from 'src/utils/PackTheMetadata'; @Injectable() export class ConnectionTestService { diff --git a/src/modules/connection/connection.controller.ts b/src/modules/connection/connection.controller.ts index 7c4275a..194e9aa 100644 --- a/src/modules/connection/connection.controller.ts +++ b/src/modules/connection/connection.controller.ts @@ -28,7 +28,7 @@ import { UpdateConnectionDto, } from './dtos/connection'; import { CreateConnectionDto } from './dtos/connection'; -import { PackTheMetadata } from 'src/utils/ PackTheMetadata'; +import { PackTheMetadata } from 'src/utils/PackTheMetadata'; import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter'; import { Language } from 'src/decorators/language.decorator'; import { LanguageEnum } from 'src/utils/languages.enum'; diff --git a/src/modules/customers/customers.controller.ts b/src/modules/customers/customers.controller.ts index bcab557..2606ebd 100644 --- a/src/modules/customers/customers.controller.ts +++ b/src/modules/customers/customers.controller.ts @@ -25,7 +25,7 @@ import { CustomersService } from './customers.service'; import { CustomerLinkRequest, CustomerLinksResponse } from './dtos/customers'; import { RequestUser, User } from 'src/decorators/user.decorator'; import type { StringValue } from 'ms'; -import { PackTheMetadata } from 'src/utils/ PackTheMetadata'; +import { PackTheMetadata } from 'src/utils/PackTheMetadata'; import { EnforceMfa } from './dtos/enforce-mfa'; @ApiTags('Customers') diff --git a/src/modules/customers/customers.service.ts b/src/modules/customers/customers.service.ts index 056c5fb..8b28171 100644 --- a/src/modules/customers/customers.service.ts +++ b/src/modules/customers/customers.service.ts @@ -59,6 +59,14 @@ export class CustomersService implements OnModuleInit { ); } + async getCustomer(customerId: string) { + return await lastValueFrom( + this.customerService.CustomerFindOneById({ + id: customerId + }) + ) + } + async getLinks(customerId: string) { try { const result = await lastValueFrom( @@ -141,6 +149,7 @@ export class CustomersService implements OnModuleInit { // const decoded = jwt.decode(jwt_token, { complete: true }); return jwt_token; } + async getMonitoringDashboardUrl(metadata: Metadata) { logger.info('CustomersService - getMonitoringDashboardUrl'); @@ -158,6 +167,7 @@ export class CustomersService implements OnModuleInit { return res; } + async getLogsDashboardUrl(metadata: Metadata) { logger.info('CustomersService - getMixPanelLogsDashboardUrl'); diff --git a/src/modules/mixpanel/mixpanel.controller.ts b/src/modules/mixpanel/mixpanel.controller.ts index 04e8950..477569b 100644 --- a/src/modules/mixpanel/mixpanel.controller.ts +++ b/src/modules/mixpanel/mixpanel.controller.ts @@ -3,14 +3,13 @@ import { init } from 'mixpanel'; import { Authenticated } from 'src/decorators/authentication.decorator'; import { ApiInternalOnlyController } from 'src/decorators/swagger.decorator'; import { RequestUser, User } from 'src/decorators/user.decorator'; +import { MixpanelService } from './mixpanel.service'; @ApiInternalOnlyController() -@Authenticated() @Controller('trackEvent') export class MixpanelController { constructor( - @Inject('MIXPANEL_TOKEN') - private readonly mixpanelToken: string, + private mixpanelService: MixpanelService ) {} @Post(':id') async trackEvent( @@ -20,82 +19,11 @@ export class MixpanelController { @Req() request ) { delete body.info; - const mixpanel = init(this.mixpanelToken); - - const separator = user.username.includes('-') ? '-' : '.'; - const removeValues = [ - '.dadosferatech.dadosfera', - '.demo.dadosfera', - '.dadosferademo', - '.dadosferarh.dadosfera', - '.dadosferatech.dadosfera2', - '.dadosferatech.dadosfera', - '.dadosfera.fin', - '.dadosferafin.dadosfera', - '.praxio.dadosfera', - '.dadosfera.tech', - '.treinamentos@dadosfera.ai', - '.dadosfera2', - '.treinamentosfera', - '.dadosfera', - ]; - - let username = user.username; - - removeValues.forEach((value) => { - username = username.replace(value, ''); - }); - - username = username.split('@')?.[0]; - username = username.split('+')?.[0]; - - let firstName = username - .substring(0, username.indexOf(separator)) - .replace('dadosfera', ''); - let lastName = username - .substring(username.lastIndexOf(separator) + 1) - .replace('dadosfera', ''); - - if (!firstName) { - firstName = lastName; - lastName = ''; - } - - firstName = this.capitalize(firstName); - lastName = this.capitalize(lastName); - - await mixpanel.people.set(user.username, { - $first_name: firstName, - $last_name: lastName, - $name: this.getFullName(firstName, lastName), - $email: user.username.includes('@') - ? user.username - : user.username + '@dadosfera.ai', - customer_name: user.customer_name - }); - - await mixpanel.track(id, { - distinct_id: user.username, - customer: user.customer_name, - env: process.env.ENV, - $ip: request.ip, - $os: request.headers['sec-ch-ua-platform'] || '', - $browser: request.headers['user-agent'], - ...body, - }); + + await this.mixpanelService.track(id, user, request, body) return { id, body, user: user.username }; } - capitalize(sentence: string): string { - if (!sentence) { - return ''; - } - return sentence[0].toUpperCase() + sentence.substring(1); - } - - getFullName(firstName: string, lastName: string) { - return `${firstName}${lastName ? ' ' + lastName : ''}`; - } } diff --git a/src/modules/mixpanel/mixpanel.module.ts b/src/modules/mixpanel/mixpanel.module.ts index 98f130d..f3ed70e 100644 --- a/src/modules/mixpanel/mixpanel.module.ts +++ b/src/modules/mixpanel/mixpanel.module.ts @@ -1,6 +1,8 @@ import { Module } from '@nestjs/common'; import { getSecretFromSecretsManager } from 'src/utils/SecretManager'; import { MixpanelController } from './mixpanel.controller'; +import { MixpanelService } from './mixpanel.service'; +import DadosferaLogger from '@dadosfera/dadosfera-logs'; @Module({ controllers: [MixpanelController], @@ -8,9 +10,12 @@ import { MixpanelController } from './mixpanel.controller'; { provide: 'MIXPANEL_TOKEN', useValue: getSecretFromSecretsManager( - `${process.env.ENV}/root/mixpanel_token`, + `prd/root/mixpanel_token`, ), }, + MixpanelService, + DadosferaLogger ], + exports: [MixpanelService] }) export class MixpanelModule {} diff --git a/src/modules/mixpanel/mixpanel.service.ts b/src/modules/mixpanel/mixpanel.service.ts new file mode 100644 index 0000000..3dd1879 --- /dev/null +++ b/src/modules/mixpanel/mixpanel.service.ts @@ -0,0 +1,118 @@ +import DadosferaLogger from '@dadosfera/dadosfera-logs'; +import { Inject } from '@nestjs/common'; +import { Request } from 'express'; +import mixpanel, { init } from 'mixpanel'; +import { RequestUser } from 'src/decorators/user.decorator'; + +export class MixpanelService { + logger: DadosferaLogger; + + constructor( + @Inject('MIXPANEL_TOKEN') + private readonly mixpanelToken: string, + @Inject(DadosferaLogger) + dadosferaLogger: DadosferaLogger, + ) { + this.logger = dadosferaLogger.logger; + } + + async track(eventName: string, user: RequestUser, request: Request, body: any) { + this.logger.info("track: " + JSON.stringify({ + eventName, + ...body + })) + const mixpanel = init(this.mixpanelToken); + await this.setPeople(user, mixpanel); + + await mixpanel.track(eventName, { + distinct_id: user.username, + customer: user.customer_name, + env: process.env.ENV, + $ip: request.ip, + $os: request.headers['sec-ch-ua-platform'] || '', + $browser: request.headers['user-agent'], + ...body, + }); + return; + } + + async trackShare(request: Request, body: any) { + this.logger.info("trackShare: " + JSON.stringify(body)) + const mixpanel = init(this.mixpanelToken); + + await mixpanel.track("share_page", { + env: process.env.ENV, + $ip: request.ip, + $os: request.headers['sec-ch-ua-platform'] || '', + $browser: request.headers['user-agent'], + ...body, + }); + return; + } + + private async setPeople(user: RequestUser, mixpanel: mixpanel.Mixpanel) { + const separator = user.username.includes('-') ? '-' : '.'; + const removeValues = [ + '.dadosferatech.dadosfera', + '.demo.dadosfera', + '.dadosferademo', + '.dadosferarh.dadosfera', + '.dadosferatech.dadosfera2', + '.dadosferatech.dadosfera', + '.dadosfera.fin', + '.dadosferafin.dadosfera', + '.praxio.dadosfera', + '.dadosfera.tech', + '.treinamentos@dadosfera.ai', + '.dadosfera2', + '.treinamentosfera', + '.dadosfera', + ]; + + let username = user.username; + + removeValues.forEach((value) => { + username = username.replace(value, ''); + }); + + username = username.split('@')?.[0]; + username = username.split('+')?.[0]; + + let firstName = username + .substring(0, username.indexOf(separator)) + .replace('dadosfera', ''); + let lastName = username + .substring(username.lastIndexOf(separator) + 1) + .replace('dadosfera', ''); + + if (!firstName) { + firstName = lastName; + lastName = ''; + } + + firstName = this.capitalize(firstName); + lastName = this.capitalize(lastName); + + await mixpanel.people.set(user.username, { + $first_name: firstName, + $last_name: lastName, + $name: this.getFullName(firstName, lastName), + $email: user.username.includes('@') + ? user.username + : user.username + '@dadosfera.ai', + customer_name: user.customer_name, + }); + } + + private capitalize(sentence: string): string { + if (!sentence) { + return ''; + } + + return sentence[0].toUpperCase() + sentence.substring(1); + } + + private getFullName(firstName: string, lastName: string) { + return `${firstName}${lastName ? ' ' + lastName : ''}`; + } +} diff --git a/src/modules/network-policy/network-policy.controller.ts b/src/modules/network-policy/network-policy.controller.ts index 8ae8371..f45ffdd 100644 --- a/src/modules/network-policy/network-policy.controller.ts +++ b/src/modules/network-policy/network-policy.controller.ts @@ -8,7 +8,7 @@ import { import { NetworkPoliciesDTO } from './dto/network-policy.dto'; import { RequestUser, User } from 'src/decorators/user.decorator'; import { NetworkPolicyService } from './network-policy.service'; -import { PackTheMetadata } from 'src/utils/ PackTheMetadata'; +import { PackTheMetadata } from 'src/utils/PackTheMetadata'; @Controller('network-policy') export class NetworkPolicyController { diff --git a/src/modules/oauth/oauth.controller.ts b/src/modules/oauth/oauth.controller.ts index 1e87866..e1af4c9 100644 --- a/src/modules/oauth/oauth.controller.ts +++ b/src/modules/oauth/oauth.controller.ts @@ -4,7 +4,7 @@ import { AuthGuard } from '@nestjs/passport'; import { ConnectionClientService } from '../connection/client.service'; import jwt from 'jsonwebtoken'; import DadosferaLogger from '@dadosfera/dadosfera-logs/dist'; -import { PackTheMetadata } from 'src/utils/ PackTheMetadata'; +import { PackTheMetadata } from 'src/utils/PackTheMetadata'; import { ApiInternalOnlyEndpoint } from 'src/decorators/swagger.decorator'; @ApiTags('oauth') @Controller('oauth') diff --git a/src/modules/open-data/open-data.controller.ts b/src/modules/open-data/open-data.controller.ts index e952838..dd2f984 100644 --- a/src/modules/open-data/open-data.controller.ts +++ b/src/modules/open-data/open-data.controller.ts @@ -9,7 +9,7 @@ import { Language } from 'src/decorators/language.decorator'; import { OpenDataService } from './open-data.service'; import { CreateUserOpenDataDTO, WordpressForm } from './dto/wordpres-form'; import { Metadata } from '@grpc/grpc-js'; -import { PackTheMetadata } from 'src/utils/ PackTheMetadata'; +import { PackTheMetadata } from 'src/utils/PackTheMetadata'; import { request } from 'http'; import { Request } from 'express'; diff --git a/src/modules/pipelinesV2/pipelines.controller.ts b/src/modules/pipelinesV2/pipelines.controller.ts index 512a705..6986f25 100644 --- a/src/modules/pipelinesV2/pipelines.controller.ts +++ b/src/modules/pipelinesV2/pipelines.controller.ts @@ -32,7 +32,7 @@ import { PipelinesService } from './pipelines.service'; import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { Messages } from '@dadosfera/protospack-v2/dist/lib/PipelineV2'; import { RequestUser, User } from 'src/decorators/user.decorator'; -import { PackTheMetadata } from 'src/utils/ PackTheMetadata'; +import { PackTheMetadata } from 'src/utils/PackTheMetadata'; import { PipelinesService as OldPipelineService } from 'src/modules/pipelines/pipelines.service'; import { diff --git a/src/modules/share-metadata/dto/create-share-metadata.dto.ts b/src/modules/share-metadata/dto/create-share-metadata.dto.ts new file mode 100644 index 0000000..6935de1 --- /dev/null +++ b/src/modules/share-metadata/dto/create-share-metadata.dto.ts @@ -0,0 +1,10 @@ +export class CreateShareMetadataDto { + assetId: string; + proposedId: string; + type: string; +} + +export class UpdateShareMetadataDto { + shareId: string; + type: string; +} diff --git a/src/modules/share-metadata/share-metadata.controller.ts b/src/modules/share-metadata/share-metadata.controller.ts new file mode 100644 index 0000000..bfa6ca5 --- /dev/null +++ b/src/modules/share-metadata/share-metadata.controller.ts @@ -0,0 +1,31 @@ +import { Controller, Get, Body, Param, Put, Patch } from '@nestjs/common'; +import { ShareMetadataService } from './share-metadata.service'; +import { Authenticated } from 'src/decorators/authentication.decorator'; +import { RequestUser, User } from 'src/decorators/user.decorator'; +import { PackTheMetadata } from 'src/utils/PackTheMetadata'; +import { CreateShareMetadataDto, UpdateShareMetadataDto } from './dto/create-share-metadata.dto'; + +@Controller('share') +@Authenticated() +export class ShareMetadataController { + constructor(private readonly shareMetadataService: ShareMetadataService) {} + + @Put('/') + findOrcreate(@Body() data: CreateShareMetadataDto, @User() user: RequestUser) { + const metadata = PackTheMetadata(user); + return this.shareMetadataService.create(data, metadata); + } + + @Patch('/') + updateShareType(@Body() data: UpdateShareMetadataDto, @User() user: RequestUser) { + const metadata = PackTheMetadata(user); + return this.shareMetadataService.updateShare(data, metadata); + } + + + @Get('/:id') + get(@Param('id') id: string, @User() user: RequestUser) { + const metadata = PackTheMetadata(user); + return this.shareMetadataService.get(id, metadata); + } +} diff --git a/src/modules/share-metadata/share-metadata.module.ts b/src/modules/share-metadata/share-metadata.module.ts new file mode 100644 index 0000000..f75e78e --- /dev/null +++ b/src/modules/share-metadata/share-metadata.module.ts @@ -0,0 +1,16 @@ +import { Module } from '@nestjs/common'; +import { ShareMetadataService } from './share-metadata.service'; +import { ShareMetadataController } from './share-metadata.controller'; +import { DucClient } from '../duc/client.config'; +import { ClientsModule } from '@nestjs/microservices'; +import DadosferaLogger from '@dadosfera/dadosfera-logs'; + +const client = new DucClient(); + +@Module({ + imports: [ClientsModule.register([client.providerOptions])], + controllers: [ShareMetadataController], + providers: [ShareMetadataService, DadosferaLogger], + exports: [ShareMetadataService] +}) +export class ShareMetadataModule {} diff --git a/src/modules/share-metadata/share-metadata.service.ts b/src/modules/share-metadata/share-metadata.service.ts new file mode 100644 index 0000000..e69865b --- /dev/null +++ b/src/modules/share-metadata/share-metadata.service.ts @@ -0,0 +1,62 @@ +import { Inject, Injectable, OnModuleInit } from '@nestjs/common'; +import { Metadata } from '@grpc/grpc-js'; +import { ClientGrpc } from '@nestjs/microservices'; +import { DucClient } from '../duc/client.config'; +import DadosferaLogger from '@dadosfera/dadosfera-logs'; +import { ShareMetadataProtoService } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/write-service'; +import { lastValueFrom } from 'rxjs'; +import { ProtoServices } from '@dadosfera/protospack-v2/dist/lib/Duc'; +import { CreateShareMetadataDto, UpdateShareMetadataDto } from './dto/create-share-metadata.dto'; + +@Injectable() +export class ShareMetadataService implements OnModuleInit { + ducService: ShareMetadataProtoService; + logger: DadosferaLogger; + + constructor( + @Inject(DadosferaLogger) + dadosferaLogger: DadosferaLogger, + @Inject(DucClient.name) private readonly grpcClient: ClientGrpc, + ) { + this.logger = dadosferaLogger.logger; + } + + onModuleInit() { + this.ducService =this.grpcClient.getService( + ProtoServices.ShareMetadataProtoService, + ); + } + + create(createShareDto: CreateShareMetadataDto, metadata: Metadata) { + return lastValueFrom( + this.ducService.FindOrCreateShareMetadata( + { + assetId: createShareDto.assetId, + proposedId: createShareDto.proposedId, + type: createShareDto.type + }, + metadata, + ), + ); + } + + updateShare(updateShare: UpdateShareMetadataDto, metadata: Metadata) { + return lastValueFrom( + this.ducService.ChangeShareMetadataType( + updateShare, + metadata, + ), + ); + } + + get(id: string, metadata: Metadata) { + return lastValueFrom( + this.ducService.GetShareMetadata( + { + id, + }, + metadata, + ), + ); + } +} diff --git a/src/modules/users/users.controller.ts b/src/modules/users/users.controller.ts index 9e00f7c..5fdc603 100644 --- a/src/modules/users/users.controller.ts +++ b/src/modules/users/users.controller.ts @@ -29,7 +29,7 @@ import { Language } from 'src/decorators/language.decorator'; import { ApiInternalOnlyController } from 'src/decorators/swagger.decorator'; import { RequestUser, User } from 'src/decorators/user.decorator'; import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter'; -import { PackTheMetadata } from 'src/utils/ PackTheMetadata'; +import { PackTheMetadata } from 'src/utils/PackTheMetadata'; import ErrorBuilder from 'src/utils/ErrorBuilder'; import ErrorCodes from 'src/utils/errorCodes'; import { LanguageEnum } from 'src/utils/languages.enum'; diff --git a/src/utils/ PackTheMetadata.ts b/src/utils/PackTheMetadata.ts similarity index 100% rename from src/utils/ PackTheMetadata.ts rename to src/utils/PackTheMetadata.ts