@evara-group/guard 3.0.0 → 3.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/modules/user/dtos/create-user.dto.d.ts +1 -1
- package/dist/modules/user/dtos/user.dto.d.ts +5 -0
- package/dist/modules/user/dtos/user.dto.js +50 -0
- package/dist/modules/user/dtos/user.dto.js.map +1 -1
- package/dist/modules/user/user.entity.d.ts +5 -0
- package/dist/modules/user/user.entity.js +20 -0
- package/dist/modules/user/user.entity.js.map +1 -1
- package/dist/modules/user/user.mapper.js +20 -0
- package/dist/modules/user/user.mapper.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +51 -51
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { UserDTO } from "./user.dto";
|
|
2
|
-
declare const CreateUserDTO_base: import("@nestjs/common").Type<Omit<UserDTO, "
|
|
2
|
+
declare const CreateUserDTO_base: import("@nestjs/common").Type<Omit<UserDTO, "roles" | "id" | "createdAt" | "updatedAt" | "deletedAt">>;
|
|
3
3
|
export declare class CreateUserDTO extends CreateUserDTO_base {
|
|
4
4
|
roles: number[];
|
|
5
5
|
}
|
|
@@ -5,6 +5,11 @@ export declare class UserDTO extends BaseDTO {
|
|
|
5
5
|
email?: string;
|
|
6
6
|
password?: string;
|
|
7
7
|
username?: string;
|
|
8
|
+
name?: string;
|
|
9
|
+
shortName?: string;
|
|
10
|
+
phone?: string;
|
|
11
|
+
emailEvara?: string;
|
|
12
|
+
emailPrivate?: string;
|
|
8
13
|
activated?: boolean;
|
|
9
14
|
imageUrl?: string;
|
|
10
15
|
resetPasswordRequest?: boolean;
|
|
@@ -43,6 +43,56 @@ __decorate([
|
|
|
43
43
|
(0, class_validator_1.IsNotEmpty)(),
|
|
44
44
|
__metadata("design:type", String)
|
|
45
45
|
], UserDTO.prototype, "username", void 0);
|
|
46
|
+
__decorate([
|
|
47
|
+
(0, swagger_1.ApiProperty)({
|
|
48
|
+
example: "John Doe",
|
|
49
|
+
description: "Full name",
|
|
50
|
+
required: false,
|
|
51
|
+
}),
|
|
52
|
+
(0, class_validator_1.IsString)(),
|
|
53
|
+
(0, class_validator_1.IsOptional)(),
|
|
54
|
+
__metadata("design:type", String)
|
|
55
|
+
], UserDTO.prototype, "name", void 0);
|
|
56
|
+
__decorate([
|
|
57
|
+
(0, swagger_1.ApiProperty)({
|
|
58
|
+
example: "JD",
|
|
59
|
+
description: "Short name",
|
|
60
|
+
required: false,
|
|
61
|
+
}),
|
|
62
|
+
(0, class_validator_1.IsString)(),
|
|
63
|
+
(0, class_validator_1.IsOptional)(),
|
|
64
|
+
__metadata("design:type", String)
|
|
65
|
+
], UserDTO.prototype, "shortName", void 0);
|
|
66
|
+
__decorate([
|
|
67
|
+
(0, swagger_1.ApiProperty)({
|
|
68
|
+
example: "+1234567890",
|
|
69
|
+
description: "Phone number",
|
|
70
|
+
required: false,
|
|
71
|
+
}),
|
|
72
|
+
(0, class_validator_1.IsString)(),
|
|
73
|
+
(0, class_validator_1.IsOptional)(),
|
|
74
|
+
__metadata("design:type", String)
|
|
75
|
+
], UserDTO.prototype, "phone", void 0);
|
|
76
|
+
__decorate([
|
|
77
|
+
(0, swagger_1.ApiProperty)({
|
|
78
|
+
example: "email@domain.com",
|
|
79
|
+
description: "Evara email",
|
|
80
|
+
required: false,
|
|
81
|
+
}),
|
|
82
|
+
(0, class_validator_1.IsString)(),
|
|
83
|
+
(0, class_validator_1.IsOptional)(),
|
|
84
|
+
__metadata("design:type", String)
|
|
85
|
+
], UserDTO.prototype, "emailEvara", void 0);
|
|
86
|
+
__decorate([
|
|
87
|
+
(0, swagger_1.ApiProperty)({
|
|
88
|
+
example: "email@domain.com",
|
|
89
|
+
description: "Evara email",
|
|
90
|
+
required: false,
|
|
91
|
+
}),
|
|
92
|
+
(0, class_validator_1.IsString)(),
|
|
93
|
+
(0, class_validator_1.IsOptional)(),
|
|
94
|
+
__metadata("design:type", String)
|
|
95
|
+
], UserDTO.prototype, "emailPrivate", void 0);
|
|
46
96
|
__decorate([
|
|
47
97
|
(0, swagger_1.ApiProperty)({
|
|
48
98
|
example: 1,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.dto.js","sourceRoot":"","sources":["../../../../src/modules/user/dtos/user.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"user.dto.js","sourceRoot":"","sources":["../../../../src/modules/user/dtos/user.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8C;AAC9C,qDAA4E;AAC5E,yDAA4C;AAC5C,2DAAuD;AAOvD,MAAa,OAAQ,SAAQ,kBAAO;CA4FnC;AA5FD,0BA4FC;AAnFC;IARC,IAAA,qBAAW,EAAC;QACX,WAAW,EAAE,IAAI;QACjB,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,kBAAkB;QAC3B,WAAW,EAAE,YAAY;KAC1B,CAAC;IACD,IAAA,yBAAO,GAAE;IACT,IAAA,4BAAU,GAAE;;sCACE;AAIf;IAFC,IAAA,qBAAW,EAAC,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC;IACnE,IAAA,2BAAO,GAAE;;yCACQ;AASlB;IAPC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,MAAM;QACf,WAAW,EAAE,UAAU;QACvB,QAAQ,EAAE,KAAK;KAChB,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;yCACK;AASlB;IAPC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,UAAU;QACnB,WAAW,EAAE,WAAW;QACxB,QAAQ,EAAE,KAAK;KAChB,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;qCACC;AASd;IAPC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,IAAI;QACb,WAAW,EAAE,YAAY;QACzB,QAAQ,EAAE,KAAK;KAChB,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;0CACM;AASnB;IAPC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,aAAa;QACtB,WAAW,EAAE,cAAc;QAC3B,QAAQ,EAAE,KAAK;KAChB,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;sCACE;AASf;IAPC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,kBAAkB;QAC3B,WAAW,EAAE,aAAa;QAC1B,QAAQ,EAAE,KAAK;KAChB,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;2CACO;AAQpB;IAPC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,kBAAkB;QAC3B,WAAW,EAAE,aAAa;QAC1B,QAAQ,EAAE,KAAK;KAChB,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;6CACS;AAOtB;IALC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,CAAC;QACV,WAAW,EAAE,iBAAiB;QAC9B,QAAQ,EAAE,KAAK;KAChB,CAAC;;0CACkB;AAOpB;IALC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,qBAAqB;QAC9B,WAAW,EAAE,WAAW;QACxB,QAAQ,EAAE,KAAK;KAChB,CAAC;;yCACgB;AAOlB;IALC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,iDAAiD;QAC9D,QAAQ,EAAE,KAAK;KAChB,CAAC;;qDAC6B"}
|
|
@@ -2,6 +2,11 @@ import "reflect-metadata";
|
|
|
2
2
|
import { BaseEntity } from "../../core/utils/base.entity";
|
|
3
3
|
import { Role } from "../role/role.entity";
|
|
4
4
|
export declare class User extends BaseEntity {
|
|
5
|
+
name?: string;
|
|
6
|
+
shortName?: string;
|
|
7
|
+
phone?: string;
|
|
8
|
+
emailEvara?: string;
|
|
9
|
+
emailPrivate?: string;
|
|
5
10
|
email?: string;
|
|
6
11
|
password?: string;
|
|
7
12
|
username?: string;
|
|
@@ -23,6 +23,26 @@ let User = class User extends base_entity_1.BaseEntity {
|
|
|
23
23
|
}
|
|
24
24
|
};
|
|
25
25
|
exports.User = User;
|
|
26
|
+
__decorate([
|
|
27
|
+
(0, typeorm_1.Column)({ type: "varchar", nullable: false }),
|
|
28
|
+
__metadata("design:type", String)
|
|
29
|
+
], User.prototype, "name", void 0);
|
|
30
|
+
__decorate([
|
|
31
|
+
(0, typeorm_1.Column)({ type: "varchar", nullable: true }),
|
|
32
|
+
__metadata("design:type", String)
|
|
33
|
+
], User.prototype, "shortName", void 0);
|
|
34
|
+
__decorate([
|
|
35
|
+
(0, typeorm_1.Column)({ type: "varchar", nullable: true }),
|
|
36
|
+
__metadata("design:type", String)
|
|
37
|
+
], User.prototype, "phone", void 0);
|
|
38
|
+
__decorate([
|
|
39
|
+
(0, typeorm_1.Column)({ name: "email_evara", type: "varchar", nullable: true }),
|
|
40
|
+
__metadata("design:type", String)
|
|
41
|
+
], User.prototype, "emailEvara", void 0);
|
|
42
|
+
__decorate([
|
|
43
|
+
(0, typeorm_1.Column)({ name: "email_private", type: "varchar", nullable: true }),
|
|
44
|
+
__metadata("design:type", String)
|
|
45
|
+
], User.prototype, "emailPrivate", void 0);
|
|
26
46
|
__decorate([
|
|
27
47
|
(0, typeorm_1.Column)({ unique: true, type: "varchar", nullable: false }),
|
|
28
48
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.entity.js","sourceRoot":"","sources":["../../../src/modules/user/user.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4BAA0B;AAC1B,qCAA2E;AAC3E,yDAA4C;AAC5C,8DAA0D;AAE1D,qDAA2C;AAGpC,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,wBAAU;IAA7B;;
|
|
1
|
+
{"version":3,"file":"user.entity.js","sourceRoot":"","sources":["../../../src/modules/user/user.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4BAA0B;AAC1B,qCAA2E;AAC3E,yDAA4C;AAC5C,8DAA0D;AAE1D,qDAA2C;AAGpC,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,wBAAU;IAA7B;;QA0BL,cAAS,GAAa,KAAK,CAAC;QAM5B,yBAAoB,GAAa,KAAK,CAAC;IASzC,CAAC;CAAA,CAAA;AAzCY,oBAAI;AAEf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;kCAC/B;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCACzB;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mCAC7B;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC7C;AAEpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CAC7C;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;mCAC5C;AAIf;IAFC,IAAA,2BAAO,GAAE;IACT,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;sCAC3B;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCAC1B;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;uCACjC;AAG5B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCAC7C;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;kDACrC;AAQvC;IANC,IAAA,oBAAU,EAAC,GAAG,EAAE,CAAC,kBAAI,CAAC;IACtB,IAAA,mBAAS,EAAC;QACT,IAAI,EAAE,YAAY;QAClB,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,oBAAoB,EAAE,IAAI,EAAE;QAC3D,iBAAiB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,oBAAoB,EAAE,IAAI,EAAE;KACnE,CAAC;;mCACa;eAxCJ,IAAI;IADhB,IAAA,gBAAM,EAAC,OAAO,CAAC;GACH,IAAI,CAyChB"}
|
|
@@ -13,6 +13,11 @@ const allowedUserDtoKeys = [
|
|
|
13
13
|
"activated",
|
|
14
14
|
"imageUrl",
|
|
15
15
|
"roles",
|
|
16
|
+
"name",
|
|
17
|
+
"shortName",
|
|
18
|
+
"emailEvara",
|
|
19
|
+
"emailPrivate",
|
|
20
|
+
"phone",
|
|
16
21
|
"resetPasswordRequest",
|
|
17
22
|
];
|
|
18
23
|
function mapUserToUserDtoSelective(userOrUsers, keys) {
|
|
@@ -40,6 +45,11 @@ const mapCreateUserDtoToEntity = (dto) => {
|
|
|
40
45
|
user.activated = dto.activated ?? false;
|
|
41
46
|
user.imageUrl = dto.imageUrl;
|
|
42
47
|
user.password = dto.password;
|
|
48
|
+
user.emailEvara = dto.emailEvara;
|
|
49
|
+
user.emailPrivate = dto.emailPrivate;
|
|
50
|
+
user.name = dto.name;
|
|
51
|
+
user.shortName = dto.shortName;
|
|
52
|
+
user.phone = dto.phone;
|
|
43
53
|
user.resetPasswordRequest = dto.resetPasswordRequest ?? false;
|
|
44
54
|
if (dto.roles?.length) {
|
|
45
55
|
user.roles = dto.roles.map((roleId) => {
|
|
@@ -60,6 +70,16 @@ const mapUpdateUserDtoToEntity = (dto, user) => {
|
|
|
60
70
|
user.activated = dto.activated;
|
|
61
71
|
if (dto.imageUrl !== undefined)
|
|
62
72
|
user.imageUrl = dto.imageUrl;
|
|
73
|
+
if (dto.emailEvara !== undefined)
|
|
74
|
+
user.emailEvara = dto.emailEvara;
|
|
75
|
+
if (dto.emailPrivate !== undefined)
|
|
76
|
+
user.emailPrivate = dto.emailPrivate;
|
|
77
|
+
if (dto.name !== undefined)
|
|
78
|
+
user.name = dto.name;
|
|
79
|
+
if (dto.shortName !== undefined)
|
|
80
|
+
user.shortName = dto.shortName;
|
|
81
|
+
if (dto.phone !== undefined)
|
|
82
|
+
user.phone = dto.phone;
|
|
63
83
|
if (dto.resetPasswordRequest !== undefined)
|
|
64
84
|
user.resetPasswordRequest = dto.resetPasswordRequest;
|
|
65
85
|
if (dto.password !== undefined && dto.password !== null)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.mapper.js","sourceRoot":"","sources":["../../../src/modules/user/user.mapper.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"user.mapper.js","sourceRoot":"","sources":["../../../src/modules/user/user.mapper.ts"],"names":[],"mappings":"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"}
|