FIX: update timeout

environment.d.ts

@@ -14,7 +14,6 @@ declare global {
       AWS_REGION: string;
       OPEN_GROUP_ID: string;
       OPEN_CUSTOMER_ID: string;
-      DEDICATED_PROXY: string;
     }
   }
 }

helmfiles/stg.yaml

@@ -18,33 +18,5 @@ charts:
         value: b3e3dfe5-b992-4586-a73c-c0b0c00f615d
       - name: maestro.open_group_id
         value: e3f98a2f-7748-4981-8505-7695c8ca8218
-      - name: replicaCount
-        value: 1
-  
-    # Environment to test Network Policies
-  - name: private-maestro
-    chart: ../maestro
-    values:
-    - ../maestro/values.yaml
-    set:
-      - name: app_name
-        value: maestro-private
-      - name: maestro.duc_url
-        value: duc.stg.dadosfera.ai
-      - name: hostname
-        value: private-maestro.stg.dadosfera.ai
-      - name: maestro.pi_factory_url
-        value: pi-factory.dadosfera.ai
-      - name: maestro.in_factory_url
-        value: in-factory.stg.dadosfera.ai
-      - name: maestro.tr_factory_url
-        value: in-factory.dadosfera.ai
-      - name: maestro.open_customer_id
-        value: b3e3dfe5-b992-4586-a73c-c0b0c00f615d
-      - name: maestro.open_group_id
-        value: e3f98a2f-7748-4981-8505-7695c8ca8218
-      # Customer id
-      - name: maestro.dedicated_proxy
-        value: 14d52fd4-d83d-4cdd-be34-bf11cc28b3bd
       - name: replicaCount
         value: 1

maestro/templates/deployment.yaml

@@ -1,16 +1,16 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ .Values.app_name }}
+  name: maestro
   namespace: applications
   labels:
-    app: {{ .Values.app_name }}
+    app: maestro
 
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app: {{ .Values.app_name }}
+      app: maestro
   
   strategy:
     rollingUpdate:
@@ -20,7 +20,7 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ .Values.app_name }}
+        app: maestro
     
     spec:
       imagePullSecrets:
@@ -100,8 +100,6 @@ spec:
               value: {{ .Values.maestro.open_customer_id }}
             - name: OPEN_GROUP_ID
               value: {{ .Values.maestro.open_group_id }}
-            - name: DEDICATED_PROXY
-              value: {{ .Values.maestro.dedicated_proxy }}
             - name: JWT_PRIVATE_KEY
               valueFrom:
                 secretKeyRef:
@@ -110,15 +108,15 @@ spec:
             - name: AWS_ACCESS_KEY_ID
               valueFrom:
                 secretKeyRef:
-                  name: prd-{{ .Values.app_name }}
+                  name: prd-maestro
                   key: AWS_ACCESS_KEY_ID
             - name: AWS_SECRET_ACCESS_KEY
               valueFrom:
                 secretKeyRef:
-                  name: prd-{{ .Values.app_name }}
+                  name: prd-maestro
                   key: AWS_SECRET_ACCESS_KEY
             - name: AWS_DEFAULT_REGION
               valueFrom:
                 secretKeyRef:
-                  name: prd-{{ .Values.app_name }}
+                  name: prd-maestro
                   key: AWS_DEFAULT_REGION

maestro/templates/ingress-private.yaml

@@ -10,12 +10,8 @@ metadata:
       
   generation: 1
   labels:
-    app: {{ .Values.app_name }}
+    app: maestro
-  {{- if .Values.maestro.dedicated_proxy}}
-  name: open-data-{{ .Values.app_name }}
-  {{- else }}
   name: open-data
-  {{- end }}
   namespace: applications
 spec:
   ingressClassName: nginx
@@ -25,7 +21,7 @@ spec:
       paths:
       - backend:
           service:
-            name: {{ .Values.app_name }}
+            name: maestro
             port:
               number: {{ .Values.ingress.port }}
         path: /open-data/sharing-ocean-data

maestro/templates/ingress.yaml

@@ -9,8 +9,8 @@ metadata:
       
   generation: 1
   labels:
-    app: {{ .Values.app_name }}
+    app: maestro
-  name: {{ .Values.app_name }}
+  name: maestro
   namespace: applications
 spec:
   ingressClassName: nginx
@@ -20,7 +20,7 @@ spec:
       paths:
       - backend:
           service:
-            name: {{ .Values.app_name }}
+            name: maestro
             port:
               number: {{ .Values.ingress.port }}
         path: /

maestro/templates/secret.yaml

@@ -1,17 +1,17 @@
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
-  name: prd-{{ .Values.app_name }}
+  name: prd-maestro
   namespace: applications
   labels:
-    app: {{ .Values.app_name }}
+    app: maestro
 spec:
   refreshInterval: 1h
   secretStoreRef:
     name: secretsmanager-prd
     kind: SecretStore
   target:
-    name: prd-{{ .Values.app_name }}
+    name: prd-maestro
     creationPolicy: Owner
   data:
   - secretKey: AWS_ACCESS_KEY_ID

maestro/templates/service.yaml

@@ -1,18 +1,18 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.app_name }}
+  name: maestro
   namespace: applications
   labels:
-    app: {{ .Values.app_name }}
+    app: maestro
 
 spec:
   type: ClusterIP
   ports:
-  - name: {{ .Values.app_name }}
+  - name: maestro
     protocol: TCP
     port: {{ .Values.service.port }}
     targetPort: {{ .Values.service.targetPort }}
   selector:
