FIX: send origin header

FEAT: networks get endpoint

docsfera.json

@@ -20,6 +20,14 @@
                 ],
                 "type": "string"
               }
+            },
+            {
+              "name": "origin",
+              "required": true,
+              "in": "header",
+              "schema": {
+                "type": "string"
+              }
             }
           ],
           "requestBody": {
@@ -64,6 +72,14 @@
                 ],
                 "type": "string"
               }
+            },
+            {
+              "name": "origin",
+              "required": true,
+              "in": "header",
+              "schema": {
+                "type": "string"
+              }
             }
           ],
           "requestBody": {
@@ -249,6 +265,14 @@
                 ],
                 "type": "string"
               }
+            },
+            {
+              "name": "origin",
+              "required": true,
+              "in": "header",
+              "schema": {
+                "type": "string"
+              }
             }
           ],
           "responses": {
@@ -5715,6 +5739,96 @@
             "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": {
+            "200": {
+              "description": ""
+            },
+            "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": {
@@ -8566,6 +8680,20 @@
           "required": [
             "theme"
           ]
+        },
+        "NetworkPoliciesDTO": {
+          "type": "object",
+          "properties": {
+            "policies": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          "required": [
+            "policies"
+          ]
         }
       }
     }

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.19",
+        "@dadosfera/protospack-v2": "3.37.0-alpha.20",
         "@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.19",
+      "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.19.tgz",
+      "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-+F2sMJszfXRqWuN5ae+v7MqHhJyg7TgVvnuFBKUOwHvBoWCfAUnIm9XGEA/YjPpRUa1gM0nnKL8SpBFf43Q1aA==",
+      "integrity": "sha512-rs8YUgnwA8dTohzSEAeilU7WAscodf26/yrsqC/lq0Dz2s3Hi09TXItnLJ5ktv5xWaBQ/eZjyc5zPjpcWL3myQ==",
       "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.19",
+    "@dadosfera/protospack-v2": "3.37.0-alpha.20",
     "@grpc/grpc-js": "^1.9.3",
     "@grpc/proto-loader": "^0.7.9",
     "@nestjs/cli": "^9.5.0",

src/app.module.ts

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

src/modules/auth/auth.controller.ts

@@ -54,7 +54,6 @@ import { LanguageEnum } from 'src/utils/languages.enum';
 import { Language } from 'src/decorators/language.decorator';
 import { ApiInternalOnlyEndpoint } from 'src/decorators/swagger.decorator';
 
-
 @ApiTags('Auth')
 @ApiHeaders([{ name: 'dadosfera-lang', enum: LanguageEnum, required: false }])
 @UseFilters(new GrpcToHttpExceptionFilter())
@@ -63,7 +62,6 @@ export class AuthController {
   logger: DadosferaLogger;
   redirectUrl: string;
 
-
   constructor(
     @Inject(DadosferaLogger)
     dadosferaLogger: DadosferaLogger,
@@ -88,9 +86,12 @@ 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 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);
   }
 
@@ -100,13 +101,15 @@ export class AuthController {
   async refreshAccessToken(
     @Body() body: AuthRefreshAccessTokenReq,
     @Language() language: LanguageEnum,
+    @Headers('origin') origin: string,
   ) {
     this.logger.info('/auth - RefreshAccessToken');
     const { refreshToken, customerName: customer_name } = body;
-
+    const frontHost = origin.replace(/^https?:\/\//, '');
     const metadata = PackTheMetadata({
-      customer_name,
       language,
+      customer_name,
+      custom_host: frontHost,
     });
 
     return this.authClient.refreshAccessToken({ refreshToken }, metadata);
@@ -180,16 +183,23 @@ export class AuthController {
   @ApiInternalOnlyEndpoint()
   @Post('confirm-reset-password')
   @HttpCode(HttpStatus.OK)
-  async confirmResetPassword(@Body() body: AuthConfirmResetPasswordRequest) {
+  async confirmResetPassword(
+    @Body() body: AuthConfirmResetPasswordRequest,
+    @Headers('origin') origin: string,
+  ) {
     this.logger.info('/auth - confirm-reset-password');
-
+    const frontHost = origin.replace(/^https?:\/\//, '');
+    const metadata = PackTheMetadata({ custom_host: frontHost });
     const { username, code, newPassword } = body;
 
-    return this.authClient.confirmResetPassword({
+    return this.authClient.confirmResetPassword(
-      username,
+      {
-      code,
+        username,
-      newPassword,
+        code,
-    });
+        newPassword,
+      },
+      metadata,
+    );
   }
 
   @ApiInternalOnlyEndpoint()
@@ -355,18 +365,18 @@ export class AuthController {
   async blockUsers(
     @Language() language: LanguageEnum,
     @User() user: RequestUser,
-    @Body() body: BulkEditRequest
+    @Body() body: BulkEditRequest,
   ) {
     this.logger.info('blockUsers - Starting request');
-  
+
     try {
       const metadata = PackTheMetadata(user);
 
       this.logger.debug('Calling blockUsers service', {
         metadata: {
           access_token: metadata.get('access_token'),
-          language: metadata.get('language')
+          language: metadata.get('language'),
-        }
+        },
       });
 
       const result = await this.authClient.blockUsers(body.users, metadata);
@@ -375,7 +385,7 @@ export class AuthController {
     } catch (error) {
       this.logger.error('blockUsers - Error', {
         error: error.message,
-        stack: error.stack
+        stack: error.stack,
       });
       throw error;
     }
@@ -388,7 +398,7 @@ export class AuthController {
   async unblockUsers(
     @Language() language: LanguageEnum,
     @User() user: RequestUser,
-    @Body() body: BulkEditRequest
+    @Body() body: BulkEditRequest,
   ) {
     this.logger.info('unblockUsers');
     const metadata = PackTheMetadata(user);
@@ -403,11 +413,11 @@ export class AuthController {
   async resetUsers(
     @Language() language: LanguageEnum,
     @User() user: RequestUser,
-    @Body() body: BulkEditRequest
+    @Body() body: BulkEditRequest,
   ) {
     this.logger.info('resetUsers');
     const metadata = PackTheMetadata(user);
 
-    return this.authClient.resetUsers(body.users,  metadata);
+    return this.authClient.resetUsers(body.users, metadata);
   }
 }

src/modules/auth/auth.service.ts

@@ -113,19 +113,21 @@ export class AuthClientService implements OnModuleInit {
     );
   }
 
-  async confirmResetPassword({
+  async confirmResetPassword(
-    username,
+    { username, code, newPassword }: AuthConfirmResetPasswordRequest,
-    code,
+    metadata: Metadata,
-    newPassword,
+  ) {
-  }: AuthConfirmResetPasswordRequest) {
     this.logger.info('confirmResetPassword');
 
     return lastValueFrom(
-      this.authService.AuthConfirmResetPassword({
+      this.authService.AuthConfirmResetPassword(
-        username,
+        {
-        code,
+          username,
-        newPassword,
+          code,
-      }),
+          newPassword,
+        },
+        metadata,
+      ),
     );
   }
 
@@ -170,15 +172,18 @@ export class AuthClientService implements OnModuleInit {
     );
   }
 
-  async blockUsers(users: string[],metadata: Metadata): Promise<BulkEditResponse> {
+  async blockUsers(
+    users: string[],
+    metadata: Metadata,
+  ): Promise<BulkEditResponse> {
     this.logger.info('blockUsers - Service starting');
-    
+
     try {
       this.logger.debug('Calling BlockUser gRPC method', {
         metadata: {
           access_token: metadata.get('access_token'),
-          language: metadata.get('language')
+          language: metadata.get('language'),
-        }
+        },
       });
 
       const response = await lastValueFrom<BulkEditResponse>(
@@ -196,26 +201,32 @@ export class AuthClientService implements OnModuleInit {
     }
   }
 
-  async unblockUsers(users: string[],metadata: Metadata): Promise<BulkEditResponse> {
+  async unblockUsers(
+    users: string[],
+    metadata: Metadata,
+  ): Promise<BulkEditResponse> {
     this.logger.info('unblockUsers');
     return await lastValueFrom(
       this.authService.UnblockUser({ users }, metadata),
     );
   }
 
-  async resetUsers(users: string[], metadata: Metadata): Promise<BulkEditResponse> {
+  async resetUsers(
+    users: string[],
+    metadata: Metadata,
+  ): Promise<BulkEditResponse> {
     this.logger.info('resetUsers');
-    
+
     try {
       this.logger.debug('Calling ResetUser gRPC method', {
         metadata: {
           access_token: metadata.get('access_token'),
-          language: metadata.get('language')
+          language: metadata.get('language'),
-        }
+        },
       });
 
       const response = await lastValueFrom<BulkEditResponse>(
-        this.authService.ResetUser({ users }, metadata)
+        this.authService.ResetUser({ users }, metadata),
       );
 
       this.logger.info('resetUsers - Success', { response });
@@ -223,7 +234,7 @@ export class AuthClientService implements OnModuleInit {
     } catch (error) {
       this.logger.error('resetUsers - Error', {
         error: error.message,
-        stack: error.stack
+        stack: error.stack,
       });
       throw error;
     }

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

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

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

@@ -0,0 +1,64 @@
+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

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,74 @@
+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,6 +11,9 @@ interface IMetadata {
   roles?: string[];
   is_data_manager?: boolean;
   access_token?: string;
+  host?: string;
+  origin?: string;
+  custom_host?: string;
 }
 
 export function PackTheMetadata(info: IMetadata): Metadata {