FIX: merge with beta

src/modules/auth/auth.controller.ts

@@ -43,6 +43,7 @@ import {
   AuthRefreshAccessTokenRes,
   AuthSignInReq,
   AuthSignInRes,
+  BulkEditRequest,
 } from './dtos/login';
 import { PackTheMetadata } from 'src/utils/ PackTheMetadata';
 import { AuthGuard } from '@nestjs/passport';
@@ -53,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())
@@ -61,6 +63,7 @@ export class AuthController {
   logger: DadosferaLogger;
   redirectUrl: string;
 
+
   constructor(
     @Inject(DadosferaLogger)
     dadosferaLogger: DadosferaLogger,
@@ -347,4 +350,77 @@ export class AuthController {
 
     return { token, email, url, language };
   }
+
+  @ApiInternalOnlyEndpoint()
+  @Post('users/block')
+  @RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
+  @HttpCode(HttpStatus.OK)
+  async blockUsers(
+    @Language() language: LanguageEnum,
+    @User() user: RequestUser,
+    @Body() body: BulkEditRequest
+  ) {
+    this.logger.info('blockUsers - Starting request');
+  
+    try {
+      const metadata = PackTheMetadata({
+        customer_id: user.customer_id,
+        language,
+      });
+
+      this.logger.debug('Calling blockUsers service', {
+        metadata: {
+          access_token: metadata.get('access_token'),
+          language: metadata.get('language')
+        }
+      });
+
+      const result = await this.authClient.blockUsers(body.users, metadata);
+      this.logger.info('blockUsers - Success', { result });
+      return result;
+    } catch (error) {
+      this.logger.error('blockUsers - Error', {
+        error: error.message,
+        stack: error.stack
+      });
+      throw error;
+    }
+  }
+
+  @ApiInternalOnlyEndpoint()
+  @Post('users/unblock')
+  @RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
+  @HttpCode(HttpStatus.OK)
+  async unblockUsers(
+    @Language() language: LanguageEnum,
+    @User() user: RequestUser,
+    @Body() body: BulkEditRequest
+  ) {
+    this.logger.info('unblockUsers');
+    const metadata = PackTheMetadata({
+      customer_id: user.customer_id,
+      language,
+    });
+
+    return this.authClient.unblockUsers(body.users, metadata);
+  }
+
+  @ApiInternalOnlyEndpoint()
+  @Post('users/reset')
+  @RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
+  @HttpCode(HttpStatus.OK)
+  async resetUsers(
+    @Language() language: LanguageEnum,
+    @User() user: RequestUser,
+    @Body() body: BulkEditRequest
+  ) {
+    this.logger.info('resetUsers');
+    const metadata = PackTheMetadata({
+      access_token: user.access_token,
+      customer_id: user.customer_id,
+      language,
+    });
+
+    return this.authClient.resetUsers(body.users,  metadata);
+  }
 }

src/modules/auth/auth.service.ts

@@ -20,6 +20,7 @@ import {
 } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages';
 import { DucClient } from '../duc/client.config';
 import { Metadata } from '@grpc/grpc-js';
+import { BulkEditResponse } from './dtos/login';
 
 @Injectable()
 export class AuthClientService implements OnModuleInit {
@@ -168,4 +169,63 @@ export class AuthClientService implements OnModuleInit {
       this.authService.AuthOauthSignIn({ token, username, refreshToken: '' }),
     );
   }
+
+  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')
+        }
+      });
+
+      const response = await lastValueFrom<BulkEditResponse>(
+        this.authService.BlockUser({ users }, metadata),
+      );
+
+      this.logger.info('blockUsers - Service success', { response });
+      return response;
+    } catch (error) {
+      this.logger.error('blockUsers - Service error', {
+        error: error.message,
+        stack: error.stack,
+      });
+      throw error;
+    }
+  }
+
+  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> {
+    this.logger.info('resetUsers');
+    
+    try {
+      this.logger.debug('Calling ResetUser gRPC method', {
+        metadata: {
+          access_token: metadata.get('access_token'),
+          language: metadata.get('language')
+        }
+      });
+
+      const response = await lastValueFrom<BulkEditResponse>(
+        this.authService.ResetUser({ users }, metadata)
+      );
+
+      this.logger.info('resetUsers - Success', { response });
+      return response;
+    } catch (error) {
+      this.logger.error('resetUsers - Error', {
+        error: error.message,
+        stack: error.stack
+      });
+      throw error;
+    }
+  }
 }

src/modules/auth/dtos/login.ts

@@ -67,18 +67,24 @@ export class AuthUser {
 export class AuthCustomer {
   @ApiProperty()
   modules: string[];
+
   @ApiProperty()
   id: string;
+
   @ApiProperty()
   name: string;
+
   @ApiProperty()
   displayName: string;
   @ApiProperty()
   tier: string;
+
   @ApiProperty()
   scheduleLimit: string;
+
   @ApiProperty()
   links: Link[];
+
   @ApiProperty()
   themeEnabled: boolean;
 }
@@ -122,3 +128,13 @@ export class AuthRefreshAccessTokenRes {
   @ApiProperty()
   accessToken: string;
 }
+
+export interface BulkEditRequest {
+  users: string[];
+}
+
+export interface BulkEditResponse {
+  message: string;
+  successfulUsers: string[];
+  failedUsers: string[];
+}

src/modules/mixpanel/mixpanel.controller.ts

@@ -1,4 +1,4 @@
-import { Body, Controller, Inject, Param, Post } from '@nestjs/common';
+import { Body, Controller, Inject, Param, Post, Req } from '@nestjs/common';
 import { init } from 'mixpanel';
 import { Authenticated } from 'src/decorators/authentication.decorator';
 import { ApiInternalOnlyController } from 'src/decorators/swagger.decorator';
@@ -13,7 +13,12 @@ export class MixpanelController {
     private readonly mixpanelToken: string,
   ) {}
   @Post(':id')
-  async trackEvent(@Param('id') id, @Body() body, @User() user: RequestUser) {
+  async trackEvent(
+    @Param('id') id,
+    @Body() body,
+    @User() user: RequestUser,
+    @Req() request
+  ) {
     delete body.info;
     const mixpanel = init(this.mixpanelToken);
 
@@ -66,13 +71,16 @@ export class MixpanelController {
       $email: user.username.includes('@')
         ? user.username
         : user.username + '@dadosfera.ai',
-      customer_name: user.customer_name,
+      customer_name: user.customer_name
     });
 
     await mixpanel.track(id, {
       distinct_id: user.username,
       customer: user.customer_name,
       env: process.env.ENV,
+      $ip: request.ip,
+      $os: request.headers['sec-ch-ua-platform'] || '',
+      $browser: request.headers['user-agent'],
       ...body,
     });