-    app: {{ .Values.app_name }}
+    app: maestro
 

maestro/values.yaml

@@ -9,7 +9,6 @@ image:
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: 1.56.0
-app_name: maestro
 containerPort: 3333
 imagePullSecrets: "applications-secrets-ecr-auth-token-external-secret"
 service:
@@ -43,7 +42,6 @@ maestro:
   upload_file_agent_connection: cbc2f881-58c4-4d60-8003-0979b0b5b911
   open_customer_id: f239718a-a271-4ef9-ae7e-02a2f0f3aa6e
   open_group_id: 401573bb-334f-44b2-b30e-88d4cea31ae9
-  dedicated_proxy: ""
 autoscaling:
   enabled: false
   minReplicas: 1

src/authentication/authentication.guard.ts

@@ -4,7 +4,6 @@ import {
   OnApplicationBootstrap,
   ExecutionContext,
   Inject,
-  ForbiddenException,
 } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import assert from 'assert';
@@ -114,18 +113,6 @@ export class AuthenticationGuard
       return false;
     }
 
-    // Bloquear outros customer de usar o maestor dedicado
-    const DEDICATED_PROXY = process.env.DEDICATED_PROXY
-    if (DEDICATED_PROXY !== '' && DEDICATED_PROXY !== accessTokenPayload.customer_id) {
-      throw new ForbiddenException();
-    }
-
-    // Bloquear o customer de acesso o maestro publico
-    const hasNetworkPolicyModule = accessTokenPayload.customer_modules.includes('network-policy');
-    if (hasNetworkPolicyModule && DEDICATED_PROXY === '') {
-      throw new ForbiddenException();
-    }
-
     request.accessTokenPayload = accessTokenPayload;
     request.user = {
       user_id: accessTokenPayload.user_id,

src/modules/auth/auth.controller.ts

@@ -86,9 +86,11 @@ export class AuthController {
   async signIn(
     @Body() { username, password, totp }: AuthSignInReq,
     @Language() language: LanguageEnum,
+    @Headers('origin') origin = '',
   ): Promise<AuthSignInRes> {
     this.logger.info('/auth - SignIn');
-    const metadata = PackTheMetadata({ language });
+    const frontHost = origin.replace(/^https?:\/\//, '');
+    const metadata = PackTheMetadata({ language, custom_host: frontHost });
     this.logger.info('metadata: ' + JSON.stringify(metadata.toJSON()));
     return this.authClient.signIn({ username, password, totp }, metadata);
   }

src/modules/auth/auth.service.ts

@@ -1,4 +1,4 @@
-import { OnModuleInit, Inject, Injectable, ForbiddenException } from '@nestjs/common';
+import { OnModuleInit, Inject, Injectable } from '@nestjs/common';
 import { ClientGrpc } from '@nestjs/microservices';
 import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
 import { lastValueFrom } from 'rxjs';
@@ -17,7 +17,6 @@ import {
   AuthResetPasswordRequest,
   AuthVerifyResetPasswordCodeRequest,
   AuthConfirmResetPasswordRequest,
-  AuthSignInResponse,
 } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages';
 import { DucClient } from '../duc/client.config';
 import { Metadata } from '@grpc/grpc-js';
@@ -54,49 +53,15 @@ export class AuthClientService implements OnModuleInit {
     return lastValueFrom(this.authService.AuthSnowflakeSignIn(input));
   }
 
-  checkDedicatedProxy({
-    customer
-  }: AuthSignInResponse) {
-    const DEDICATED_PROXY = process.env.DEDICATED_PROXY || '';
-    this.logger.info('SignIn - Setting customer ID for dedicated proxy: ' + DEDICATED_PROXY);
-    this.logger.info('Customer ID: ' + customer.id);
-
-    if (DEDICATED_PROXY !== '' && DEDICATED_PROXY !== customer.id) {
-      throw new ForbiddenException();
-    }
-
-    // Bloquear o customer de acesso o maestro publico
-    this.logger.info('Check if customer have network policy: ' + customer.modules);
-    const hasNetworkPolicyModule = customer.modules.includes('network-policy');
-    if (hasNetworkPolicyModule && DEDICATED_PROXY === '') {
-      throw new ForbiddenException();
-    }
-  }
-
   async signIn(
     { username, password, totp }: AuthSignInRequest,
     metadata: Metadata,
   ) {
     this.logger.info('SignIn');
 
-    let result: AuthSignInResponse;
+    return lastValueFrom(
-
+      this.authService.AuthSignIn({ username, password, totp }, metadata),
-    try {
+    );
-      result = await lastValueFrom(
-        this.authService.AuthSignIn({ username, password, totp }, metadata),
-      );
-
-    } catch (error) {
-      this.logger.error('SignIn - Error during sign-in');
-      this.logger.error(error);
-      throw error;
-    }
-
-    if (result.customer) {
-      this.checkDedicatedProxy(result);
-    }
-
-    return result
   }
 
   async refreshAccessToken(

src/utils/FileParser/pdf-parser.ts

@@ -22,7 +22,7 @@ export class PDFParser<T> implements Parser<T> {
       const html = await this.htmlParser.parse(data);
       await page.setContent(html, {
         waitUntil: 'networkidle0',
-        timeout: 30000,
+        timeout: 90000,
       });
 
       // Configurações adicionais para garantir um PDF válido
@@ -43,7 +43,7 @@ export class PDFParser<T> implements Parser<T> {
         pageRanges: '',
         tagged: true,
         outline: false,
-        timeout: 30000,
+        timeout: 90000,
       });
 
       await browser.close();