Refactor BaseAction and BaseActionRequest DTOs

apps/authz/src/app/evaluation-request.dto.ts

@@ -6,7 +6,7 @@ import {
   BaseActionDto,
   FiatCurrency,
   Hex,
-  RequestSignatureDto
+  SignatureDto
 } from '@narval/authz-shared'
 import { ApiExtraModels, ApiProperty, getSchemaPath } from '@nestjs/swagger'
 import { Transform, Type } from 'class-transformer'
@@ -133,15 +133,15 @@ export class EvaluationRequestDto {
   @IsDefined()
   @ValidateNested()
   @ApiProperty()
-  authentication: RequestSignatureDto
+  authentication: SignatureDto
 
   @IsOptional()
   @ValidateNested()
   @ApiProperty({
-    type: () => RequestSignatureDto,
+    type: () => SignatureDto,
     isArray: true
   })
-  approvals?: RequestSignatureDto[]
+  approvals?: SignatureDto[]
 
   @ValidateNested()
   @Type((opts) => {

apps/authz/src/app/http/rest/dto/policy-rules/set-policy-rules-request.dto.ts

@@ -1,4 +1,4 @@
-import { Action, BaseActionDto, BaseAdminRequestPayloadDto } from '@narval/authz-shared'
+import { Action, BaseActionDto, BaseActionRequestDto } from '@narval/authz-shared'
 import { ApiProperty } from '@nestjs/swagger'
 import { Type } from 'class-transformer'
 import { IsArray, IsDefined, IsString, Matches, ValidateNested } from 'class-validator'
@@ -19,7 +19,7 @@ export class SetPolicyRulesDto extends BaseActionDto {
   data: Policy[]
 }
 
-export class SetPolicyRulesRequestDto extends BaseAdminRequestPayloadDto {
+export class SetPolicyRulesRequestDto extends BaseActionRequestDto {
   @IsDefined()
   @ValidateNested()
   @Type(() => SetPolicyRulesDto)

apps/orchestration/src/store/entity/http/rest/dto/assign-user-group-request.dto.ts

@@ -1,4 +1,4 @@
-import { Action, BaseActionDto, BaseAdminRequestPayloadDto } from '@narval/authz-shared'
+import { Action, BaseActionDto, BaseActionRequestDto } from '@narval/authz-shared'
 import { ApiProperty } from '@nestjs/swagger'
 import { Type } from 'class-transformer'
 import { IsDefined, IsIn, ValidateNested } from 'class-validator'
@@ -22,7 +22,7 @@ class AssignUserGroupActionDto extends BaseActionDto {
   data: UserGroupMembershipDto
 }
 
-export class AssignUserGroupRequestDto extends BaseAdminRequestPayloadDto {
+export class AssignUserGroupRequestDto extends BaseActionRequestDto {
   @IsDefined()
   @Type(() => AssignUserGroupActionDto)
   @ValidateNested()

apps/orchestration/src/store/entity/http/rest/dto/assign-user-wallet-request.dto.ts

@@ -1,8 +1,7 @@
-import { Action, BaseAdminRequestPayloadDto } from '@narval/authz-shared'
+import { Action, BaseActionDto, BaseActionRequestDto } from '@narval/authz-shared'
 import { ApiProperty } from '@nestjs/swagger'
 import { Type } from 'class-transformer'
 import { IsDefined, IsEnum, ValidateNested } from 'class-validator'
-import { BaseActionDto } from './base-action.dto'
 import { UserWalletDto } from './user-wallet.dto'
 
 class AssignUserWalletActionDto extends BaseActionDto {
@@ -22,7 +21,7 @@ class AssignUserWalletActionDto extends BaseActionDto {
   data: UserWalletDto
 }
 
-export class AssignUserWalletRequestDto extends BaseAdminRequestPayloadDto {
+export class AssignUserWalletRequestDto extends BaseActionRequestDto {
   @IsDefined()
   @Type(() => AssignUserWalletActionDto)
   @ValidateNested()

apps/orchestration/src/store/entity/http/rest/dto/assign-wallet-group-request.dto.ts

@@ -1,8 +1,7 @@
-import { Action, BaseAdminRequestPayloadDto } from '@narval/authz-shared'
+import { Action, BaseActionDto, BaseActionRequestDto } from '@narval/authz-shared'
 import { ApiProperty } from '@nestjs/swagger'
 import { Type } from 'class-transformer'
 import { IsDefined, IsEnum, ValidateNested } from 'class-validator'
-import { BaseActionDto } from './base-action.dto'
 import { WalletGroupMembershipDto } from './wallet-group-membership.dto'
 
 class AssignWalletGroupActionDto extends BaseActionDto {
@@ -23,7 +22,7 @@ class AssignWalletGroupActionDto extends BaseActionDto {
   data: WalletGroupMembershipDto
 }
 
-export class AssignWalletGroupRequestDto extends BaseAdminRequestPayloadDto {
+export class AssignWalletGroupRequestDto extends BaseActionRequestDto {
   @IsDefined()
   @Type(() => AssignWalletGroupActionDto)
   @ValidateNested()

apps/orchestration/src/store/entity/http/rest/dto/create-address-book-request.dto.ts

@@ -1,4 +1,4 @@
-import { Action, BaseActionDto, BaseAdminRequestPayloadDto } from '@narval/authz-shared'
+import { Action, BaseActionDto, BaseActionRequestDto } from '@narval/authz-shared'
 import { ApiProperty } from '@nestjs/swagger'
 import { Type } from 'class-transformer'
 import { IsDefined, IsEnum, ValidateNested } from 'class-validator'
@@ -21,7 +21,7 @@ class CreateAddressBookAccountActionDto extends BaseActionDto {
   account: AddressBookAccountDataDto
 }
 
-export class CreateAddressBookAccountRequestDto extends BaseAdminRequestPayloadDto {
+export class CreateAddressBookAccountRequestDto extends BaseActionRequestDto {
   @IsDefined()
   @Type(() => CreateAddressBookAccountActionDto)
   @ValidateNested()

apps/orchestration/src/store/entity/http/rest/dto/create-credential-request.dto.ts

@@ -1,10 +1,8 @@
-import { Action } from '@narval/authz-shared'
+import { Action, BaseActionDto, BaseActionRequestDto } from '@narval/authz-shared'
 import { ApiProperty } from '@nestjs/swagger'
 import { Type } from 'class-transformer'
 import { IsDefined, IsEnum, 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 CreateCredentialActionDto extends BaseActionDto {
   @IsEnum(Action)
@@ -21,7 +19,7 @@ class CreateCredentialActionDto extends BaseActionDto {
   credential: AuthCredentialDto
 }
 
-export class CreateCredentialRequestDto extends BaseAdminRequestPayloadDto {
+export class CreateCredentialRequestDto extends BaseActionRequestDto {
   @IsDefined()
   @Type(() => CreateCredentialActionDto)
   @ValidateNested()

apps/orchestration/src/store/entity/http/rest/dto/create-organization-request.dto.ts

@@ -1,10 +1,8 @@
-import { Action } from '@narval/authz-shared'
+import { Action, BaseActionDto, BaseActionRequestDto } from '@narval/authz-shared'
 import { ApiProperty } from '@nestjs/swagger'
 import { Type } from 'class-transformer'
 import { IsDefined, IsEnum, IsNotEmpty, 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()
@@ -39,7 +37,7 @@ class CreateOrganizationActionDto extends BaseActionDto {
   organization: CreateOrganizationDataDto
 }
 
-export class CreateOrganizationRequestDto extends BaseAdminRequestPayloadDto {
+export class CreateOrganizationRequestDto extends BaseActionRequestDto {
   @IsDefined()
   @Type(() => CreateOrganizationActionDto)
   @ValidateNested()

apps/orchestration/src/store/entity/http/rest/dto/create-user-request.dto.ts

@@ -1,9 +1,7 @@
-import { Action, UserRole } from '@narval/authz-shared'
+import { Action, BaseActionDto, BaseActionRequestDto, UserRole } from '@narval/authz-shared'
 import { ApiProperty } from '@nestjs/swagger'
 import { IsDefined, IsIn, IsOptional, 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 CreateUserDataDto {
   @IsString()
@@ -43,7 +41,7 @@ class CreateUserActionDto extends BaseActionDto {
   user: CreateUserDataDto
 }
 
-export class CreateUserRequestDto extends BaseAdminRequestPayloadDto {
+export class CreateUserRequestDto extends BaseActionRequestDto {
   @IsDefined()
   @ValidateNested()
   @ApiProperty()

apps/orchestration/src/store/entity/http/rest/dto/register-tokens-request.dto.ts

@@ -1,8 +1,7 @@
-import { Action, BaseAdminRequestPayloadDto } from '@narval/authz-shared'
+import { Action, BaseActionDto, BaseActionRequestDto } from '@narval/authz-shared'
 import { ApiProperty } from '@nestjs/swagger'
 import { Type } from 'class-transformer'
 import { IsArray, IsDefined, IsEnum, ValidateNested } from 'class-validator'
-import { BaseActionDto } from './base-action.dto'
 import { TokenDto } from './token-dto'
 
 class RegisterTokensActionDto extends BaseActionDto {
@@ -23,7 +22,7 @@ class RegisterTokensActionDto extends BaseActionDto {
   tokens: TokenDto[]
 }
 
-export class RegisterTokensRequestDto extends BaseAdminRequestPayloadDto {
+export class RegisterTokensRequestDto extends BaseActionRequestDto {
   @IsDefined()
   @Type(() => RegisterTokensActionDto)
   @ValidateNested()

apps/orchestration/src/store/entity/http/rest/dto/register-wallet-request.dto.ts

@@ -1,9 +1,7 @@
-import { Action } from '@narval/authz-shared'
+import { Action, BaseActionDto, BaseActionRequestDto } from '@narval/authz-shared'
 import { ApiProperty } from '@nestjs/swagger'
 import { Type } from 'class-transformer'
 import { IsDefined, IsEnum, ValidateNested } from 'class-validator'
-import { BaseActionDto } from './base-action.dto'
-import { BaseAdminRequestPayloadDto } from './base-admin-request-payload.dto'
 import { WalletDto } from './wallet-dto'
 
 class RegisterWalletActionDto extends BaseActionDto {
@@ -23,7 +21,7 @@ class RegisterWalletActionDto extends BaseActionDto {
   wallet: WalletDto
 }
 
-export class RegisterWalletRequestDto extends BaseAdminRequestPayloadDto {
+export class RegisterWalletRequestDto extends BaseActionRequestDto {
   @IsDefined()
   @Type(() => RegisterWalletActionDto)
   @ValidateNested()

apps/orchestration/src/store/entity/http/rest/dto/update-user-request.dto.ts

@@ -1,4 +1,4 @@
-import { Action, BaseActionDto, BaseAdminRequestPayloadDto, UserRole } from '@narval/authz-shared'
+import { Action, BaseActionDto, BaseActionRequestDto, UserRole } from '@narval/authz-shared'
 import { ApiProperty } from '@nestjs/swagger'
 import { IsDefined, IsIn, IsString, ValidateNested } from 'class-validator'
 
@@ -31,7 +31,7 @@ class UpdateUserActionDto extends BaseActionDto {
   user: UpdateUserDataDto
 }
 
-export class UpdateUserRequestDto extends BaseAdminRequestPayloadDto {
+export class UpdateUserRequestDto extends BaseActionRequestDto {
   @IsDefined()
   @ValidateNested()
   @ApiProperty()

apps/orchestration/src/store/entity/http/rest/dto/update-user-response.dto.ts

@@ -1,7 +1,7 @@
-import { UserDto } from '@narval/authz-shared'
 import { ApiProperty } from '@nestjs/swagger'
 import { Type } from 'class-transformer'
 import { IsDefined, ValidateNested } from 'class-validator'
+import { UserDto } from './user-dto'
 
 export class UpdateUserResponseDto {
   @IsDefined()

apps/orchestration/src/store/entity/http/rest/dto/base-admin-request-payload.dto.ts → packages/authz-shared/src/lib/dto/base-action-request.dto.ts

@@ -1,20 +1,20 @@
 import { ApiProperty } from '@nestjs/swagger'
 import { ArrayNotEmpty, IsDefined, ValidateNested } from 'class-validator'
-import { RequestSignatureDto } from './request-signature.dto'
+import { SignatureDto } from './signature.dto'
 
-export class BaseAdminRequestPayloadDto {
+export class BaseActionRequestDto {
   @IsDefined()
   @ApiProperty({
-    type: () => RequestSignatureDto
+    type: () => SignatureDto
   })
-  authentication: RequestSignatureDto
+  authentication: SignatureDto
 
   @IsDefined()
   @ArrayNotEmpty()
   @ValidateNested()
   @ApiProperty({
-    type: () => RequestSignatureDto,
+    type: () => SignatureDto,
     isArray: true
   })
-  approvals: RequestSignatureDto[]
+  approvals: SignatureDto[]
 }

packages/authz-shared/src/lib/dto/index.ts

@@ -1,4 +1,3 @@
+export * from './base-action-request.dto'
 export * from './base-action.dto'
-export * from './base-admin-request-payload.dto'
-export * from './request-signature.dto'
-export * from './user-dto'
+export * from './signature.dto'

packages/authz-shared/src/lib/dto/request-signature.dto.ts → packages/authz-shared/src/lib/dto/signature.dto.ts

@@ -2,7 +2,7 @@ import { ApiProperty } from '@nestjs/swagger'
 import { IsDefined, IsIn, IsString } from 'class-validator'
 import { Alg } from '../type/action.type'
 
-export class RequestSignatureDto {
+export class SignatureDto {
   @IsString()
   @IsDefined()
   @ApiProperty()