Compare commits

...
Author SHA1 Message Date
Marcos Rodrigues Silva 60214f0e57 Merge pull request #272 from dadosfera/feature/block_and_reset_users
Feature/block and reset users
2025-03-24 16:27:35 -03:00
marcos-silva-rodrigues 3a2ce72910 UPDATE: protospack 2025-03-24 14:46:24 -03:00
marcos-silva-rodrigues 074d3ce201 BUILD: remove unused packages 2025-03-21 18:09:09 -03:00
marcos-silva-rodrigues 05c80e2497 FEAT: reset, block and unblock all users 2025-03-21 17:04:58 -03:00
marcos-silva-rodrigues 8a363dd815 FIX: Merge main 2025-03-18 17:59:04 -03:00
Marcos Rodrigues Silva 1e5fe59d9c Merge pull request #271 from dadosfera/feature/new-mixpanel-properties
Add new mixpanel properties
2025-03-14 15:20:42 -03:00
Jonathan Witkosky 1a2b9617fe Add new mixpanel properties 2025-03-14 13:57:31 -03:00
Guilherme Maioli 1f92510a43 Merge pull request #270 from dadosfera/bugfixes/13-03
Bugfixes/13 03
2025-03-13 17:59:32 -03:00
marcos-silva-rodrigues f7fceb1ea2 Merge branch 'fix/white-label' into bugfixes/13-03 2025-03-13 17:41:12 -03:00
Rafael Moraes 2aec60a354 FEATURE: Reset and block users 2025-03-13 14:44:54 -03:00
Marcos Rodrigues Silva 9bc42a4af0 Merge pull request #269 from dadosfera/fix/private-route
FIX: cors list
2025-02-26 17:15:03 -03:00
marcos-silva-rodrigues 5c98cc1748 FIX: cors list 2025-02-26 17:13:57 -03:00
Marcos Rodrigues Silva 9ae14ab04a Merge pull request #268 from dadosfera/fix/private-route
FIX: correct ip
2025-02-26 16:00:20 -03:00
marcos-silva-rodrigues 5d014f4669 FIX: correct ip 2025-02-26 15:57:07 -03:00
Marcos Rodrigues Silva 5e8dea7255 Merge pull request #267 from dadosfera/fix/private-route
FIX: add ip range and domain list to route /open-data
2025-02-26 08:49:40 -03:00
marcos-silva-rodrigues 38fc9f521b FIX: add ip range and domain list to route /open-data 2025-02-25 17:10:39 -03:00
Marcos Rodrigues Silva 80d7ac6ff9 Merge pull request #264 from dadosfera/fix/white-label
Fix/white label
2025-02-24 09:35:37 -03:00
marcos-silva-rodrigues 9bacd7a0f5 UPDATE: merge with beta branch 2025-02-24 09:28:03 -03:00
Aldemir Humberto Soares Neto c89ac40039 Merge pull request #266 from dadosfera/fixing-build-ecr
FEAT: fixing package-lock
2025-02-22 07:42:46 -03:00
aldemirneto 6d6cf590ee FEAT: fixing package-lock 2025-02-22 07:39:41 -03:00
Aldemir Humberto Soares Neto f063a8f30e Merge pull request #265 from dadosfera/UNIVR-PII-FACILITIES
Univr pii facilities
2025-02-22 07:29:14 -03:00
aldemirneto 03536a2180 FEAT: ensuring compatibility with ^ in the version 2025-02-22 07:28:30 -03:00
aldemirneto 0efd5cc257 FEAT: Changing protospack version
PII enabling
2025-02-22 07:23:34 -03:00
marcos-silva-rodrigues 9439f13b7b UPdATE: new displayName prop 2025-02-21 17:31:49 -03:00
Rafael Santana d936806406 Merge pull request #262 from dadosfera/beta
[PRD] Enable Dataset Registration via API for External Sources
2025-02-20 14:03:56 -03:00
Rafael Santana 9d7ccd4201 Merge pull request #263 from dadosfera/feat/catalog-external-datasets-using-api-call
UPDATE: migrating maestro to backend nodepool
2025-02-20 13:47:44 -03:00
Rafael c8a4c1aae6 UPDATE: migrating maestro to backend nodepool 2025-02-20 13:46:30 -03:00
Rafael Santana 406db7ccff Merge pull request #261 from dadosfera/feat/catalog-external-datasets-using-api-call
UPDATE: improve logging for table metadata
2025-02-20 08:52:15 -03:00
Rafael f48a35c7ce UPDATE: improve logging for table metadata 2025-02-20 08:40:48 -03:00
Rafael Santana 8d25df74b7 Merge pull request #260 from dadosfera/feat/catalog-external-datasets-using-api-call
UPDATE: updating protospack for add table_schema for /catalog/registe…
2025-02-19 12:25:10 -03:00
Rafael 831a03402e UPDATE: updating protospack for add table_schema for /catalog/register-dataset rout 2025-02-19 12:19:59 -03:00
Marcos Rodrigues Silva a631338599 Merge pull request #259 from dadosfera/feat/update-customer-dash
UPDATE: customer dash
2025-02-17 19:02:52 -03:00
Marcos Rodrigues Silva d943721b4a Merge pull request #258 from dadosfera/feat/update-customer-dash
Feat/update customer dash
2025-02-17 18:47:11 -03:00
Rafael Santana 1bbf978cc4 Merge pull request #257 from dadosfera/feat/catalog-external-datasets-using-api-call
FEAT: Enable dataset registration via API for external sources
2025-02-14 16:57:58 -03:00
Rafael 856f913ce6 Merge branch 'feat/catalog-external-datasets-using-api-call' of github.com:dadosfera/maestro into feat/catalog-external-datasets-using-api-call 2025-02-14 15:07:13 -03:00
Rafael dc617b6925 REFACTOR: Improve logging with additional metadata
- Enhanced logs to include more detailed request body information.
- Standardized log calls to include extra metadata, such as service name, environment, customer name, user ID, HTTP method, and request path.
- Improved error logging to provide better debugging insights.

Example log format:
EXTRA[{"service":{"name":"maestro","environment":"stg"},"customer_name":"dadosfera","user_id":"047824d8-0021-709a-bf15-39b8dd069aaf","method":"POST","path":"/catalog/register-dataset"}]

Related tickets or issues: [TECN-9441]
2025-02-14 15:04:22 -03:00
Rafael Santana 3f80062672 Merge branch 'beta' into feat/catalog-external-datasets-using-api-call 2025-02-14 10:14:01 -03:00
Rafael 07eb423814 UPDATE: update version of protospack 2025-02-14 10:12:20 -03:00
Rafael 721232448e FEAT: Enable dataset registration via API for external sources
As part of our hybrid approach, we need to allow dataset cataloging from outside our cloud environment.
Instead of relying on our GRPC APIs, we leveraged an existing REST API to handle this process.

