Revert "fix DTOs"

This reverts commit 4f5f92a.

apps/authz/src/app/http/rest/dto/auth-credential.dto.ts

@@ -1,6 +1,6 @@
 import { Alg } from '@narval/authz-shared'
 import { ApiProperty } from '@nestjs/swagger'
-import { IsEnum, IsNotEmpty, IsString } from 'class-validator'
+import { IsDefined, IsIn, IsString } from 'class-validator'
 
 export class AuthCredentialDto {
   constructor(data: AuthCredentialDto) {
@@ -11,21 +11,22 @@ export class AuthCredentialDto {
   }
 
   @IsString()
-  @IsNotEmpty()
-  @ApiProperty({ type: String })
+  @IsDefined()
+  @ApiProperty()
   uid: string
 
   @IsString()
-  @IsNotEmpty()
-  @ApiProperty({ type: String })
+  @IsDefined()
+  @ApiProperty()
   pubKey: string
 
-  @IsEnum(Alg)
-  @ApiProperty({ enum: Alg })
+  @IsIn(Object.values(Alg))
+  @IsDefined()
+  @ApiProperty({ enum: Object.values(Alg) })
   alg: Alg
 
   @IsString()
-  @IsNotEmpty()
-  @ApiProperty({ type: String })
+  @IsDefined()
+  @ApiProperty()
   userId: string
 }

apps/authz/src/app/http/rest/dto/base-action.dto.ts

@@ -1,14 +1,17 @@
 import { Action } from '@narval/authz-shared'
 import { ApiProperty } from '@nestjs/swagger'
-import { IsEnum, IsNotEmpty, IsString } from 'class-validator'
+import { IsDefined, IsIn, IsString } from 'class-validator'
 
 export class BaseActionDto {
-  @IsEnum(Action)
-  @ApiProperty({ enum: Action })
+  @IsIn(Object.values(Action))
+  @IsDefined()
+  @ApiProperty({
+    enum: Object.values(Action)
+  })
   action: Action
 
   @IsString()
-  @IsNotEmpty()
-  @ApiProperty({ type: String })
+  @IsDefined()
+  @ApiProperty()
   nonce: string
 }

apps/authz/src/app/http/rest/dto/create-organization-request.dto.ts

@@ -1,42 +1,41 @@
 import { Action } from '@narval/authz-shared'
 import { ApiProperty } from '@nestjs/swagger'
-import { Type } from 'class-transformer'
-import { IsDefined, IsNotEmpty, IsString, Matches, ValidateNested } from 'class-validator'
+import { IsDefined, IsIn, IsString, ValidateNested } from 'class-validator'
 import { AuthCredentialDto } from './auth-credential.dto'
 import { BaseActionDto } from './base-action.dto'
 import { BaseAdminRequestPayloadDto } from './base-admin-request-payload.dto'
 
 class CreateOrganizationDataDto {
   @IsString()
-  @IsNotEmpty()
-  @ApiProperty({ type: String })
+  @IsDefined()
+  @ApiProperty()
   uid: string
 
+  @IsString()
   @IsDefined()
+  @ApiProperty()
   @ValidateNested()
-  @Type(() => AuthCredentialDto)
-  @ApiProperty({ type: String })
   credential: AuthCredentialDto
 }
 
 class CreateOrganizationActionDto extends BaseActionDto {
-  @IsString()
-  @IsNotEmpty()
-  @Matches(Action.CREATE_ORGANIZATION)
-  @ApiProperty({ default: Action.CREATE_ORGANIZATION })
+  @IsIn(Object.values(Action))
+  @IsDefined()
+  @ApiProperty({
+    enum: Object.values(Action),
+    default: Action.CREATE_ORGANIZATION
+  })
   action: typeof Action.CREATE_ORGANIZATION
 
   @IsDefined()
   @ValidateNested()
-  @Type(() => CreateOrganizationDataDto)
-  @ApiProperty({ type: () => CreateOrganizationDataDto })
+  @ApiProperty()
   organization: CreateOrganizationDataDto
 }
 
 export class CreateOrganizationRequestDto extends BaseAdminRequestPayloadDto {
   @IsDefined()
   @ValidateNested()
-  @Type(() => CreateOrganizationActionDto)
-  @ApiProperty({ type: () => CreateOrganizationActionDto })
+  @ApiProperty()
   request: CreateOrganizationActionDto
 }