Merge pull request #278 from dadosfera/beta

Beta

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,10 +88,9 @@ export class AuthController {
   async signIn(
     @Body() { username, password, totp }: AuthSignInReq,
     @Language() language: LanguageEnum,
-    @Headers('host') host: string
   ): Promise<AuthSignInRes> {
     this.logger.info('/auth - SignIn');
-    const metadata = PackTheMetadata({ language, host });
+    const metadata = PackTheMetadata({ language });
     return this.authClient.signIn({ username, password, totp }, metadata);
   }
 
@@ -101,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;
@@ -109,7 +107,6 @@ export class AuthController {
     const metadata = PackTheMetadata({
       customer_name,
       language,
-      host
     });
 
     return this.authClient.refreshAccessToken({ refreshToken }, metadata);

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,52 +0,0 @@
-import { Body, Controller, Delete, 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) {}
-
-  @Post()
-  @Authenticated()
-  @RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
-  @ApiOkResponse()
-  @HttpCode(HttpStatus.OK)
-  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,60 +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';
-
-@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 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,7 +11,6 @@ interface IMetadata {
   roles?: string[];
   is_data_manager?: boolean;
   access_token?: string;
-  host?: string;
 }
 
 export function PackTheMetadata(info: IMetadata): Metadata {