Merge pull request #246 from dadosfera/feature/white-label-app

Feature/white label app

.github/workflows/deploy-k8s.yml

@@ -1,73 +0,0 @@
-name: Deploy K8S Modifications
-
-on:
-  push:
-    branches:
-      - main
-      - beta
-
-jobs:
-  extract_environment:
-    runs-on: ubuntu-22.04
-    outputs:
-      environment: ${{ steps.extract_environment.outputs.environment }}
-    steps:
-      - name: Extract Environment
-        run: |
-          if [ ${GITHUB_REF} == "refs/heads/main" ]; then
-            echo "environment=prd" >> $GITHUB_OUTPUT
-          elif [ ${GITHUB_REF} == "refs/heads/beta" ]; then
-            echo "environment=stg" >> $GITHUB_OUTPUT
-          fi
-        id: extract_environment
-
-  helmfile-deploy:
-    needs: [extract_environment]
-    runs-on: [self-hosted, "prd-azure"]
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Set up Helm
-        uses: azure/setup-helm@v1
-        with:
-          version: 'v3.9.0'
-
-      - name: Install Azure ClI
-        run: |
-          curl -sL https://aka.ms/InstallAzureCLIDeb | bash
-
-      - uses: azure/login@v2
-        with:
-          creds: '{"clientId":"${{ secrets.ARM_CLIENT_ID }}","clientSecret":"${{ secrets.ARM_CLIENT_SECRET }}","subscriptionId":"${{ secrets.ARM_SUBSCRIPTION_ID }}","tenantId":"${{ secrets.ARM_TENANT_ID }}"}'
-
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.8'
-
-      - name: Install Helmfile
-        run: |
-          wget https://github.com/helmfile/helmfile/releases/download/v0.148.0/helmfile_0.148.0_linux_amd64.tar.gz
-          tar -xzf helmfile_0.148.0_linux_amd64.tar.gz
-          mv helmfile /usr/local/bin/
-          helmfile --version
-
-      - name: Install Helm Diff Plugin
-        run: helm plugin install https://github.com/databus23/helm-diff || true
-
-      - name: Setup kubectl
-        uses: azure/setup-kubectl@v1
-        with:
-          version: 'v1.30.1'
-
-      - name: Authenticate with cluster
-        env:
-          CLUSTER_NAME: platform-${{ needs.extract_environment.outputs.environment }}
-        run: az aks get-credentials --resource-group dadosfera-prd --name ${CLUSTER_NAME} --overwrite-existing
-
-      - name: Run Helmfile Apply
-        env:
-          ENV: ${{ needs.extract_environment.outputs.environment }}
-        run: helmfile -f helmfiles/${ENV}.yaml sync

README.md

@@ -2,6 +2,7 @@
   <image src="./assets/maestro.svg" style="width:10rem">
 </p>
 
+
 # Maestro
 
 Maestro é a API principal da Dadosfera. É responsável pela comunicação do Frontend com nossos microsserviços.

docsfera.json

@@ -5619,6 +5619,9 @@
               "items": {
                 "type": "string"
               }
