refactor(server): auth dto (#5593)

* refactor: AuthUserDto => AuthDto

* refactor: reorganize auth-dto

* refactor: AuthUser() => Auth()

server/src/domain/api-key/api-key.service.spec.ts

@@ -21,7 +21,7 @@ describe(APIKeyService.name, () => {
       expect(keyMock.create).toHaveBeenCalledWith({
         key: 'cmFuZG9tLWJ5dGVz (hashed)',
         name: 'Test Key',
-        userId: authStub.admin.id,
+        userId: authStub.admin.user.id,
       });
       expect(cryptoMock.randomBytes).toHaveBeenCalled();
       expect(cryptoMock.hashSha256).toHaveBeenCalled();
@@ -35,7 +35,7 @@ describe(APIKeyService.name, () => {
       expect(keyMock.create).toHaveBeenCalledWith({
         key: 'cmFuZG9tLWJ5dGVz (hashed)',
         name: 'API Key',
-        userId: authStub.admin.id,
+        userId: authStub.admin.user.id,
       });
       expect(cryptoMock.randomBytes).toHaveBeenCalled();
       expect(cryptoMock.hashSha256).toHaveBeenCalled();
@@ -59,7 +59,7 @@ describe(APIKeyService.name, () => {
 
       await sut.update(authStub.admin, 'random-guid', { name: 'New Name' });
 
-      expect(keyMock.update).toHaveBeenCalledWith(authStub.admin.id, 'random-guid', { name: 'New Name' });
+      expect(keyMock.update).toHaveBeenCalledWith(authStub.admin.user.id, 'random-guid', { name: 'New Name' });
     });
   });
 
@@ -77,7 +77,7 @@ describe(APIKeyService.name, () => {
 
       await sut.delete(authStub.admin, 'random-guid');
 
-      expect(keyMock.delete).toHaveBeenCalledWith(authStub.admin.id, 'random-guid');
+      expect(keyMock.delete).toHaveBeenCalledWith(authStub.admin.user.id, 'random-guid');
     });
   });
 
@@ -87,7 +87,7 @@ describe(APIKeyService.name, () => {
 
       await expect(sut.getById(authStub.admin, 'random-guid')).rejects.toBeInstanceOf(BadRequestException);
 
-      expect(keyMock.getById).toHaveBeenCalledWith(authStub.admin.id, 'random-guid');
+      expect(keyMock.getById).toHaveBeenCalledWith(authStub.admin.user.id, 'random-guid');
     });
 
     it('should get a key by id', async () => {
@@ -95,7 +95,7 @@ describe(APIKeyService.name, () => {
 
       await sut.getById(authStub.admin, 'random-guid');
 
-      expect(keyMock.getById).toHaveBeenCalledWith(authStub.admin.id, 'random-guid');
+      expect(keyMock.getById).toHaveBeenCalledWith(authStub.admin.user.id, 'random-guid');
     });
   });
 
@@ -105,7 +105,7 @@ describe(APIKeyService.name, () => {
 
       await expect(sut.getAll(authStub.admin)).resolves.toHaveLength(1);
 
-      expect(keyMock.getByUserId).toHaveBeenCalledWith(authStub.admin.id);
+      expect(keyMock.getByUserId).toHaveBeenCalledWith(authStub.admin.user.id);
     });
   });
 });

server/src/domain/api-key/api-key.service.ts

@@ -1,6 +1,6 @@
 import { APIKeyEntity } from '@app/infra/entities';
 import { BadRequestException, Inject, Injectable } from '@nestjs/common';
-import { AuthUserDto } from '../auth';
+import { AuthDto } from '../auth';
 import { ICryptoRepository, IKeyRepository } from '../repositories';
 import { APIKeyCreateDto, APIKeyCreateResponseDto, APIKeyResponseDto } from './api-key.dto';
 
@@ -11,47 +11,47 @@ export class APIKeyService {
     @Inject(IKeyRepository) private repository: IKeyRepository,
   ) {}
 
-  async create(authUser: AuthUserDto, dto: APIKeyCreateDto): Promise<APIKeyCreateResponseDto> {
+  async create(auth: AuthDto, dto: APIKeyCreateDto): Promise<APIKeyCreateResponseDto> {
     const secret = this.crypto.randomBytes(32).toString('base64').replace(/\W/g, '');
     const entity = await this.repository.create({
       key: this.crypto.hashSha256(secret),
       name: dto.name || 'API Key',
-      userId: authUser.id,
+      userId: auth.user.id,
     });
 
     return { secret, apiKey: this.map(entity) };
   }
 
-  async update(authUser: AuthUserDto, id: string, dto: APIKeyCreateDto): Promise<APIKeyResponseDto> {
-    const exists = await this.repository.getById(authUser.id, id);
+  async update(auth: AuthDto, id: string, dto: APIKeyCreateDto): Promise<APIKeyResponseDto> {
+    const exists = await this.repository.getById(auth.user.id, id);
     if (!exists) {
       throw new BadRequestException('API Key not found');
     }
 
-    const key = await this.repository.update(authUser.id, id, { name: dto.name });
+    const key = await this.repository.update(auth.user.id, id, { name: dto.name });
 
     return this.map(key);
   }
 
-  async delete(authUser: AuthUserDto, id: string): Promise<void> {
-    const exists = await this.repository.getById(authUser.id, id);
+  async delete(auth: AuthDto, id: string): Promise<void> {
+    const exists = await this.repository.getById(auth.user.id, id);
     if (!exists) {
       throw new BadRequestException('API Key not found');
     }
 
-    await this.repository.delete(authUser.id, id);
+    await this.repository.delete(auth.user.id, id);
   }
 
-  async getById(authUser: AuthUserDto, id: string): Promise<APIKeyResponseDto> {
-    const key = await this.repository.getById(authUser.id, id);
+  async getById(auth: AuthDto, id: string): Promise<APIKeyResponseDto> {
+    const key = await this.repository.getById(auth.user.id, id);
     if (!key) {
       throw new BadRequestException('API Key not found');
     }
     return this.map(key);
   }
 
-  async getAll(authUser: AuthUserDto): Promise<APIKeyResponseDto[]> {
-    const keys = await this.repository.getByUserId(authUser.id);
+  async getAll(auth: AuthDto): Promise<APIKeyResponseDto[]> {
+    const keys = await this.repository.getByUserId(auth.user.id);
     return keys.map((key) => this.map(key));
   }