Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions src/api-key/api-key.dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,55 +6,66 @@ import {
IsUUID,
ValidateNested,
} from 'class-validator';
import { i18nValidationMessage } from 'nestjs-i18n';
import { Type } from 'class-transformer';
import { APIKey, APIKeyAttrs, APIKeyPermission } from './api-key.entity';
import { NamespaceResponseDto } from 'omniboxd/namespaces/dto/namespace-response.dto';
import { UserResponseDto } from 'omniboxd/user/dto/user-response.dto';

export class CreateAPIKeyDto {
@IsString()
@IsString({
message: i18nValidationMessage('validation.errors.userId.isString'),
})
user_id: string;

@IsString()
@IsString({
message: i18nValidationMessage('validation.errors.namespaceId.isString'),
})
namespace_id: string;

@IsObject()
@IsObject({ message: i18nValidationMessage('validation.errors.isObject') })
@IsOptional()
attrs?: APIKeyAttrs;
}

export class UpdateAPIKeyDto {
@IsObject()
@IsObject({ message: i18nValidationMessage('validation.errors.isObject') })
@IsOptional()
attrs?: APIKeyAttrs;
}

export class PatchAPIKeyDto {
@IsString()
@IsString({ message: i18nValidationMessage('validation.errors.isString') })
@IsOptional()
root_resource_id?: string;

@IsArray()
@IsArray({ message: i18nValidationMessage('validation.errors.isArray') })
@ValidateNested({ each: true })
@Type(() => Object)
@IsOptional()
permissions?: APIKeyPermission[];
}

