Merge pull request #272 from dadosfera/feature/block_and_reset_users

Feature/block and reset users

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.18",
         "@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",
-      "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",
-      "integrity": "sha512-+F2sMJszfXRqWuN5ae+v7MqHhJyg7TgVvnuFBKUOwHvBoWCfAUnIm9XGEA/YjPpRUa1gM0nnKL8SpBFf43Q1aA==",
+      "version": "3.37.0-alpha.18",
+      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.37.0-alpha.18.tgz",
+      "integrity": "sha512-hhcskw1DT9jtmJcQXrFwgUnTti6ZALZM04YevJgqQNR6yS+C6040UZf3c/6vcjRm5/9h9OMiJJApzivPTBK46g==",
       "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.18",
     "@grpc/grpc-js": "^1.9.3",
     "@grpc/proto-loader": "^0.7.9",
     "@nestjs/cli": "^9.5.0",

src/modules/auth/auth.controller.ts

@@ -43,7 +43,6 @@ import {
   AuthRefreshAccessTokenRes,
   AuthSignInReq,
   AuthSignInRes,
-  BulkEditRequest,
 } from './dtos/login';
 import { PackTheMetadata } from 'src/utils/ PackTheMetadata';
 import { AuthGuard } from '@nestjs/passport';
@@ -53,7 +52,9 @@ import jwt from 'jsonwebtoken';
 import { LanguageEnum } from 'src/utils/languages.enum';
 import { Language } from 'src/decorators/language.decorator';
 import { ApiInternalOnlyEndpoint } from 'src/decorators/swagger.decorator';
-
+import { Metadata } from '@grpc/grpc-js';
+import { lastValueFrom } from 'rxjs';
+import { UserOneResponse } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages';
 
 @ApiTags('Auth')
 @ApiHeaders([{ name: 'dadosfera-lang', enum: LanguageEnum, required: false }])
@@ -355,10 +356,9 @@ export class AuthController {
   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,
@@ -372,7 +372,7 @@ export class AuthController {
         }
       });
 
-      const result = await this.authClient.blockUsers(body.users, metadata);
+      const result = await this.authClient.blockUsers(metadata);
       this.logger.info('blockUsers - Success', { result });
       return result;
     } catch (error) {
@@ -391,7 +391,6 @@ export class AuthController {
   async unblockUsers(
     @Language() language: LanguageEnum,
     @User() user: RequestUser,
-    @Body() body: BulkEditRequest
   ) {
     this.logger.info('unblockUsers');
     const metadata = PackTheMetadata({
@@ -399,7 +398,7 @@ export class AuthController {
       language,
     });
 
-    return this.authClient.unblockUsers(body.users, metadata);
+    return this.authClient.unblockUsers(metadata);
   }
 
   @ApiInternalOnlyEndpoint()
@@ -409,15 +408,13 @@ export class AuthController {
   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);
+    return this.authClient.resetUsers( metadata);
   }
 }

src/modules/auth/auth.service.ts

@@ -20,7 +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';
+import { UserActionRequest, UserActionResponse } from './dtos/login';
 
 @Injectable()
 export class AuthClientService implements OnModuleInit {
@@ -170,7 +170,7 @@ export class AuthClientService implements OnModuleInit {
     );
   }
 
-  async blockUsers(users: string[],metadata: Metadata): Promise<BulkEditResponse> {
+  async blockUsers(metadata: Metadata): Promise<UserActionResponse> {
     this.logger.info('blockUsers - Service starting');
     
     try {
@@ -181,8 +181,8 @@ export class AuthClientService implements OnModuleInit {
         }
       });
 
-      const response = await lastValueFrom<BulkEditResponse>(
-        this.authService.BlockUser({ users }, metadata),
+      const response = await lastValueFrom<UserActionResponse>(
+        this.authService.BlockUser({}, metadata),
       );
 
       this.logger.info('blockUsers - Service success', { response });
@@ -196,14 +196,14 @@ export class AuthClientService implements OnModuleInit {
     }
   }
 
-  async unblockUsers(users: string[],metadata: Metadata): Promise<BulkEditResponse> {
+  async unblockUsers(metadata: Metadata): Promise<UserActionResponse> {
     this.logger.info('unblockUsers');
     return await lastValueFrom(
-      this.authService.UnblockUser({ users }, metadata),
+      this.authService.UnblockUser({}, metadata),
     );
   }
 
-  async resetUsers(users: string[], metadata: Metadata): Promise<BulkEditResponse> {
+  async resetUsers(metadata: Metadata): Promise<UserActionResponse> {
     this.logger.info('resetUsers');
     
     try {
@@ -214,8 +214,8 @@ export class AuthClientService implements OnModuleInit {
         }
       });
 
-      const response = await lastValueFrom<BulkEditResponse>(
-        this.authService.ResetUser({ users }, metadata)
+      const response = await lastValueFrom<UserActionResponse>(
+        this.authService.ResetUser({}, metadata)
       );
 
       this.logger.info('resetUsers - Success', { response });

src/modules/auth/dtos/login.ts

@@ -129,11 +129,14 @@ export class AuthRefreshAccessTokenRes {
   accessToken: string;
 }
 
-export interface BulkEditRequest {
-  users: string[];
+export interface UserActionRequest {
+  users: {
+    userIds: string[];
+  };
+  defaultPassword?: string;
 }
 
-export interface BulkEditResponse {
+export interface UserActionResponse {
   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,
     });