Merge pull request #281 from dadosfera/fix/network-policy

Fix/network policy

docsfera.json

@@ -22,7 +22,7 @@
               }
             },
             {
-              "name": "origin",
+              "name": "host",
               "required": true,
               "in": "header",
               "schema": {
@@ -74,7 +74,7 @@
               }
             },
             {
-              "name": "origin",
+              "name": "host",
               "required": true,
               "in": "header",
               "schema": {
@@ -265,14 +265,6 @@
                 ],
                 "type": "string"
               }
-            },
-            {
-              "name": "origin",
-              "required": true,
-              "in": "header",
-              "schema": {
-                "type": "string"
-              }
             }
           ],
           "responses": {
@@ -5779,9 +5771,6 @@
             }
           },
           "responses": {
-            "200": {
-              "description": ""
-            },
             "201": {
               "description": "",
               "content": {

src/modules/auth/auth.controller.ts

@@ -54,6 +54,7 @@ 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())
@@ -62,6 +63,7 @@ export class AuthController {
   logger: DadosferaLogger;
   redirectUrl: string;
 
+
   constructor(
     @Inject(DadosferaLogger)
     dadosferaLogger: DadosferaLogger,
@@ -86,12 +88,11 @@ export class AuthController {
   async signIn(
     @Body() { username, password, totp }: AuthSignInReq,
     @Language() language: LanguageEnum,
-    @Headers('origin') origin: string,
+    @Headers('host') host: 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()));
+    this.logger.info('host: ' + host);
+    const metadata = PackTheMetadata({ language });
     return this.authClient.signIn({ username, password, totp }, metadata);
   }
 
@@ -101,15 +102,15 @@ export class AuthController {
   async refreshAccessToken(
     @Body() body: AuthRefreshAccessTokenReq,
     @Language() language: LanguageEnum,
-    @Headers('origin') origin: string,
+    @Headers('host') host: string
   ) {
     this.logger.info('/auth - RefreshAccessToken');
     const { refreshToken, customerName: customer_name } = body;
-    const frontHost = origin.replace(/^https?:\/\//, '');
+
     const metadata = PackTheMetadata({
-      language,
       customer_name,
-      custom_host: frontHost,
+      language,
+      host
     });
 
     return this.authClient.refreshAccessToken({ refreshToken }, metadata);
@@ -183,23 +184,16 @@ export class AuthController {
   @ApiInternalOnlyEndpoint()
   @Post('confirm-reset-password')
   @HttpCode(HttpStatus.OK)
-  async confirmResetPassword(
-    @Body() body: AuthConfirmResetPasswordRequest,
-    @Headers('origin') origin: string,
-  ) {
+  async confirmResetPassword(@Body() body: AuthConfirmResetPasswordRequest) {
     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(
-      {
-        username,
-        code,
-        newPassword,
-      },
-      metadata,
-    );
+    return this.authClient.confirmResetPassword({
+      username,
+      code,
+      newPassword,
+    });
   }
 
   @ApiInternalOnlyEndpoint()
@@ -365,18 +359,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);
@@ -385,7 +379,7 @@ export class AuthController {
     } catch (error) {
       this.logger.error('blockUsers - Error', {
         error: error.message,
-        stack: error.stack,
+        stack: error.stack
       });
       throw error;
     }
@@ -398,7 +392,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);
@@ -413,11 +407,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,21 +113,19 @@ export class AuthClientService implements OnModuleInit {
     );
   }
 
-  async confirmResetPassword(
-    { username, code, newPassword }: AuthConfirmResetPasswordRequest,
-    metadata: Metadata,
-  ) {
+  async confirmResetPassword({
+    username,
+    code,
+    newPassword,
+  }: AuthConfirmResetPasswordRequest) {
     this.logger.info('confirmResetPassword');
 
     return lastValueFrom(
-      this.authService.AuthConfirmResetPassword(
-        {
-          username,
-          code,
-          newPassword,
-        },
-        metadata,
-      ),
+      this.authService.AuthConfirmResetPassword({
+        username,
+        code,
+        newPassword,
+      }),
     );
   }
 
@@ -172,18 +170,15 @@ 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>(
@@ -201,32 +196,26 @@ 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 });
@@ -234,7 +223,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/utils/ PackTheMetadata.ts

@@ -12,8 +12,6 @@ interface IMetadata {
   is_data_manager?: boolean;
   access_token?: string;
   host?: string;
-  origin?: string;
-  custom_host?: string;
 }
 
 export function PackTheMetadata(info: IMetadata): Metadata {