Merge pull request #278 from dadosfera/beta

Beta

docsfera.json

@@ -20,14 +20,6 @@
                 ],
                 "type": "string"
               }
-            },
-            {
-              "name": "host",
-              "required": true,
-              "in": "header",
-              "schema": {
-                "type": "string"
-              }
             }
           ],
           "requestBody": {
@@ -72,14 +64,6 @@
                 ],
                 "type": "string"
               }
-            },
-            {
-              "name": "host",
-              "required": true,
-              "in": "header",
-              "schema": {
-                "type": "string"
-              }
             }
           ],
           "requestBody": {
@@ -5599,28 +5583,6 @@
           ]
         }
       },
-      "/customers/logs-dashboard": {
-        "get": {
-          "operationId": "CustomersController_getCustomerMixPanelLogsDashboard",
-          "parameters": [],
-          "responses": {
-            "200": {
-              "description": ""
-            }
-          },
-          "tags": [
-            "Customers"
-          ],
-          "security": [
-            {
-              "access-token": []
-            },
-            {
-              "access-token": []
-            }
-          ]
-        }
-      },
       "/open-data/sharing-ocean-data": {
         "post": {
           "operationId": "OpenDataController_createUser",
@@ -5753,93 +5715,6 @@
             "Health"
           ]
         }
-      },
-      "/network-policy": {
-        "get": {
-          "operationId": "NetworkPolicyController_getNetworks",
-          "parameters": [],
-          "responses": {
-            "200": {
-              "description": "",
-              "content": {
-                "application/json": {
-                  "schema": {
-                    "$ref": "#/components/schemas/NetworkPoliciesDTO"
-                  }
-                }
-              }
-            }
-          },
-          "security": [
-            {
-              "access-token": []
-            },
-            {
-              "access-token": []
-            }
-          ]
-        },
-        "post": {
-          "operationId": "NetworkPolicyController_applyNetworkPolicies",
-          "parameters": [],
-          "requestBody": {
-            "required": true,
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/NetworkPoliciesDTO"
-                }
-              }
-            }
-          },
-          "responses": {
-            "201": {
-              "description": "",
-              "content": {
-                "application/json": {
-                  "schema": {
-                    "type": "object"
-                  }
-                }
-              }
-            }
-          },
-          "security": [
-            {
-              "access-token": []
-            },
-            {
-              "access-token": []
-            }
-          ]
-        },
-        "delete": {
-          "operationId": "NetworkPolicyController_removeNetworkPolicies",
-          "parameters": [],
-          "requestBody": {
-            "required": true,
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/NetworkPoliciesDTO"
-                }
-              }
-            }
-          },
-          "responses": {
-            "200": {
-              "description": ""
-            }
-          },
-          "security": [
-            {
-              "access-token": []
-            },
-            {
-              "access-token": []
-            }
-          ]
-        }
       }
     },
     "info": {
@@ -8691,20 +8566,6 @@
           "required": [
             "theme"
           ]
-        },
-        "NetworkPoliciesDTO": {
-          "type": "object",
-          "properties": {
-            "policies": {
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            }
-          },
-          "required": [
-            "policies"
-          ]
         }
       }
     }

helmfiles/stg.yaml

@@ -9,11 +9,11 @@ charts:
       - name: hostname
         value: maestro.stg.dadosfera.ai
       - name: maestro.pi_factory_url
-        value: pi-factory.dadosfera.ai
+        value: pi-factory.stg.dadosfera.ai
       - name: maestro.in_factory_url
-        value: in-factory.dadosfera.ai
+        value: in-factory.stg.dadosfera.ai
       - name: maestro.tr_factory_url
-        value: in-factory.dadosfera.ai
+        value: in-factory.stg.dadosfera.ai
       - name: maestro.open_customer_id
         value: b3e3dfe5-b992-4586-a73c-c0b0c00f615d
       - name: maestro.open_group_id

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-alpha.20",
+        "@dadosfera/protospack-v2": "3.37.0-alpha.19",
         "@grpc/grpc-js": "^1.9.3",
         "@grpc/proto-loader": "^0.7.9",
         "@nestjs/cli": "^9.5.0",