export class APIKeyResponseDto {
@IsUUID()
@IsUUID(undefined, {
message: i18nValidationMessage('validation.errors.isUUID'),
})
id: string;

@IsString()
@IsString({ message: i18nValidationMessage('validation.errors.isString') })
value: string;

@IsString()
@IsString({
message: i18nValidationMessage('validation.errors.userId.isString'),
})
user_id: string;

@IsString()
@IsString({
message: i18nValidationMessage('validation.errors.namespaceId.isString'),
})
namespace_id: string;

@IsObject()
@IsObject({ message: i18nValidationMessage('validation.errors.isObject') })
attrs: APIKeyAttrs;

created_at: Date;
Expand Down
31 changes: 22 additions & 9 deletions src/applications/applications.dto.ts
Original file line number Diff line number Diff line change
@@ -1,40 +1,53 @@
import { IsOptional, IsString, IsUUID, IsObject } from 'class-validator';
import { i18nValidationMessage } from 'nestjs-i18n';
import { Applications } from 'omniboxd/applications/applications.entity';

export class FindAllApplicationsDto {
@IsUUID()
@IsUUID(undefined, {
message: i18nValidationMessage('validation.errors.isUUID'),
})
@IsOptional()
api_key_id?: string;
}

export class CreateApplicationsDto {
@IsUUID()
@IsUUID(undefined, {
message: i18nValidationMessage('validation.errors.isUUID'),
})
@IsOptional()
api_key_id?: string;

@IsObject()
@IsObject({ message: i18nValidationMessage('validation.errors.isObject') })
@IsOptional()
attrs?: Record<string, any>;
}

export class ApplicationsResponseDto {
@IsUUID()
@IsUUID(undefined, {
message: i18nValidationMessage('validation.errors.isUUID'),
})
id: string;

@IsString()
@IsString({
message: i18nValidationMessage('validation.errors.namespaceId.isString'),
})
namespace_id: string;

@IsString()
@IsString({
message: i18nValidationMessage('validation.errors.userId.isString'),
})
user_id: string;

@IsString()
@IsString({ message: i18nValidationMessage('validation.errors.isString') })
app_id: string;

@IsUUID()
@IsUUID(undefined, {
message: i18nValidationMessage('validation.errors.isUUID'),
})
@IsOptional()
api_key_id: string | null;

@IsObject()
@IsObject({ message: i18nValidationMessage('validation.errors.isObject') })
attrs: Record<string, any>;

created_at: Date;
Expand Down
25 changes: 18 additions & 7 deletions src/auth/dto/invitation.dto.ts
Original file line number Diff line number Diff line change
@@ -1,32 +1,43 @@
import { Expose } from 'class-transformer';
import { IsEnum, IsNotEmpty, IsOptional, IsString } from 'class-validator';
import { i18nValidationMessage } from 'nestjs-i18n';
import { NamespaceRole } from 'omniboxd/namespaces/entities/namespace-member.entity';
import { ResourcePermission } from 'omniboxd/permissions/resource-permission.enum';

// Invite a user to a group or a resource within a namespace
export class UserInvitationDto {
@Expose()
@IsString()
@IsNotEmpty()
@IsString({
message: i18nValidationMessage('validation.errors.namespaceId.isString'),
})
@IsNotEmpty({
message: i18nValidationMessage('validation.errors.namespaceId.isNotEmpty'),
})
namespaceId: string;

@Expose()
@IsEnum(NamespaceRole)
@IsNotEmpty()
@IsEnum(NamespaceRole, {
message: i18nValidationMessage('validation.errors.isEnum'),
})
@IsNotEmpty({
message: i18nValidationMessage('validation.errors.isNotEmpty'),
})
namespaceRole: NamespaceRole;

@Expose()
@IsString()
@IsString({ message: i18nValidationMessage('validation.errors.isString') })
@IsOptional()
resourceId?: string;

@Expose()
@IsEnum(ResourcePermission)
@IsEnum(ResourcePermission, {
message: i18nValidationMessage('validation.errors.permission.isEnum'),
})
@IsOptional()
permission?: ResourcePermission;

@Expose()
@IsString()
@IsString({ message: i18nValidationMessage('validation.errors.isString') })
@IsOptional()
groupId?: string | null;
}
9 changes: 7 additions & 2 deletions src/auth/dto/invite-payload.dto.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
import { Expose, Type } from 'class-transformer';
import { UserInvitationDto } from './invitation.dto';
import { IsNotEmpty, IsString } from 'class-validator';
import { i18nValidationMessage } from 'nestjs-i18n';

export class InvitePayloadDto {
@Expose()
@IsString()
@IsNotEmpty()
@IsString({
message: i18nValidationMessage('validation.errors.userId.isString'),
})
@IsNotEmpty({
message: i18nValidationMessage('validation.errors.userId.isNotEmpty'),
})
userId: string;

@Expose()
Expand Down
15 changes: 11 additions & 4 deletions src/auth/dto/login-payload.dto.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
import { Expose } from 'class-transformer';
import { IsNotEmpty, IsString } from 'class-validator';
import { i18nValidationMessage } from 'nestjs-i18n';

export class LoginPayloadDto {
@Expose()
@IsString()
@IsNotEmpty()
@IsString({
message: i18nValidationMessage('validation.errors.email.isString'),
})
@IsNotEmpty({
message: i18nValidationMessage('validation.errors.email.isNotEmpty'),
})
email: string;

@Expose()
@IsString()
@IsNotEmpty()
@IsString({ message: i18nValidationMessage('validation.errors.isString') })
@IsNotEmpty({
message: i18nValidationMessage('validation.errors.isNotEmpty'),
})
sub: string;
}
9 changes: 7 additions & 2 deletions src/auth/dto/signup-payload.dto.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
import { Expose, Type } from 'class-transformer';
import { UserInvitationDto } from './invitation.dto';
import { IsNotEmpty, IsOptional, IsString } from 'class-validator';
import { i18nValidationMessage } from 'nestjs-i18n';

export class SignUpPayloadDto {
@Expose()
@IsString()
@IsNotEmpty()
@IsString({
message: i18nValidationMessage('validation.errors.email.isString'),
})
@IsNotEmpty({
message: i18nValidationMessage('validation.errors.email.isNotEmpty'),
})
email: string;

@Expose()
Expand Down
3 changes: 2 additions & 1 deletion src/auth/dto/wechat-login.dto.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { IsString } from 'class-validator';
import { i18nValidationMessage } from 'nestjs-i18n';

export class WechatCheckResponseDto {
@IsString()
@IsString({ message: i18nValidationMessage('validation.errors.isString') })
status: 'pending' | 'success' | 'expired';

user?: {
Expand Down
5 changes: 4 additions & 1 deletion src/conversations/dto/create-conversation.dto.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { IsString, IsOptional } from 'class-validator';
import { i18nValidationMessage } from 'nestjs-i18n';

export class CreateConversationDto {
@IsString()
@IsString({
message: i18nValidationMessage('validation.errors.title.isString'),
})
@IsOptional()
title?: string;
}
9 changes: 7 additions & 2 deletions src/conversations/dto/update-conversation.dto.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
import { IsNotEmpty, IsString } from 'class-validator';
import { i18nValidationMessage } from 'nestjs-i18n';

export class UpdateConversationDto {
@IsString()
@IsNotEmpty()
@IsString({
message: i18nValidationMessage('validation.errors.title.isString'),
})
@IsNotEmpty({
message: i18nValidationMessage('validation.errors.title.isNotEmpty'),
})
title: string;
}
27 changes: 20 additions & 7 deletions src/feedback/dto/create-feedback.dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,33 @@ import {
IsNotEmpty,
MaxLength,
} from 'class-validator';
import { i18nValidationMessage } from 'nestjs-i18n';
import { FeedbackType } from '../entities/feedback.entity';

export class CreateFeedbackDto {
@IsEnum(FeedbackType)
@IsNotEmpty()
@IsEnum(FeedbackType, {
message: i18nValidationMessage('validation.errors.type.isEnum'),
})
@IsNotEmpty({
message: i18nValidationMessage('validation.errors.type.isNotEmpty'),
})
type: FeedbackType;

@IsString()
@IsNotEmpty()
@MaxLength(5000)
@IsString({
message: i18nValidationMessage('validation.errors.description.isString'),
})
@IsNotEmpty({
message: i18nValidationMessage('validation.errors.description.isNotEmpty'),
})
@MaxLength(5000, {
message: i18nValidationMessage('validation.errors.description.maxLength'),
})
description: string;

@IsString()
@IsString({ message: i18nValidationMessage('validation.errors.isString') })
@IsOptional()
@MaxLength(500)
@MaxLength(500, {
message: i18nValidationMessage('validation.errors.maxLength'),
})
contactInfo?: string;
}
8 changes: 6 additions & 2 deletions src/groups/dto/add-group-user.dto.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import { IsString, IsArray } from 'class-validator';
import { i18nValidationMessage } from 'nestjs-i18n';

export class AddGroupUserDto {
@IsArray()
@IsString({ each: true })
@IsArray({ message: i18nValidationMessage('validation.errors.isArray') })
@IsString({
each: true,
message: i18nValidationMessage('validation.errors.isString'),
})
userIds: string[];
}
9 changes: 7 additions & 2 deletions src/groups/dto/create-group.dto.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
import { IsNotEmpty, IsString } from 'class-validator';
import { i18nValidationMessage } from 'nestjs-i18n';

export class CreateGroupDto {
@IsString()
@IsNotEmpty()
@IsString({
message: i18nValidationMessage('validation.errors.title.isString'),
})
@IsNotEmpty({
message: i18nValidationMessage('validation.errors.title.isNotEmpty'),
})
title: string;
}
Loading