- Updated Maestro to call Nimbus directly for dataset registration.
- Modified protospack to generate the necessary TypeScript interfaces.
- Added the `/catalog/register-dataset` endpoint to the API.

This change enables seamless dataset registration from external sources while maintaining compatibility with our existing infrastructure.

Related tickets or issues: [TECN-9441]
2025-02-14 10:08:45 -03:00
Marcos Rodrigues Silva 0b0d261aae Merge pull request #256 from dadosfera/fix/white-label
UPDATE: remove user agent
2025-02-13 13:56:37 -03:00
marcos-silva-rodrigues 87a8d741d7 UPDATE: remove user agent 2025-02-13 13:55:37 -03:00
marcos-silva-rodrigues d03dd6129a UPDATE: customer dash 2025-02-13 12:20:04 -03:00
Marcos Rodrigues Silva 96c20995a3 Merge pull request #255 from dadosfera/beta
Beta
2025-02-03 18:22:05 -03:00
Marcos Rodrigues Silva 82470553db Merge pull request #254 from dadosfera/fix/white-label
FIX: remove support for svg
2025-02-03 12:29:19 -03:00
marcos-silva-rodrigues 2408505889 FIX: remove support for svg 2025-02-03 12:25:56 -03:00
Marcos Rodrigues Silva 7d85693a1f Merge pull request #253 from dadosfera/fix/white-label
Fix/white label
2025-02-03 09:53:38 -03:00
marcos-silva-rodrigues d86a011bfd Reapply "Merge pull request #250 from dadosfera/beta"
This reverts commit d3f7664116.
2025-02-01 16:49:18 -03:00
Marcos Rodrigues Silva 4d54ac744b Merge pull request #252 from dadosfera/feature/new-monitoring-dash
FEAT: update monitoring dash
2025-01-31 18:32:41 -03:00
marcos-silva-rodrigues 132614b551 FEAT: update monitoring dash 2025-01-31 18:24:08 -03:00
Rafael Santana 17c541548a Merge pull request #251 from dadosfera/rollback-main
Revert "Merge pull request #250 from dadosfera/beta"
2025-01-31 18:20:20 -03:00
Rafael d3f7664116 Revert "Merge pull request #250 from dadosfera/beta"
This reverts commit 2ea40004a6, reversing
changes made to 873f7ea314.
2025-01-31 18:13:33 -03:00
Marcos Rodrigues Silva 2ea40004a6 Merge pull request #250 from dadosfera/beta
Beta
2025-01-31 17:24:43 -03:00
Marcos Rodrigues Silva 82ec2d9493 Merge pull request #248 from dadosfera/feature/new-monitoring-dash
FEAT: change dashboard id
2025-01-31 14:40:02 -03:00
Marcos Rodrigues Silva 53bef174b3 Merge pull request #249 from dadosfera/feature/white-label-app
FIX: return null when not found theme
2025-01-31 13:40:07 -03:00
marcos-silva-rodrigues bcfef8359e FIX: return null when not found theme 2025-01-31 13:39:15 -03:00
Marcos Rodrigues Silva 5f18411aed Merge pull request #247 from dadosfera/feature/white-label-app
Feature/white label app
2025-01-30 17:57:09 -03:00
marcos-silva-rodrigues 1102a6e8e5 FEAT: remove personal data in logger and only endpoint for wordpress 2025-01-30 17:06:09 -03:00
marcos-silva-rodrigues 867aec092b FEAT: add svg 2025-01-30 16:06:13 -03:00
marcos-silva-rodrigues ea9e727fcf FEAT: change dashboard id 2025-01-30 15:09:27 -03:00
Marcos Rodrigues Silva 099476f618 Merge pull request #246 from dadosfera/feature/white-label-app
Feature/white label app
2025-01-27 15:07:22 -03:00
marcos-silva-rodrigues db78494b1a FIX: test log headers 2025-01-27 14:39:12 -03:00
marcos-silva-rodrigues e7ad6e5a7b CHORE: update env 2025-01-27 14:12:38 -03:00
Marcos Rodrigues Silva 3d7d051df2 Merge pull request #245 from dadosfera/feature/white-label-app
chore: update stg values
2025-01-27 11:50:43 -03:00
marcos-silva-rodrigues 8e827dc934 chore: update stg values 2025-01-27 11:47:23 -03:00
Marcos Rodrigues Silva 12b764710a Merge pull request #244 from dadosfera/feature/white-label-app
Feature/white label app
2025-01-27 09:49:29 -03:00
marcos-silva-rodrigues b5c95874bb chore: updated package 2025-01-27 09:14:42 -03:00
marcos-silva-rodrigues b896b1a9b8 REFACTOR: rename props 2025-01-26 16:44:31 -03:00
marcos-silva-rodrigues cf99acc682 FEAT: send images in stream 2025-01-26 16:37:37 -03:00
Marcos Rodrigues Silva 7fb20964dc Merge pull request #243 from dadosfera/feature/white-label-app
Feature/white label app
2025-01-23 08:39:26 -03:00
Rafael Santana 8751117946 Merge pull request #242 from dadosfera/decrease-replica-count-maestro
UPDATE: add toleration for spot instances
2025-01-22 11:24:35 -03:00
marcos-silva-rodrigues 8e13541b24 FEAT: update protospack 2025-01-21 17:28:13 -03:00
marcos-silva-rodrigues 4f6a9d4b66 FEAT: new property in customer obj 2025-01-21 17:00:34 -03:00
Rafael Santana 56411496c2 Merge pull request #241 from dadosfera/decrease-replica-count-maestro
Decrease replica count maestro
2025-01-20 18:50:14 -03:00
Rafael Santana 1626d85d31 Merge pull request #240 from dadosfera/decrease-replica-count-maestro
UPDATE: decrease the number of replicas for stg environment
2025-01-20 18:41:54 -03:00
24 changed files with 3571 additions and 1715 deletions
+173 -5
View File
@@ -542,6 +542,123 @@
] ]
} }
}, },
"/auth/users/block": {
"post": {
"operationId": "AuthController_blockUsers",
"parameters": [
{
"name": "dadosfera-lang",
"in": "header",
"required": false,
"schema": {
"enum": [
"pt-br",
"en-us"
],
"type": "string"
}
}
],
"responses": {
"200": {
"description": "",
"content": {
"application/json": {
"schema": {
"type": "object"
}
}
}
}
},
"tags": [
"Auth"
],
"security": [
{
"access-token": []
}
]
}
},
"/auth/users/unblock": {
"post": {
"operationId": "AuthController_unblockUsers",
"parameters": [
{
"name": "dadosfera-lang",
"in": "header",
"required": false,
"schema": {
"enum": [
"pt-br",
"en-us"
],
"type": "string"
}
}
],
"responses": {
"200": {
"description": "",
"content": {
"application/json": {
"schema": {
"type": "object"
}
}
}
}
},
"tags": [
"Auth"
],
"security": [
{
"access-token": []
}
]
}
},
"/auth/users/reset": {
"post": {
"operationId": "AuthController_resetUsers",
"parameters": [
{
"name": "dadosfera-lang",
"in": "header",
"required": false,
"schema": {
"enum": [
"pt-br",
"en-us"
],
"type": "string"
}
}
],
"responses": {
"200": {
"description": "",
"content": {
"application/json": {
"schema": {
"type": "object"
}
}
}
}
},
"tags": [
"Auth"
],
"security": [
{
"access-token": []
}
]
}
},
"/connections": { "/connections": {
"post": { "post": {
"operationId": "ConnectionController_createConnection", "operationId": "ConnectionController_createConnection",
@@ -4787,6 +4904,41 @@
] ]
} }
}, },
"/catalog/register-dataset": {
"post": {
"operationId": "CatalogController_registerDatasetWithMetadataRequest",
"parameters": [
{
"name": "dadosfera-lang",
"in": "header",
"required": false,
"schema": {
"enum": [
"pt-br",
"en-us"
],
"type": "string"
}
}
],
"responses": {
"201": {
"description": ""
}
},
"tags": [
"Catalog"
],
"security": [
{
"access-token": []
},
{
"access-token": []
}
]
}
},
"/terms-of-use/token": { "/terms-of-use/token": {
"get": { "get": {
"operationId": "TermsOfUseController_getToken", "operationId": "TermsOfUseController_getToken",
@@ -5454,6 +5606,14 @@
"schema": { "schema": {
"type": "string" "type": "string"
} }
},
{
"name": "origin",
"required": true,
"in": "header",
"schema": {
"type": "string"
}
} }
], ],
"responses": { "responses": {
@@ -5608,6 +5768,9 @@
"name": { "name": {
"type": "string" "type": "string"
}, },
"displayName": {
"type": "string"
},
"tier": { "tier": {
"type": "string" "type": "string"
}, },
@@ -5619,15 +5782,20 @@
"items": { "items": {
"type": "string" "type": "string"
} }
},
"themeEnabled": {
"type": "boolean"
} }
}, },
"required": [ "required": [
"modules", "modules",
"id", "id",
"name", "name",
"displayName",
"tier", "tier",
"scheduleLimit", "scheduleLimit",
"links" "links",
"themeEnabled"
] ]
}, },
"AuthUser": { "AuthUser": {
@@ -8374,18 +8542,18 @@
"textColor": { "textColor": {
"type": "string" "type": "string"
}, },
"logoWhite": { "logo": {
"type": "string" "type": "string"
}, },
"logoBlack": { "logoLogin": {
"type": "string" "type": "string"
} }
}, },
"required": [ "required": [
"backgroundColor", "backgroundColor",
"textColor", "textColor",
"logoWhite", "logo",
"logoBlack" "logoLogin"
] ]
}, },
"CustomerThemeResponse": { "CustomerThemeResponse": {
+2
View File
@@ -18,3 +18,5 @@ charts:
value: f239718a-a271-4ef9-ae7e-02a2f0f3aa6e value: f239718a-a271-4ef9-ae7e-02a2f0f3aa6e
- name: maestro.open_group_id - name: maestro.open_group_id
value: 401573bb-334f-44b2-b30e-88d4cea31ae9 value: 401573bb-334f-44b2-b30e-88d4cea31ae9
- name: replicaCount
value: 2
+6 -1
View File
@@ -35,7 +35,8 @@ spec:
- key: application - key: application
operator: In operator: In
values: values:
- backend - general
tolerations: tolerations:
- key: "kubernetes.azure.com/scalesetpriority" - key: "kubernetes.azure.com/scalesetpriority"
operator: "Equal" operator: "Equal"
@@ -95,6 +96,10 @@ spec:
value: {{ .Values.maestro.tr_factory_url }} value: {{ .Values.maestro.tr_factory_url }}
- name: UPLOAD_FILE_AGENT_CONNECTION - name: UPLOAD_FILE_AGENT_CONNECTION
value: {{ .Values.maestro.upload_file_agent_connection }} value: {{ .Values.maestro.upload_file_agent_connection }}
- name: OPEN_CUSTOMER_ID
value: {{ .Values.maestro.open_customer_id }}
- name: OPEN_GROUP_ID
value: {{ .Values.maestro.open_group_id }}
- name: JWT_PRIVATE_KEY - name: JWT_PRIVATE_KEY
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
+28
View File
@@ -0,0 +1,28 @@
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
annotations:
nginx.ingress.kubernetes.io/whitelist-source-range: "69.49.241.121/32" # hostgator ip
nginx.ingress.kubernetes.io/proxy-body-size: "0"
nginx.ingress.kubernetes.io/server-snippet: |
underscores_in_headers on;
ignore_invalid_headers on;
generation: 1
labels:
app: maestro
name: open-data
namespace: applications
spec:
ingressClassName: nginx
rules:
- host: {{ .Values.hostname }}
http:
paths:
- backend:
service:
name: maestro
port:
number: {{ .Values.ingress.port }}
path: /open-data/sharing-ocean-data
pathType: Prefix
+1 -1
View File
@@ -3,7 +3,7 @@
# Declare variables to be passed into your templates. # Declare variables to be passed into your templates.
replicaCount: 3 replicaCount: 3
hostname: maestro-temp.dadosfera.ai hostname: maestro.dadosfera.ai
image: image:
repository: 611330257153.dkr.ecr.us-east-1.amazonaws.com/microservices/maestro_prd repository: 611330257153.dkr.ecr.us-east-1.amazonaws.com/microservices/maestro_prd
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
+2891 -1612
View File
File diff suppressed because it is too large Load Diff
+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-beta.3", "@dadosfera/protospack-v2": "3.37.0-alpha.18",
"@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",
-32
View File
@@ -1,32 +0,0 @@
import { Injectable, CanActivate, ExecutionContext, ForbiddenException } from '@nestjs/common';
import { Reflector } from '@nestjs/core';
import { SetMetadata } from '@nestjs/common';
export const SetOrigin = (origin: string) => SetMetadata('allowedOrigin', origin);
@Injectable()
export class CORSGuard implements CanActivate {
constructor(private reflector: Reflector) {}
canActivate(context: ExecutionContext): boolean {
const response = context.switchToHttp().getResponse();
const request = context.switchToHttp().getRequest();
const origin = request.headers.origin;
// Obter a origem permitida através do decorador
const allowedOrigin = this.reflector.get<string>('allowedOrigin', context.getHandler());
if (process.env.ENV === "local") {
return true;
}
// Verifica se a origem da requisição é permitida
if (allowedOrigin && origin !== allowedOrigin) {
throw new ForbiddenException('Acesso não permitido pela política CORS');
}
response.setHeader('Access-Control-Allow-Origin', allowedOrigin);
return true;
}
}
+73
View File
@@ -52,6 +52,9 @@ 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 }])
@@ -61,6 +64,7 @@ export class AuthController {
logger: DadosferaLogger; logger: DadosferaLogger;
redirectUrl: string; redirectUrl: string;
constructor( constructor(
@Inject(DadosferaLogger) @Inject(DadosferaLogger)
dadosferaLogger: DadosferaLogger, dadosferaLogger: DadosferaLogger,
@@ -344,4 +348,73 @@ export class AuthController {
return { token, email, url, language }; return { token, email, url, language };
} }
@ApiInternalOnlyEndpoint()
@Post('users/block')
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
@HttpCode(HttpStatus.OK)
async blockUsers(
@Language() language: LanguageEnum,
@User() user: RequestUser,
) {
this.logger.info('blockUsers - Starting request');
try {
const metadata = PackTheMetadata({
customer_id: user.customer_id,
language,
});
this.logger.debug('Calling blockUsers service', {
metadata: {
access_token: metadata.get('access_token'),
language: metadata.get('language')
}
});
const result = await this.authClient.blockUsers(metadata);
this.logger.info('blockUsers - Success', { result });
return result;
} catch (error) {
this.logger.error('blockUsers - Error', {
error: error.message,
stack: error.stack
});
throw error;
}
}
@ApiInternalOnlyEndpoint()
@Post('users/unblock')
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
@HttpCode(HttpStatus.OK)
async unblockUsers(
@Language() language: LanguageEnum,
@User() user: RequestUser,
) {
this.logger.info('unblockUsers');
const metadata = PackTheMetadata({
customer_id: user.customer_id,
language,
});
return this.authClient.unblockUsers(metadata);
}
@ApiInternalOnlyEndpoint()
@Post('users/reset')
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
@HttpCode(HttpStatus.OK)
async resetUsers(
@Language() language: LanguageEnum,
@User() user: RequestUser,
) {
this.logger.info('resetUsers');
const metadata = PackTheMetadata({
access_token: user.access_token,
language,
});
return this.authClient.resetUsers( metadata);
}
} }
+60
View File
@@ -20,6 +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';
@Injectable() @Injectable()
export class AuthClientService implements OnModuleInit { export class AuthClientService implements OnModuleInit {
@@ -168,4 +169,63 @@ export class AuthClientService implements OnModuleInit {
this.authService.AuthOauthSignIn({ token, username, refreshToken: '' }), this.authService.AuthOauthSignIn({ token, username, refreshToken: '' }),
); );
} }
async blockUsers(metadata: Metadata): Promise<UserActionResponse> {
this.logger.info('blockUsers - Service starting');
try {
this.logger.debug('Calling BlockUser gRPC method', {
metadata: {
access_token: metadata.get('access_token'),
language: metadata.get('language')
}
});
const response = await lastValueFrom<UserActionResponse>(
this.authService.BlockUser({}, metadata),
);
this.logger.info('blockUsers - Service success', { response });
return response;
} catch (error) {
this.logger.error('blockUsers - Service error', {
error: error.message,
stack: error.stack,
});
throw error;
}
}
async unblockUsers(metadata: Metadata): Promise<UserActionResponse> {
this.logger.info('unblockUsers');
return await lastValueFrom(
this.authService.UnblockUser({}, metadata),
);
}
async resetUsers(metadata: Metadata): Promise<UserActionResponse> {
this.logger.info('resetUsers');
try {
this.logger.debug('Calling ResetUser gRPC method', {
metadata: {
access_token: metadata.get('access_token'),
language: metadata.get('language')
}
});
const response = await lastValueFrom<UserActionResponse>(
this.authService.ResetUser({}, metadata)
);
this.logger.info('resetUsers - Success', { response });
return response;
} catch (error) {
this.logger.error('resetUsers - Error', {
error: error.message,
stack: error.stack
});
throw error;
}
}
} }
+23
View File
@@ -67,16 +67,26 @@ export class AuthUser {
export class AuthCustomer { export class AuthCustomer {
@ApiProperty() @ApiProperty()
modules: string[]; modules: string[];
@ApiProperty() @ApiProperty()
id: string; id: string;
@ApiProperty() @ApiProperty()
name: string; name: string;
@ApiProperty()
displayName: string;
@ApiProperty() @ApiProperty()
tier: string; tier: string;
@ApiProperty() @ApiProperty()
scheduleLimit: string; scheduleLimit: string;
@ApiProperty() @ApiProperty()
links: Link[]; links: Link[];
@ApiProperty()
themeEnabled: boolean;
} }
export class AuthSignInReq implements AuthSignInRequest { export class AuthSignInReq implements AuthSignInRequest {
@@ -118,3 +128,16 @@ export class AuthRefreshAccessTokenRes {
@ApiProperty() @ApiProperty()
accessToken: string; accessToken: string;
} }
export interface UserActionRequest {
users: {
userIds: string[];
};
defaultPassword?: string;
}
export interface UserActionResponse {
message: string;
successfulUsers: string[];
failedUsers: string[];
}
+3
View File
@@ -5,6 +5,7 @@ import {
} from '@nestjs/microservices'; } from '@nestjs/microservices';
import { credentials } from '@grpc/grpc-js'; import { credentials } from '@grpc/grpc-js';
import { Catalog } from '@dadosfera/protospack-v2'; import { Catalog } from '@dadosfera/protospack-v2';
import { PlatformInterfaces } from '@dadosfera/protospack-v2';
const isLocalConnection = const isLocalConnection =
process.env.PIFACTORY_URL.startsWith('pi-factory:') || process.env.PIFACTORY_URL.startsWith('pi-factory:') ||
@@ -19,11 +20,13 @@ export class CatalogClientConfiguration {
package: [ package: [
Catalog.ProtoPackages.ReadPackage, Catalog.ProtoPackages.ReadPackage,
Catalog.ProtoPackages.WritePackage, Catalog.ProtoPackages.WritePackage,
PlatformInterfaces.ProtoPackages.WritePackage
], ],
credentials: isLocalConnection ? undefined : credentials.createSsl(), credentials: isLocalConnection ? undefined : credentials.createSsl(),
protoPath: [ protoPath: [
Catalog.ProtoPaths.ReadFilePath, Catalog.ProtoPaths.ReadFilePath,
Catalog.ProtoPaths.WriteFilePath, Catalog.ProtoPaths.WriteFilePath,
PlatformInterfaces.ProtoPaths.WriteFilePath
], ],
loader: { loader: {
keepCase: true, keepCase: true,
+94
View File
@@ -13,6 +13,8 @@ import {
Put, Put,
Query, Query,
UseFilters, UseFilters,
HttpException,
HttpStatus,
} from '@nestjs/common'; } from '@nestjs/common';
import { import {
ApiCreatedResponse, ApiCreatedResponse,
@@ -30,6 +32,7 @@ import { CatalogService } from './catalog.service';
import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; 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 { RequestUser, User } from 'src/decorators/user.decorator';
import { lastValueFrom } from 'rxjs';
import { import {
BatchRemoveRlsRulesRequest, BatchRemoveRlsRulesRequest,
GetDatasetCatalogTaskRes, GetDatasetCatalogTaskRes,
@@ -54,6 +57,7 @@ import {
AddRlsRuleRequest, AddRlsRuleRequest,
GetNimbusDashboardsRequest, GetNimbusDashboardsRequest,
GetRlsRulesRequest, GetRlsRulesRequest,
RegisterDatasetWithMetatadaRequest,
} from '@dadosfera/protospack-v2/dist/lib/Catalog/interfaces/messages'; } from '@dadosfera/protospack-v2/dist/lib/Catalog/interfaces/messages';
@ApiTags('Catalog') @ApiTags('Catalog')
@@ -743,4 +747,94 @@ export class CatalogController {
return JSON.parse(dashboards); return JSON.parse(dashboards);
} }
@Post('register-dataset')
@RequireSomePermission(
PERMISSIONS_GROUPS.CATALOG.permissions.CREATE,
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER
)
async registerDatasetWithMetadataRequest(
@Body() body: RegisterDatasetWithMetatadaRequest,
@User() user: RequestUser,
) {
const { customer_id, customer_name, user_id, username } = user;
const logMetadata = {
customer_name: customer_name,
user_id: user_id,
method: 'POST',
path: '/catalog/register-dataset',
};
try {
const metadata = PackTheMetadata({
customer_id,
customer_name,
user_id,
username,
});
this.logger.log(`Request from user ${user_id} for customer ${customer_name}`, logMetadata);
// Create table metadata
const tableMetadataBody = {
table_metadata: body.table_metadata,
info: {
customer: customer_name,
},
logMetadata: logMetadata
};
const table_metadata_id = await this.catalogService.createTableMetadata(
tableMetadataBody,
);
this.logger.info(`table_metadata_id: ${table_metadata_id}`, logMetadata);
// Create column metadata
const columnMetadataBody = {
column_metadata: body.column_metadata,
info: {
customer: customer_name,
},
};
this.logger.info(`Creating column metadata for table ${table_metadata_id}`, logMetadata);
const column_metadata_ids = await this.catalogService.createColumnMetadata(columnMetadataBody)
// Create data preview
const dataPreviewBody = {
data_preview: body.data_preview,
info: {
customer: customer_name,
},
};
this.logger.debug(`Creating data preview for table ${table_metadata_id}`, logMetadata);
const data_preview_id = await this.catalogService.createDataPreview(
dataPreviewBody,
);
// Catalog dataset item
this.logger.info(`Cataloging dataset item for table ${table_metadata_id}`, logMetadata);
await this.catalogService.catalogDatasetItem(table_metadata_id, metadata);
this.logger.info(`Dataset registration completed successfully for table ${table_metadata_id}`, logMetadata);
return {
message: 'Dataset registered successfully',
table_metadata_id: table_metadata_id,
column_metadata_ids: column_metadata_ids,
data_preview_id: data_preview_id,
};
} catch (error) {
this.logger.error(`Failed to register dataset. The following error occurred: ${error.response.data}`, logMetadata);
throw new HttpException(
{
message: 'Ocorreu um erro ao registrar o dataset',
error: error.message,
code: 'REGISTRATION_FAILED',
details: error.message,
},
HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
} }
+117
View File
@@ -5,6 +5,11 @@ import {
ProtoServices, ProtoServices,
Messages, Messages,
} from '@dadosfera/protospack-v2/dist/lib/Catalog'; } from '@dadosfera/protospack-v2/dist/lib/Catalog';
import {
Messages as PlatformInterfaceMessages,
WriteService as PlatformInterfaceWriteService,
ProtoServices as PlatformInterfacesProtoServices,
} from '@dadosfera/protospack-v2/dist/lib/PlatformInterfaces';
import { import {
BadRequestException, BadRequestException,
HttpException, HttpException,
@@ -33,6 +38,7 @@ import {
class CatalogService implements OnModuleInit { class CatalogService implements OnModuleInit {
catalogReadService: ReadService.CatalogReadServices; catalogReadService: ReadService.CatalogReadServices;
catalogWriteService: WriteService.CatalogWriteServices; catalogWriteService: WriteService.CatalogWriteServices;
platformWriteService: PlatformInterfaceWriteService.PlatformInterfacesWriteServices;
logger: any; logger: any;
constructor( constructor(
@Inject(DadosferaLogger) @Inject(DadosferaLogger)
@@ -54,9 +60,14 @@ class CatalogService implements OnModuleInit {
this.grpcClient.getService<WriteService.CatalogWriteServices>( this.grpcClient.getService<WriteService.CatalogWriteServices>(
ProtoServices.CatalogWriteServices, ProtoServices.CatalogWriteServices,
); );
this.platformWriteService =
this.grpcClient.getService<PlatformInterfaceWriteService.PlatformInterfacesWriteServices>(
PlatformInterfacesProtoServices.PlatformInterfacesWriteServices,
);
} }
_getNimbusUrl(body) { _getNimbusUrl(body) {
this.logger.debug(`Body: ${JSON.stringify(body)}`);
const customer = body.info.customer.toLowerCase(); const customer = body.info.customer.toLowerCase();
if (process.env.ENV === 'prd') { if (process.env.ENV === 'prd') {
@@ -420,6 +431,112 @@ class CatalogService implements OnModuleInit {
); );
return res.dashboards; return res.dashboards;
} }
async createTableMetadata(body: any): Promise<number> {
const nimbusUrl = this._getNimbusUrl(body);
this.logger.info(`Nimbus URL: ${nimbusUrl}`, {...body.logMetadata});
const endpoint = `${nimbusUrl}/api/catalog/table-metadata/`;
this.logger.info(`Creating table metadata for table ${body.table_metadata.table_name}`, {...body.logMetadata});
this.logger.info(`Using endpoint: ${endpoint}`, {...body.logMetadata});
this.logger.debug(`Payload: ${JSON.stringify(body.table_metadata)}`, {...body.logMetadata});
try {
const { data, status } = await axios.post(endpoint, {...body.table_metadata});
this.logger.info(
`Table metadata created successfully with status ${status} for table ${body.table_metadata.table_name}`,
{...body.logMetadata},
);
return data.id;
} catch (error) {
this.logger.error(
`Failed to create table metadata for table ${body.table_metadata.table_name} failed with status ${
error.response?.status
} because of ${JSON.stringify(error.response?.data) || error.message}`, {...body.logMetadata});
throw new Error(error.response?.data?.message || error.message);
}
}
async createColumnMetadata(body: any): Promise<number[]> {
const nimbusUrl = this._getNimbusUrl(body);
this.logger.info(`Nimbus URL: ${nimbusUrl}`, body.logMetadata);
const endpoint = `${nimbusUrl}/api/catalog/column-metadata/`;
try {
this.logger.info(`Creating column metadata for table ${body.column_metadata.table_name}`, {...body.logMetadata});
this.logger.info(`Using endpoint: ${endpoint}`, {...body.logMetadata});
this.logger.debug(`Payload: ${JSON.stringify(body.column_metadata)}`, {...body.logMetadata});
const { data, status } = await axios.post(endpoint, body.column_metadata);
this.logger.info(
`Column metadata created successfully with status ${status} for table ${body.column_metadata.table_name}`,
{...body.logMetadata},
);
return data.map((column) => column.id);
} catch (error) {
this.logger.error(
`Failed to create column metadata failed with status for table ${body.column_metadata.table_name} ${
error.response?.status
} because of ${error.response?.data || error.message}`, {...body.logMetadata});
throw new Error(error.response?.data?.message || error.message);
}
}
async createDataPreview(body: any): Promise<number> {
const nimbusUrl = this._getNimbusUrl(body);
this.logger.info(`Nimbus URL: ${nimbusUrl}`, {...body.logMetadata});
const endpoint = `${nimbusUrl}/api/catalog/data-preview/`;
this.logger.info(`Creating data preview for table ${body.data_preview.table_name}`, {...body.logMetadata});
this.logger.info(`Using endpoint: ${endpoint}`, {...body.logMetadata});
this.logger.debug(`Payload: ${JSON.stringify(body.data_preview)}`, {...body.logMetadata});
try {
const { data, status } = await axios.post(endpoint, body.data_preview);
this.logger.info(
`Data preview created successfully with status ${status} for table ${body.data_preview.table_name}`,
{...body.logMetadata},
);
return data.id;
} catch (error) {
this.logger.error(
`Failed to create data preview for table ${body.data_preview.table_name} failed with status ${
error.response?.status
} because of ${error.response?.data || error.message}`,
{...body.logMetadata},
);
throw new Error(error.response?.data?.message || error.message);
}
}
async catalogDatasetItem(table_metadata_id: number, metadata: Metadata) {
const customer_name_raw = metadata.get('customer_name');
const customer_name = customer_name_raw?.[0]?.toString();
if (!customer_name) {
throw new BadRequestException('Customer name not found in metadata');
}
const res = await lastValueFrom(
this.platformWriteService.CatalogDataAssets(
{
data_assets: [
{
data_asset_id: table_metadata_id.toString(),
customer_name: customer_name,
data_asset_type: 'dataset',
},
],
},
metadata,
),
);
return res;
}
} }
export { CatalogService }; export { CatalogService };
+1 -1
View File
@@ -145,7 +145,7 @@ export class CustomersService implements OnModuleInit {
const res = await lastValueFrom( const res = await lastValueFrom(
this.pipelineReadService.PipelineV2GetDashboardUrl( this.pipelineReadService.PipelineV2GetDashboardUrl(
{ {
dashboard_id: '45', dashboard_id: '98',
exp: '15m', exp: '15m',
metabase_customer_name: 'dadosferatech', metabase_customer_name: 'dadosferatech',
}, },
+11 -3
View File
@@ -1,4 +1,4 @@
import { Body, Controller, Inject, Param, Post } from '@nestjs/common'; import { Body, Controller, Inject, Param, Post, Req } from '@nestjs/common';
import { init } from 'mixpanel'; import { init } from 'mixpanel';
import { Authenticated } from 'src/decorators/authentication.decorator'; import { Authenticated } from 'src/decorators/authentication.decorator';
import { ApiInternalOnlyController } from 'src/decorators/swagger.decorator'; import { ApiInternalOnlyController } from 'src/decorators/swagger.decorator';
@@ -13,7 +13,12 @@ export class MixpanelController {
private readonly mixpanelToken: string, private readonly mixpanelToken: string,
) {} ) {}
@Post(':id') @Post(':id')
async trackEvent(@Param('id') id, @Body() body, @User() user: RequestUser) { async trackEvent(
@Param('id') id,
@Body() body,
@User() user: RequestUser,
@Req() request
) {
delete body.info; delete body.info;
const mixpanel = init(this.mixpanelToken); const mixpanel = init(this.mixpanelToken);
@@ -66,13 +71,16 @@ export class MixpanelController {
$email: user.username.includes('@') $email: user.username.includes('@')
? user.username ? user.username
: user.username + '@dadosfera.ai', : user.username + '@dadosfera.ai',
customer_name: user.customer_name, customer_name: user.customer_name
}); });
await mixpanel.track(id, { await mixpanel.track(id, {
distinct_id: user.username, distinct_id: user.username,
customer: user.customer_name, customer: user.customer_name,
env: process.env.ENV, env: process.env.ENV,
$ip: request.ip,
$os: request.headers['sec-ch-ua-platform'] || '',
$browser: request.headers['user-agent'],
...body, ...body,
}); });
+15 -22
View File
@@ -1,5 +1,5 @@
import DadosferaLogger from '@dadosfera/dadosfera-logs'; import DadosferaLogger from '@dadosfera/dadosfera-logs';
import { Body, Controller, Header, HttpCode, Inject, Param, Post, Query, Req, UseFilters, UseGuards } from '@nestjs/common'; import { Body, Controller, ForbiddenException, Header, Headers, HttpCode, HttpException, Inject, Param, Post, Query, Req, Res, UseFilters, UseGuards, UseInterceptors } from '@nestjs/common';
import { ApiCreatedResponse, ApiHeaders, ApiOkResponse, ApiTags } from '@nestjs/swagger'; import { ApiCreatedResponse, ApiHeaders, ApiOkResponse, ApiTags } from '@nestjs/swagger';
import { ApiInternalOnlyController } from 'src/decorators/swagger.decorator'; import { ApiInternalOnlyController } from 'src/decorators/swagger.decorator';
import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter'; import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter';
@@ -8,7 +8,6 @@ import { UsersService } from '../users/users.service';
import { Language } from 'src/decorators/language.decorator'; import { Language } from 'src/decorators/language.decorator';
import { OpenDataService } from './open-data.service'; import { OpenDataService } from './open-data.service';
import { CreateUserOpenDataDTO, WordpressForm } from './dto/wordpres-form'; import { CreateUserOpenDataDTO, WordpressForm } from './dto/wordpres-form';
import { CORSGuard, SetOrigin } from 'src/decorators/set-origin.decorator';
import { Metadata } from '@grpc/grpc-js'; 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 'http';
@@ -31,8 +30,6 @@ export class OpenDataController {
} }
@Post("/sharing-ocean-data") @Post("/sharing-ocean-data")
// @SetOrigin('devsbm.dadosfera.io')
// @UseGuards(CORSGuard)
@HttpCode(200) @HttpCode(200)
@Header('content-type', 'application/json') @Header('content-type', 'application/json')
@ApiOkResponse() @ApiOkResponse()
@@ -43,23 +40,20 @@ export class OpenDataController {
language: string, language: string,
@Req() @Req()
request: Request, request: Request,
@Headers('origin')
origin: string
) { ) {
this.logger.info('createUser for open data' this.logger.info('createUser for open data' + JSON.stringify(request.headers));
+ JSON.stringify({
origin: request.headers.origin,
language,
body
}));
// "401573bb-334f-44b2-b30e-88d4cea31ae9" const corslist = ["https://devsbm.dadosfera.io", "https://sharingoceandata.com"];
// const OPENDATA_PUBLIC_USERS_GROUP_ID = process.env.OPEN_GROUP_ID; if (!corslist.includes(origin)) {
// ""f239718a-a271-4ef9-ae7e-02a2f0f3aa6e"" this.logger.info('block request by cors list: '+ origin);
// const OPENDATA_CUSTOMER_ID = process.env.OPEN_CUSTOMER_ID; throw new ForbiddenException();
const OPENDATA_CUSTOMER_ID = "b3e3dfe5-b992-4586-a73c-c0b0c00f615d"; }
this.logger.info("OPENDATA_CUSTOMER_ID: " + process.env.OPEN_CUSTOMER_ID) const OPENDATA_CUSTOMER_ID = process.env.OPEN_CUSTOMER_ID;
this.logger.info("OPEN_GROUP_ID: " + process.env.OPEN_GROUP_ID) const OPENDATA_GROUP_ID = process.env.OPEN_GROUP_ID;
const roles = ["e3f98a2f-7748-4981-8505-7695c8ca8218"]; const roles = [process.env.OPEN_GROUP_ID];
const metadata = PackTheMetadata({ const metadata = PackTheMetadata({
language: language || 'en-us' language: language || 'en-us'
}); });
@@ -77,7 +71,6 @@ export class OpenDataController {
this.logger.error('user data ' + e.message); this.logger.error('user data ' + e.message);
} }
const user: CreateUserOpenDataDTO = { const user: CreateUserOpenDataDTO = {
email: data["email"], email: data["email"],
enquiryType: data["enquiry_type"], enquiryType: data["enquiry_type"],
@@ -85,11 +78,11 @@ export class OpenDataController {
lastName: data["last_name"], lastName: data["last_name"],
organization: data["organization"] organization: data["organization"]
} }
this.logger.info('user request' + JSON.stringify({ user, roles, customer: OPENDATA_CUSTOMER_ID })); this.logger.info(`user request to group ${OPENDATA_CUSTOMER_ID} with role ${OPENDATA_GROUP_ID}`);
try { try {
await this.openDataService.createUser(OPENDATA_CUSTOMER_ID, user, roles, metadata); const id = await this.openDataService.createUser(OPENDATA_CUSTOMER_ID, user, roles, metadata);
this.logger.info('user created with sucessfull data'); this.logger.info('user created with id: '+ id);
return { return {
success: true, success: true,
status: 'success', status: 'success',
+2 -2
View File
@@ -40,10 +40,10 @@ export class OpenDataService implements OnModuleInit {
} }
try { try {
await lastValueFrom( const { user } = await lastValueFrom(
this.usersClientService.SimpleUserCreate(body, metadata), this.usersClientService.SimpleUserCreate(body, metadata),
); );
return "User created"; return user.id;
} catch(err) { } catch(err) {
return err; return err;
} }
+1 -1
View File
@@ -328,7 +328,7 @@ export class PipelinesService implements OnModuleInit {
const res = await lastValueFrom( const res = await lastValueFrom(
this.pipelineReadService.PipelineV2GetDashboardUrl( this.pipelineReadService.PipelineV2GetDashboardUrl(
{ {
dashboard_id: '83', dashboard_id: '95',
exp: '15m', exp: '15m',
metabase_customer_name: 'dadosferatech', metabase_customer_name: 'dadosferatech',
}, },
+2 -2
View File
@@ -27,9 +27,9 @@ export class CustomerTheme implements Theme {
@ApiProperty() @ApiProperty()
textColor: string; textColor: string;
@ApiProperty() @ApiProperty()
logoWhite: string; logo: string;
@ApiProperty() @ApiProperty()
logoBlack: string; logoLogin: string;
} }
export class CustomerThemeResponse { export class CustomerThemeResponse {
+14 -12
View File
@@ -59,22 +59,22 @@ export class ThemeController {
id, id,
})); }));
const logoWhite = files.find(file => file.fieldname === 'logoWhite'); const logo = files.find(file => file.fieldname === 'logo');
const logoBlack = files.find(file => file.fieldname === 'logoBlack'); const logoLogin = files.find(file => file.fieldname === 'logoLogin');
this.validFileSize(logoWhite); this.validFileSize(logo);
this.validFileSize(logoBlack); this.validFileSize(logoLogin);
this.validMimeType(logoWhite); this.validMimeType(logo);
this.validMimeType(logoBlack); this.validMimeType(logoLogin);
try { try {
const theme = await this.themeService.createThemeByCustomer(id, { const theme = await this.themeService.createThemeByCustomer(id, {
...data, ...data,
logoWhite, logo,
logoBlack logoLogin
}); });
this.logger.info('saveCustomertheme' + JSON.stringify(theme)); this.logger.info('saveCustomertheme' + JSON.stringify(theme));
return { theme: theme }; return theme;
} catch (err) { } catch (err) {
if (err.details === ErrorCodes.CUSTOMER.NOT_FOUND) { if (err.details === ErrorCodes.CUSTOMER.NOT_FOUND) {
this.logger.error('Error - saveCustomertheme - Expect CUSTOMER.NOT_FOUND'); this.logger.error('Error - saveCustomertheme - Expect CUSTOMER.NOT_FOUND');
@@ -98,7 +98,7 @@ export class ThemeController {
const mimeTypesValid = ['image/jpeg', 'image/jpg', 'image/png']; const mimeTypesValid = ['image/jpeg', 'image/jpg', 'image/png'];
if (file && !mimeTypesValid.includes(file.mimetype)) { if (file && !mimeTypesValid.includes(file.mimetype)) {
throw new HttpException(`O Arquivo ${file.fieldname} deve ser jpeg, jpg ou png`, HttpStatus.BAD_REQUEST); throw new HttpException(`O Arquivo ${file.fieldname} deve ser jpeg, jpg, ou png`, HttpStatus.BAD_REQUEST);
} }
} }
@@ -109,8 +109,10 @@ export class ThemeController {
try { try {
const data = await this.themeService.getThemeByCustomer(id); const data = await this.themeService.getThemeByCustomer(id);
this.logger.info('Success - getCustomerTheme with id'+ id); this.logger.info('Success - getCustomerTheme'+ JSON.stringify(data));
return data; if (data?.theme) return data;
return { theme: null };
}catch (err) { }catch (err) {
if (err.details === ErrorCodes.CUSTOMER.NOT_FOUND) { if (err.details === ErrorCodes.CUSTOMER.NOT_FOUND) {
this.logger.error('Error - getCustomerTheme - Expect CUSTOMER.NOT_FOUND'); this.logger.error('Error - getCustomerTheme - Expect CUSTOMER.NOT_FOUND');
+43 -18
View File
@@ -21,11 +21,10 @@ import { resolve } from 'path';
import { Readable } from 'stream'; import { Readable } from 'stream';
type Files = { type Files = {
logoWhite: Express.Multer.File, logo: Express.Multer.File,
logoBlack: Express.Multer.File, logoLogin: Express.Multer.File,
} }
// This function will accept any string, which may result in a bug.
@Injectable() @Injectable()
export class ThemeService implements OnModuleInit { export class ThemeService implements OnModuleInit {
private themeService: ThemeProtoService; private themeService: ThemeProtoService;
@@ -63,12 +62,12 @@ export class ThemeService implements OnModuleInit {
chunk: Buffer.alloc(0) chunk: Buffer.alloc(0)
}) })
if(theme.logoBlack) { if(theme.logo) {
await this.sendFile(theme.logoBlack, customerThemeRequest$); await this.sendFile(theme.logo, customerThemeRequest$);
} }
if(theme.logoWhite) { if(theme.logoLogin) {
await this.sendFile(theme.logoWhite, customerThemeRequest$); await this.sendFile(theme.logoLogin, customerThemeRequest$);
} }
customerThemeRequest$.complete(); customerThemeRequest$.complete();
@@ -95,18 +94,20 @@ export class ThemeService implements OnModuleInit {
} }
private async sendFile(file: Express.Multer.File, stream$: ReplaySubject<ThemeRequest>) { private async sendFile(file: Express.Multer.File, stream$: ReplaySubject<ThemeRequest>) {
const bufferStream = new Readable({ const chunkSize = 4 * 1024 * 1024;
highWaterMark: 1024 * 1024, // 1 MB por chunk const bufferStream = new CustomBufferStream(file.buffer, chunkSize);
read() {} const parseMimitypeForExtension = {
}); 'image/jpeg': '.jpeg',
bufferStream.push(file.buffer); 'image/jpg': '.jpg',
bufferStream.push(null); 'image/png': '.png',
'image/svg+xml': '.svg',
}
const extension = parseMimitypeForExtension[file.mimetype];
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
bufferStream.on('data', (chunk) => { bufferStream.on('data', (chunk) => {
console.log('enviando chunk', file.fieldname) const filename = file.fieldname.concat(extension);
const mimetype = file.mimetype.split('/')[1]; // example image/jpeg
const filename = file.fieldname.concat(".", mimetype);
stream$.next({ stream$.next({
customerId: '', customerId: '',
displayName: '', displayName: '',
@@ -119,15 +120,39 @@ export class ThemeService implements OnModuleInit {
}); });
bufferStream.on('end', () => { bufferStream.on('end', () => {
console.log('terminou de enviar')
resolve(file.filename) resolve(file.filename)
}); });
bufferStream.on('error', (err) => { bufferStream.on('error', (err) => {
console.error('Erro no stream:', err);
reject(err); reject(err);
}); });
}); });
} }
} }
class CustomBufferStream extends Readable {
buffer: Buffer;
offset: number;
chunkSize: number;
constructor(buffer: Buffer, chunkSize: number) {
super({ highWaterMark: chunkSize }); // Configura o tamanho do chunk
this.buffer = buffer;
this.offset = 0;
this.chunkSize = chunkSize;
}
_read() {
if (this.offset < this.buffer.length) {
const end = Math.min(this.offset + this.chunkSize, this.buffer.length);
const copiedBuf = Uint8Array.prototype.slice.call(this.buffer);
const chunk = copiedBuf.slice(this.offset, end);
this.offset = end;
this.push(chunk);
} else {
this.push(null);
}
}
}
+7
View File
@@ -77,6 +77,13 @@ export function EnrichErrorCode(code: string) {
message: 'Token para recuperar senha inválido', message: 'Token para recuperar senha inválido',
code, code,
}; };
case ErrorCodes.AUTH.REQUIRED_PASSWORD_RESET:
return {
statusCode: HttpStatus.UNAUTHORIZED,
error: 'Não permitido',
message: 'Seu usuário foi resetado por um administrador, resete a senha pelo link "Esqueci a senha", para prosseguir',
code,
};
case ErrorCodes.AUTH.WEAK_NEW_PASSWORD: case ErrorCodes.AUTH.WEAK_NEW_PASSWORD:
return { return {
+1
View File
@@ -13,6 +13,7 @@ export const AUTH = {
RESET_PASSWORD_CODE_EXPIRED: 'AUTH.RESET_PASSWORD_CODE_EXPIRED', RESET_PASSWORD_CODE_EXPIRED: 'AUTH.RESET_PASSWORD_CODE_EXPIRED',
RESET_PASSWORD_CODE_INVALID: 'AUTH.RESET_PASSWORD_CODE_INVALID', RESET_PASSWORD_CODE_INVALID: 'AUTH.RESET_PASSWORD_CODE_INVALID',
WEAK_NEW_PASSWORD: 'AUTH.WEAK_NEW_PASSWORD', WEAK_NEW_PASSWORD: 'AUTH.WEAK_NEW_PASSWORD',
REQUIRED_PASSWORD_RESET: 'AUTH.REQUIRED_PASSWORD_RESET'
}; };
export const ROLE = { export const ROLE = {
INVALID_ID: 'ROLE.INVALID_ID', INVALID_ID: 'ROLE.INVALID_ID',