refactor(server): use cascades for keys and tokens (#2544)

immich-app · May 23, 2023 · 50a792a · 50a792a
1 parent e2bd7e1
commit 50a792a
Show file tree

Hide file tree

Showing 19 changed files with 102 additions and 128 deletions.
diff --git a/...-key/response-dto/api-key-response.dto.ts → ...omain/src/api-key/api-key-response.dto.ts b/...-key/response-dto/api-key-response.dto.ts → ...omain/src/api-key/api-key-response.dto.ts
@@ -1,5 +1,10 @@
 import { APIKeyEntity } from '@app/infra/entities';
 
+export class APIKeyCreateResponseDto {
+  secret!: string;
+  apiKey!: APIKeyResponseDto;
+}
+
 export class APIKeyResponseDto {
   id!: string;
   name!: string;

diff --git a/...ain/src/api-key/dto/api-key-create.dto.ts → ...er/libs/domain/src/api-key/api-key.dto.ts b/...ain/src/api-key/dto/api-key-create.dto.ts → ...er/libs/domain/src/api-key/api-key.dto.ts
@@ -6,3 +6,9 @@ export class APIKeyCreateDto {
   @IsOptional()
   name?: string;
 }
+
+export class APIKeyUpdateDto {
+  @IsString()
+  @IsNotEmpty()
+  name!: string;
+}
diff --git a/server/libs/domain/src/api-key/api-key.repository.ts b/server/libs/domain/src/api-key/api-key.repository.ts
@@ -6,7 +6,6 @@ export interface IKeyRepository {
   create(dto: Partial<APIKeyEntity>): Promise<APIKeyEntity>;
   update(userId: string, id: string, dto: Partial<APIKeyEntity>): Promise<APIKeyEntity>;
   delete(userId: string, id: string): Promise<void>;
-  deleteAll(userId: string): Promise<void>;
   /**
    * Includes the hashed `key` for verification
    * @param id

diff --git a/server/libs/domain/src/api-key/api-key.service.ts b/server/libs/domain/src/api-key/api-key.service.ts
@@ -1,10 +1,9 @@
 import { BadRequestException, Inject, Injectable } from '@nestjs/common';
 import { AuthUserDto } from '../auth';
 import { ICryptoRepository } from '../crypto';
+import { APIKeyCreateResponseDto, APIKeyResponseDto, mapKey } from './api-key-response.dto';
+import { APIKeyCreateDto } from './api-key.dto';
 import { IKeyRepository } from './api-key.repository';
-import { APIKeyCreateDto } from './dto/api-key-create.dto';
-import { APIKeyCreateResponseDto } from './response-dto/api-key-create-response.dto';
-import { APIKeyResponseDto, mapKey } from './response-dto/api-key-response.dto';
 
 @Injectable()
 export class APIKeyService {

diff --git a/server/libs/domain/src/api-key/dto/api-key-update.dto.ts b/server/libs/domain/src/api-key/dto/api-key-update.dto.ts
diff --git a/server/libs/domain/src/api-key/dto/index.ts b/server/libs/domain/src/api-key/dto/index.ts
diff --git a/server/libs/domain/src/api-key/index.ts b/server/libs/domain/src/api-key/index.ts
@@ -1,4 +1,4 @@
+export * from './api-key-response.dto';
+export * from './api-key.dto';
 export * from './api-key.repository';
 export * from './api-key.service';
-export * from './dto';
-export * from './response-dto';
diff --git a/server/libs/domain/src/api-key/response-dto/api-key-create-response.dto.ts b/server/libs/domain/src/api-key/response-dto/api-key-create-response.dto.ts
diff --git a/server/libs/domain/src/api-key/response-dto/index.ts b/server/libs/domain/src/api-key/response-dto/index.ts
diff --git a/server/libs/domain/src/user-token/user-token.repository.ts b/server/libs/domain/src/user-token/user-token.repository.ts
@@ -6,7 +6,6 @@ export interface IUserTokenRepository {
   create(dto: Partial<UserTokenEntity>): Promise<UserTokenEntity>;
   save(dto: Partial<UserTokenEntity>): Promise<UserTokenEntity>;
   delete(userId: string, id: string): Promise<void>;
-  deleteAll(userId: string): Promise<void>;
   getByToken(token: string): Promise<UserTokenEntity | null>;
   getAll(userId: string): Promise<UserTokenEntity[]>;
 }