diff --git a/package-lock.json b/package-lock.json index 888abea..9fbf918 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,7 @@ "passport-hubspot-oauth2": "^1.0.3", "passport-mailchimp": "^1.1.0", "protospack": "2.5.2", - "protospack-v2": "3.6.2", + "protospack-v2": "3.6.3", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", @@ -9015,9 +9015,9 @@ } }, "node_modules/protospack-v2": { - "version": "3.6.2", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.6.2.tgz", - "integrity": "sha512-H1tpfCrj5cAJQFyES3+liZh0OoRUqCjLGGykEBhIOBTUGRPnr0CuU+czCjHdF/jBxO7ToTc3RS+kngX1scXyLg==", + "version": "3.6.3", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.6.3.tgz", + "integrity": "sha512-eGkVCzWs35jWdr3thF/V8d04gaDzO8LfiRpIQZTahW+vGNAMSs/zmVnXpxsSOmabkHJHvtbqHMydt30KpE5hGQ==", "dependencies": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", @@ -17245,9 +17245,9 @@ } }, "protospack-v2": { - "version": "3.6.2", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.6.2.tgz", - "integrity": "sha512-H1tpfCrj5cAJQFyES3+liZh0OoRUqCjLGGykEBhIOBTUGRPnr0CuU+czCjHdF/jBxO7ToTc3RS+kngX1scXyLg==", + "version": "3.6.3", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.6.3.tgz", + "integrity": "sha512-eGkVCzWs35jWdr3thF/V8d04gaDzO8LfiRpIQZTahW+vGNAMSs/zmVnXpxsSOmabkHJHvtbqHMydt30KpE5hGQ==", "requires": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", diff --git a/package.json b/package.json index ebf5760..801720d 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "passport-hubspot-oauth2": "^1.0.3", "passport-mailchimp": "^1.1.0", "protospack": "2.5.2", - "protospack-v2": "3.6.2", + "protospack-v2": "3.6.3", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", diff --git a/src/modules/users/dtos/entities.ts b/src/modules/users/dtos/entities.ts index 65abbc7..2d778bc 100644 --- a/src/modules/users/dtos/entities.ts +++ b/src/modules/users/dtos/entities.ts @@ -1,5 +1,5 @@ import { ApiProperty, ApiPropertyOptional, OmitType } from '@nestjs/swagger'; -import { RoleDto, UserRole } from 'src/modules/roles/dto/entities'; +import { UserRole } from 'src/modules/roles/dto/entities'; export class Hierarchy { @ApiProperty() id: number; @@ -45,27 +45,17 @@ export class User { createdAt: string; @ApiProperty() updatedAt: string; + @ApiProperty() + status: string; + @ApiPropertyOptional() + lastLogin?: string; } export class UserNoRoles extends OmitType(User, ['roles']) {} export class UserNoRolesAndCustomer extends OmitType(UserNoRoles, [ 'customer', ]) {} -export class UserByCustomer { - @ApiProperty({ type: [RoleDto] }) - roles: RoleDto[]; - @ApiProperty() - id: string; - @ApiProperty() - name: string; - @ApiProperty() - username: string; - @ApiProperty() - mfaStatus: string; - @ApiProperty() - createdAt: string; - @ApiProperty() - updatedAt: string; -} +export class UserByCustomer extends OmitType(User, ['customer']) {} + export class CreateUserReq { @ApiPropertyOptional() name?: string;