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.

helmfiles/stg.yaml

@@ -18,4 +18,5 @@ charts:
         value: b3e3dfe5-b992-4586-a73c-c0b0c00f615d
       - name: maestro.open_group_id
         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

src/decorators/set-origin.decorator.ts

@@ -0,0 +1,32 @@
+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;
+  }
+}
+

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

@@ -1,5 +1,5 @@
 import DadosferaLogger from '@dadosfera/dadosfera-logs';
-import { Body, Controller, ForbiddenException, Header, HttpCode, Inject, Param, Post, Query, Req, UseFilters, UseGuards, UseInterceptors } from '@nestjs/common';
+import { Body, Controller, Header, HttpCode, Inject, Param, Post, Query, Req, UseFilters, UseGuards } from '@nestjs/common';
 import { ApiCreatedResponse, ApiHeaders, ApiOkResponse, ApiTags } from '@nestjs/swagger';
 import { ApiInternalOnlyController } from 'src/decorators/swagger.decorator';
 import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter';
@@ -8,6 +8,7 @@ import { UsersService } from '../users/users.service';
 import { Language } from 'src/decorators/language.decorator';
 import { OpenDataService } from './open-data.service';
 import { CreateUserOpenDataDTO, WordpressForm } from './dto/wordpres-form';
+import { CORSGuard, SetOrigin } from 'src/decorators/set-origin.decorator';
 import { Metadata } from '@grpc/grpc-js';
 import { PackTheMetadata } from 'src/utils/ PackTheMetadata';
 import { request } from 'http';
@@ -30,6 +31,8 @@ export class OpenDataController {
   }
 
   @Post("/sharing-ocean-data")
+  // @SetOrigin('devsbm.dadosfera.io')
+  // @UseGuards(CORSGuard)
   @HttpCode(200)
   @Header('content-type', 'application/json')
   @ApiOkResponse()
@@ -41,16 +44,26 @@ export class OpenDataController {
     @Req()
     request: Request,
   ) {
-    if (!request.headers['user-agent'].includes('WordPress/6.7.1; https://devsbm.dadosfera.io')) {
-      throw new ForbiddenException();
-    }
-    this.logger.info('createUser for open data');
+    this.logger.info('createUser for open data'
+        + JSON.stringify({
+          language,
+          body
+    }));
 
-    this.logger.info('user-agent', request.headers['user-agent']);
+    this.logger.info('headers'
+      + JSON.stringify({
+        headers: request.headers
+    }));
 
-    const OPENDATA_CUSTOMER_ID = process.env.OPEN_CUSTOMER_ID;
-    const OPENDATA_GROUP_ID = process.env.OPEN_GROUP_ID;
-    const roles = [process.env.OPEN_GROUP_ID];
+    // "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 = "b3e3dfe5-b992-4586-a73c-c0b0c00f615d";
+
+    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'
     });
@@ -68,6 +81,7 @@ export class OpenDataController {
       this.logger.error('user data ' + e.message);
     }
 
+
     const user: CreateUserOpenDataDTO = {
       email: data["email"],
       enquiryType: data["enquiry_type"],
@@ -75,11 +89,11 @@ export class OpenDataController {
       lastName: data["last_name"],
       organization: data["organization"]
     }
-    this.logger.info(`user request to group ${OPENDATA_CUSTOMER_ID} with role ${OPENDATA_GROUP_ID}`);
+    this.logger.info('user request' + JSON.stringify({ user, roles, customer: OPENDATA_CUSTOMER_ID }));
 
     try {
-      const id = await this.openDataService.createUser(OPENDATA_CUSTOMER_ID, user, roles, metadata);
-      this.logger.info('user created with id: '+ id);
+      await this.openDataService.createUser(OPENDATA_CUSTOMER_ID, user, roles, metadata);
+      this.logger.info('user created with sucessfull data');
       return {
         success: true,
         status: 'success',

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

@@ -40,10 +40,10 @@ export class OpenDataService implements OnModuleInit {
     }
 
     try {
-      const { user } = await lastValueFrom(
+      await lastValueFrom(
         this.usersClientService.SimpleUserCreate(body, metadata),
       );
-      return user.id;
+      return "User created";
     } catch(err) {
       return err;
     }

src/modules/theme/theme.controller.ts

@@ -95,10 +95,10 @@ export class ThemeController {
   }
 
   private validMimeType(file: Express.Multer.File) {
-    const mimeTypesValid = ['image/jpeg', 'image/jpg', 'image/png', 'image/svg+xml'];
+    const mimeTypesValid = ['image/jpeg', 'image/jpg', 'image/png'];
 
     if (file && !mimeTypesValid.includes(file.mimetype)) {
-      throw new HttpException(`O Arquivo ${file.fieldname} deve ser jpeg, jpg, png ou svg`, HttpStatus.BAD_REQUEST);
+      throw new HttpException(`O Arquivo ${file.fieldname} deve ser jpeg, jpg ou png`, HttpStatus.BAD_REQUEST);
     }
   }
 
@@ -109,10 +109,8 @@ export class ThemeController {
 
     try {
       const data = await this.themeService.getThemeByCustomer(id);
-      this.logger.info('Success - getCustomerTheme'+ JSON.stringify(data));
-      if (data?.theme) return data;
-
-      return { theme: null };
+      this.logger.info('Success - getCustomerTheme with id'+ id);
+      return data;
     }catch (err) {
       if (err.details === ErrorCodes.CUSTOMER.NOT_FOUND) {
         this.logger.error('Error - getCustomerTheme - Expect CUSTOMER.NOT_FOUND');

src/modules/theme/theme.service.ts

@@ -96,18 +96,11 @@ export class ThemeService implements OnModuleInit {
    private async sendFile(file: Express.Multer.File, stream$: ReplaySubject<ThemeRequest>) {
     const chunkSize = 4 * 1024 * 1024;
     const bufferStream = new CustomBufferStream(file.buffer, chunkSize);
-    const parseMimitypeForExtension = {
-      'image/jpeg': '.jpeg',
-      'image/jpg': '.jpg',
-      'image/png': '.png',
-      'image/svg+xml': '.svg',
-    }
-
-    const extension = parseMimitypeForExtension[file.mimetype];
 
     return new Promise((resolve, reject) => {
       bufferStream.on('data', (chunk) => {
-        const filename = file.fieldname.concat(extension);
+        const mimetype = file.mimetype.split('/')[1]; // example image/jpeg
+        const filename = file.fieldname.concat(".", mimetype);
         stream$.next({
           customerId: '',
           displayName: '',