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

FIX: send origin header

docsfera.json

@@ -22,7 +22,7 @@
               }
             },
             {
-              "name": "host",
+              "name": "origin",
               "required": true,
               "in": "header",
               "schema": {
@@ -74,7 +74,7 @@
               }
             },
             {
-              "name": "host",
+              "name": "origin",
               "required": true,
               "in": "header",
               "schema": {
@@ -265,6 +265,14 @@
                 ],
                 "type": "string"
               }
+            },
+            {
+              "name": "origin",
+              "required": true,
+              "in": "header",
+              "schema": {
+                "type": "string"
+              }
             }
           ],
           "responses": {
@@ -5599,6 +5607,28 @@
           ]
         }
       },
+      "/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",

helmfiles/stg.yaml

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

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,10 +86,12 @@ export class AuthController {
   async signIn(
     @Body() { username, password, totp }: AuthSignInReq,
     @Language() language: LanguageEnum,
-    @Headers('host') host: string
+    @Headers('origin') origin: string,
   ): Promise<AuthSignInRes> {
     this.logger.info('/auth - SignIn');
-    const metadata = PackTheMetadata({ language, host });
+    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);
   }
 
@@ -101,15 +101,15 @@ export class AuthController {
   async refreshAccessToken(
     @Body() body: AuthRefreshAccessTokenReq,
     @Language() language: LanguageEnum,
-    @Headers('host') host: string
+    @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,
-      host
+      customer_name,
+      custom_host: frontHost,
     });
 
     return this.authClient.refreshAccessToken({ refreshToken }, metadata);
@@ -183,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({
-      username,
-      code,
-      newPassword,
-    });
+    return this.authClient.confirmResetPassword(
+      {
+        username,
+        code,
+        newPassword,
+      },
+      metadata,
+    );
   }
 
   @ApiInternalOnlyEndpoint()
@@ -358,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);
@@ -378,7 +385,7 @@ export class AuthController {
     } catch (error) {
       this.logger.error('blockUsers - Error', {
         error: error.message,
-        stack: error.stack
+        stack: error.stack,
       });
       throw error;
     }
@@ -391,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);
@@ -406,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({
-    username,
-    code,
-    newPassword,
-  }: AuthConfirmResetPasswordRequest) {
+  async confirmResetPassword(
+    { username, code, newPassword }: AuthConfirmResetPasswordRequest,
+    metadata: Metadata,
+  ) {
     this.logger.info('confirmResetPassword');
 
     return lastValueFrom(
-      this.authService.AuthConfirmResetPassword({
-        username,
-        code,
-        newPassword,
-      }),
+      this.authService.AuthConfirmResetPassword(
+        {
+          username,
+          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/customers/customers.controller.ts

@@ -91,4 +91,21 @@ 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,6 +154,23 @@ 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/utils/ PackTheMetadata.ts

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