@@ -1397,9 +1397,9 @@
       }
     },
     "node_modules/@dadosfera/protospack-v2": {
-      "version": "3.37.0-alpha.20",
-      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.37.0-alpha.20.tgz",
-      "integrity": "sha512-rs8YUgnwA8dTohzSEAeilU7WAscodf26/yrsqC/lq0Dz2s3Hi09TXItnLJ5ktv5xWaBQ/eZjyc5zPjpcWL3myQ==",
+      "version": "3.37.0-alpha.19",
+      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.37.0-alpha.19.tgz",
+      "integrity": "sha512-+F2sMJszfXRqWuN5ae+v7MqHhJyg7TgVvnuFBKUOwHvBoWCfAUnIm9XGEA/YjPpRUa1gM0nnKL8SpBFf43Q1aA==",
       "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-alpha.20",
+    "@dadosfera/protospack-v2": "3.37.0-alpha.19",
     "@grpc/grpc-js": "^1.9.3",
     "@grpc/proto-loader": "^0.7.9",
     "@nestjs/cli": "^9.5.0",

src/app.module.ts

@@ -28,7 +28,6 @@ import { MixpanelModule } from './modules/mixpanel/mixpanel.module';
 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';
 
 @Module({
   providers: [
@@ -63,8 +62,7 @@ import { NetworkPolicyModule } from './modules/network-policy/network-policy.mod
     OpenDataModule,
     ThemeModule,
     //Always leave HealthModule last, so it is on the bottom of swagger
-    HealthModule,
-    NetworkPolicyModule
+    HealthModule
   ],
 })
 export class AppModule {}

src/modules/auth/auth.controller.ts

@@ -88,12 +88,9 @@ export class AuthController {
   async signIn(
     @Body() { username, password, totp }: AuthSignInReq,
     @Language() language: LanguageEnum,
-    @Headers('origin') origin: string
   ): Promise<AuthSignInRes> {
     this.logger.info('/auth - SignIn');
-    const frontHost = origin.replace(/^https?:\/\//, '');
-    const metadata = PackTheMetadata({ language, custom_host: frontHost });
-    this.logger.info('metadata: ' + JSON.stringify(metadata.toJSON()));
+    const metadata = PackTheMetadata({ language });
     return this.authClient.signIn({ username, password, totp }, metadata);
   }
 
@@ -103,7 +100,6 @@ export class AuthController {
   async refreshAccessToken(
     @Body() body: AuthRefreshAccessTokenReq,
     @Language() language: LanguageEnum,
-    @Headers('host') host: string
   ) {
     this.logger.info('/auth - RefreshAccessToken');
     const { refreshToken, customerName: customer_name } = body;
@@ -111,7 +107,6 @@ export class AuthController {
     const metadata = PackTheMetadata({
       customer_name,
       language,
-      host
     });
 
     return this.authClient.refreshAccessToken({ refreshToken }, metadata);

src/modules/customers/customers.controller.ts

@@ -91,21 +91,4 @@ export class CustomersController {
     const metadata = PackTheMetadata(user);
     return this.customersService.getMonitoringDashboardUrl(metadata);
   }
-
-  @Get('logs-dashboard')
-  @Authenticated()
-  @RequireAllPermissions(
-    PERMISSIONS_GROUPS.USERS.permissions.ADMIN,
-  )
-  async getCustomerMixPanelLogsDashboard(
-    @User() user: RequestUser,
-  ): Promise<{ url: string }> { 
-    this.logger.info('getLogsDashboardUrl'); 
-    const metadata = PackTheMetadata(user);
-  
-    const result = await this.customersService.getLogsDashboardUrl(metadata);  
-    return result;
-  }
-   
-
 }

src/modules/customers/customers.service.ts

@@ -154,23 +154,6 @@ export class CustomersService implements OnModuleInit {
     );
     logger.info('Done');
 
-    return res;
-  }
-  async getLogsDashboardUrl(metadata: Metadata) {
-    logger.info('CustomersService - getMixPanelLogsDashboardUrl');
-  
-    const res = await lastValueFrom(
-      this.pipelineReadService.PipelineV2GetDashboardUrl(
-        {
-          dashboard_id: '103',
-          exp: '15m',
-          metabase_customer_name: 'dadosferatech',
-        },
-        metadata,
-      ),
-    );
-    logger.info('Done');
-  
     return res;
   }
 }

src/modules/network-policy/dto/network-policy.dto.ts

@@ -1,6 +0,0 @@
-import { ApiProperty } from "@nestjs/swagger";
-
-export class NetworkPoliciesDTO {
-    @ApiProperty()
-    policies: string []
-}

src/modules/network-policy/network-policy.controller.ts

@@ -1,64 +0,0 @@
-import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Post } from '@nestjs/common';
-import { ApiOkResponse } from '@nestjs/swagger';
-import { PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum';
-import {
-  Authenticated,
-  RequireAllPermissions,
-} from 'src/decorators/authentication.decorator';
-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';
-
-@Controller('network-policy')
-export class NetworkPolicyController {
-  constructor(private networkPolicyService: NetworkPolicyService) {}
-
-  @Get()
-  @Authenticated()
-  @RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
-  @HttpCode(HttpStatus.OK)
-  async getNetworks(
-    @User() user: RequestUser,
-  ) {
-    return await this.networkPolicyService.getByCustomer(
-      user.customer_id
-    );
-  }
-
-  @Post()
-  @Authenticated()
-  @RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
-  @ApiOkResponse()
-  @HttpCode(HttpStatus.CREATED)
-  async applyNetworkPolicies(
-    @User() user: RequestUser,
-    @Body() data: NetworkPoliciesDTO,
-  ) {
-    const metadata = PackTheMetadata(user);
-
-    return await this.networkPolicyService.apply(
-      data.policies,
-      user.customer_id,
-      metadata,
-    );
-  }
-
-  @Delete()
-  @Authenticated()
-  @RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
-  @ApiOkResponse()
-  @HttpCode(HttpStatus.OK)
-  async removeNetworkPolicies(
-    @User() user: RequestUser,
-    @Body() data: NetworkPoliciesDTO,
-  ) {
-    const metadata = PackTheMetadata(user);
-
-    return await this.networkPolicyService.delete(
-      data.policies,
-      user.customer_id,
-      metadata,
-    );
-  }
-}

src/modules/network-policy/network-policy.module.ts

@@ -1,19 +0,0 @@
-import { Module } from '@nestjs/common';
-import { NetworkPolicyController } from './network-policy.controller';
-import { NetworkPolicyService } from './network-policy.service';
-import { ClientsModule } from '@nestjs/microservices';
-import { DucClient } from '../duc/client.config';
-import DadosferaLogger from '@dadosfera/dadosfera-logs';
-
-const ducClient = new DucClient();
-
-@Module({
-  imports: [
-    ClientsModule.register([
-      ducClient.providerOptions
-    ]),
-  ],
-  controllers: [NetworkPolicyController],
-  providers: [NetworkPolicyService, DadosferaLogger]
-})
-export class NetworkPolicyModule {}

src/modules/network-policy/network-policy.service.ts

@@ -1,74 +0,0 @@
-import { Inject, Injectable } from '@nestjs/common';
-import { DucClient } from '../duc/client.config';
-import { ClientGrpc } from '@nestjs/microservices';
-import DadosferaLogger from '@dadosfera/dadosfera-logs';
-import { CustomersProtoService } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/write-service';
-import { ProtoServices } from '@dadosfera/protospack-v2/dist/lib/Duc';
-import { Metadata } from '@grpc/grpc-js';
-import { lastValueFrom } from 'rxjs';
-import { NetworkPoliciesDTO } from './dto/network-policy.dto';
-
-
-@Injectable()
-export class NetworkPolicyService {
-  private customerService: CustomersProtoService;
-  private logger: DadosferaLogger;
-
-  constructor(
-    @Inject(DucClient.name) private readonly grpcClient: ClientGrpc,
-    @Inject(DadosferaLogger)
-    dadosferaLogger: DadosferaLogger,
-  ) {
-    this.logger = dadosferaLogger.logger;
-  }
-
-  onModuleInit() {
-    this.customerService = this.grpcClient.getService<CustomersProtoService>(
-      ProtoServices.CustomersProtoService,
-    );
-  }
-
-  async getByCustomer(id: string): Promise<NetworkPoliciesDTO> {
-    const {
-      customer
-    } = await lastValueFrom(this.customerService.CustomerFindOneById({
-      id
-    }));
-
-    return {
-      policies: customer.networkPolicies
-    }
-  }
-
-  async apply(
-    networkPolicies: string[],
-    customerId: string,
-    metadata: Metadata,
-  ) {
-    return await lastValueFrom(
-      this.customerService.CustomerCreateNetworkPolicy(
-        {
-          customerId,
-          networkPolicies,
-        },
-        metadata,
-      ),
-    );
-  }
-
-  async delete(
-    networkPolicies: string[],
-    customerId: string,
-    metadata: Metadata,
-  ) {
-    return await lastValueFrom(
-      this.customerService.CustomerRemoveNetworkPolicy(
-        {
-          customerId,
-          networkPolicies,
-        },
-        metadata,
-      ),
-    );
-  }
-}

src/utils/ PackTheMetadata.ts

@@ -11,9 +11,6 @@ interface IMetadata {
   roles?: string[];
   is_data_manager?: boolean;
   access_token?: string;
-  host?: string;
-  origin?: string;
-  custom_host?: string;
 }
 
 export function PackTheMetadata(info: IMetadata): Metadata {