+            },
+            "themeEnabled": {
+              "type": "boolean"
             }
           },
           "required": [
@@ -5627,7 +5630,8 @@
             "name",
             "tier",
             "scheduleLimit",
-            "links"
+            "links",
+            "themeEnabled"
           ]
         },
         "AuthUser": {
@@ -8374,18 +8378,18 @@
             "textColor": {
               "type": "string"
             },
-            "logoWhite": {
+            "logo": {
               "type": "string"
             },
-            "logoBlack": {
+            "logoLogin": {
               "type": "string"
             }
           },
           "required": [
             "backgroundColor",
             "textColor",
-            "logoWhite",
-            "logoBlack"
+            "logo",
+            "logoLogin"
           ]
         },
         "CustomerThemeResponse": {

helmfiles/stg.yaml

@@ -15,7 +15,8 @@ charts:
       - name: maestro.tr_factory_url
         value: in-factory.dadosfera.ai
       - name: maestro.open_customer_id
-        value: bb4e9b26-d465-40ff-9345-e768ca69a55e
+        value: b3e3dfe5-b992-4586-a73c-c0b0c00f615d
       - name: maestro.open_group_id
-        value: 4d621501-5ea4-444b-b46e-1a009f3132ff
-        
+        value: e3f98a2f-7748-4981-8505-7695c8ca8218
+      - name: replicaCount
+        value: 1

maestro/templates/deployment.yaml

@@ -36,6 +36,11 @@ spec:
                     operator: In
                     values:
                       - backend
+      tolerations:
+      - key: "kubernetes.azure.com/scalesetpriority"
+        operator: "Equal"
+        value: "spot"
+        effect: "NoSchedule"
 
       containers:
         - name: maestro
@@ -90,6 +95,10 @@ spec:
               value: {{ .Values.maestro.tr_factory_url }}
             - name: 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
               valueFrom:
                 secretKeyRef:

package-lock.json

@@ -12,7 +12,7 @@
         "@aws-sdk/client-secrets-manager": "^3.414.0",
         "@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
         "@dadosfera/protospack": "2.5.3",
-        "@dadosfera/protospack-v2": "3.37.0-beta.3",
+        "@dadosfera/protospack-v2": "3.37.0-beta.5",
         "@grpc/grpc-js": "^1.9.3",
         "@grpc/proto-loader": "^0.7.9",
         "@nestjs/cli": "^9.5.0",
@@ -1403,9 +1403,9 @@
       }
     },
     "node_modules/@dadosfera/protospack-v2": {
-      "version": "3.37.0-beta.3",
-      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.37.0-beta.3.tgz",
-      "integrity": "sha512-9YSgzkXVqe9QsBxJjfxYxttAiyCXxgq49Xjs3OvnTLCXRDn3XtTlPaC+yHrTEUgCkQyhlDZuswe6f6oBImqIRQ==",
+      "version": "3.37.0-beta.5",
+      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.37.0-beta.5.tgz",
+      "integrity": "sha512-dtHMzMU2Qa9c6DpygWr7fib19l1zqbYgBi2wGkiJ6uMAvl1CGu9V0p+JA1FwGTQ0QRy7EkkRVi6X6sH5u/ICpA==",
       "license": "ISC",
       "dependencies": {
         "@grpc/grpc-js": "^1.9.3",

package.json

@@ -30,7 +30,7 @@
     "@aws-sdk/client-secrets-manager": "^3.414.0",
     "@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
     "@dadosfera/protospack": "2.5.3",
-    "@dadosfera/protospack-v2": "3.37.0-beta.3",
+    "@dadosfera/protospack-v2": "3.37.0-beta.5",
     "@grpc/grpc-js": "^1.9.3",
     "@grpc/proto-loader": "^0.7.9",
     "@nestjs/cli": "^9.5.0",

src/modules/auth/dtos/login.ts

@@ -77,6 +77,8 @@ export class AuthCustomer {
   scheduleLimit: string;
   @ApiProperty()
   links: Link[];
+  @ApiProperty()
+  themeEnabled: boolean;
 }
 
 export class AuthSignInReq implements AuthSignInRequest {

src/modules/open-data/open-data.controller.ts

@@ -46,18 +46,24 @@ export class OpenDataController {
   ) {
     this.logger.info('createUser for open data'
         + JSON.stringify({
-          origin: request.headers.origin,
           language,
           body
     }));
 
+    this.logger.info('headers'
+      + JSON.stringify({
+        headers: request.headers
+    }));
+
     // "401573bb-334f-44b2-b30e-88d4cea31ae9"
     // const OPENDATA_PUBLIC_USERS_GROUP_ID = process.env.OPEN_GROUP_ID;
     // ""f239718a-a271-4ef9-ae7e-02a2f0f3aa6e""
     // const OPENDATA_CUSTOMER_ID =  process.env.OPEN_CUSTOMER_ID;
-    const OPENDATA_CUSTOMER_ID = "bb4e9b26-d465-40ff-9345-e768ca69a55e";
+    const OPENDATA_CUSTOMER_ID = "b3e3dfe5-b992-4586-a73c-c0b0c00f615d";
 
-    const roles = ["4d621501-5ea4-444b-b46e-1a009f3132ff"];
+    this.logger.info("OPENDATA_CUSTOMER_ID: " + process.env.OPEN_CUSTOMER_ID)
+    this.logger.info("OPEN_GROUP_ID: " + process.env.OPEN_GROUP_ID)
+    const roles = ["e3f98a2f-7748-4981-8505-7695c8ca8218"];
     const metadata = PackTheMetadata({
       language: language || 'en-us'
     });

src/modules/theme/dtos/customers.ts

@@ -27,9 +27,9 @@ export class CustomerTheme implements Theme {
   @ApiProperty()
   textColor: string;
   @ApiProperty()
-  logoWhite: string;
+  logo: string;
   @ApiProperty()
-  logoBlack: string;
+  logoLogin: string;
 }
 
 export class CustomerThemeResponse {

src/modules/theme/theme.controller.ts

@@ -59,22 +59,22 @@ export class ThemeController {
       id, 
     }));
 
-    const logoWhite = files.find(file => file.fieldname === 'logoWhite');
-    const logoBlack = files.find(file => file.fieldname === 'logoBlack');
+    const logo = files.find(file => file.fieldname === 'logo');
+    const logoLogin = files.find(file => file.fieldname === 'logoLogin');
 
-    this.validFileSize(logoWhite);
-    this.validFileSize(logoBlack);
-    this.validMimeType(logoWhite);
-    this.validMimeType(logoBlack);
+    this.validFileSize(logo);
+    this.validFileSize(logoLogin);
+    this.validMimeType(logo);
+    this.validMimeType(logoLogin);
 
     try {
       const theme = await this.themeService.createThemeByCustomer(id, {
         ...data,
-        logoWhite,
-        logoBlack
+        logo,
+        logoLogin
       });
       this.logger.info('saveCustomertheme' + JSON.stringify(theme));
-      return { theme: theme };
+      return theme;
     } catch (err) {
       if (err.details === ErrorCodes.CUSTOMER.NOT_FOUND) {
         this.logger.error('Error - saveCustomertheme - Expect CUSTOMER.NOT_FOUND');

src/modules/theme/theme.service.ts

@@ -21,11 +21,10 @@ import { resolve } from 'path';
 import { Readable } from 'stream';
 
 type Files = {
-  logoWhite: Express.Multer.File,
-  logoBlack: Express.Multer.File,
+  logo: Express.Multer.File,
+  logoLogin: Express.Multer.File,
 }
 
-// This function will accept any string, which may result in a bug.
 @Injectable()
 export class ThemeService implements OnModuleInit {
   private themeService: ThemeProtoService;
@@ -63,12 +62,12 @@ export class ThemeService implements OnModuleInit {
       chunk: Buffer.alloc(0)
     })
 
-    if(theme.logoBlack) {
-      await this.sendFile(theme.logoBlack, customerThemeRequest$);
+    if(theme.logo) {
+      await this.sendFile(theme.logo, customerThemeRequest$);
     }
 
-    if(theme.logoWhite) {
-      await this.sendFile(theme.logoWhite, customerThemeRequest$);
+    if(theme.logoLogin) {
+      await this.sendFile(theme.logoLogin, customerThemeRequest$);
     }
     customerThemeRequest$.complete();
 
@@ -95,16 +94,11 @@ export class ThemeService implements OnModuleInit {
   }
 
    private async sendFile(file: Express.Multer.File, stream$: ReplaySubject<ThemeRequest>) {
-    const bufferStream = new Readable({
-      highWaterMark: 1024 * 1024, // 1 MB por chunk
-      read() {}
-    });
-    bufferStream.push(file.buffer);
-    bufferStream.push(null);
+    const chunkSize = 4 * 1024 * 1024;
+    const bufferStream = new CustomBufferStream(file.buffer, chunkSize);
 
     return new Promise((resolve, reject) => {
       bufferStream.on('data', (chunk) => {
-        console.log('enviando chunk', file.fieldname)
         const mimetype = file.mimetype.split('/')[1]; // example image/jpeg
         const filename = file.fieldname.concat(".", mimetype);
         stream$.next({
@@ -119,15 +113,39 @@ export class ThemeService implements OnModuleInit {
       });
 
       bufferStream.on('end', () => {
-        console.log('terminou de enviar')
         resolve(file.filename)
       });
 
       bufferStream.on('error', (err) => {
-        console.error('Erro no stream:', 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);
+    }
+  }
+}