@evara-group/guard 2.0.0 → 3.0.1

package/README.md

@@ -45,16 +45,17 @@ This package uses a **named TypeORM connection** (`AUTH_DATABASE_CONNECTION`) to
 The package follows the same architecture pattern as dms-new-backend-nestjs:
 
 1. **`AuthorizationGuardModule`** - Unified entry point that:
+
    - Configures TypeORM connection for the auth database (named connection)
    - Loads `UserModule` (simple module for user management)
    - Loads `AuthModule` (simple module for authentication)
-
 2. **`UserModule`** - Simple module that:
+
    - Uses `TypeOrmModule.forFeature([User], AUTH_DATABASE_CONNECTION)`
    - Provides `UserService` for CRUD operations
    - Exports `UserService` and `TypeOrmModule`
-
 3. **`AuthModule`** - Simple module that:
+
    - Imports `UserModule` directly
    - Configures JWT using `JwtModule.registerAsync()` with `ConfigService`
    - Provides `AuthService` and `JwtStrategy`
@@ -213,10 +214,11 @@ CREATE DATABASE auth_db;
 The package uses TypeORM entities. You'll need to:
 
 1. **Option 1: Use TypeORM migrations** (recommended)
+
    - Generate migration from the `User` entity
    - Run migrations on your auth database
-
 2. **Option 2: Use synchronize** (development only)
+
    - Modify `AuthorizationGuardModule.forRoot()` to set `synchronize: true` in the TypeORM config (NOT recommended for production)
 
 ### User Entity Schema
@@ -361,4 +363,6 @@ ISC
 
 ## 👤 Author
 
+bassem elsayed
+
 abdullah anter

package/dist/database/database-ops.d.ts

@@ -0,0 +1,2 @@
+export declare function runAuthMigrations(): Promise<void>;
+export declare function runAuthSeeding(): Promise<void>;

package/dist/database/database-ops.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runAuthMigrations = runAuthMigrations;
+exports.runAuthSeeding = runAuthSeeding;
+const typeorm_config_1 = __importDefault(require("./config/typeorm.config"));
+const orchestrator_seeder_1 = require("./seeders/orchestrator.seeder");
+async function runAuthMigrations() {
+    await typeorm_config_1.default.initialize();
+    await typeorm_config_1.default.runMigrations();
+    await typeorm_config_1.default.destroy();
+}
+async function runAuthSeeding() {
+    await typeorm_config_1.default.initialize();
+    const seeder = new orchestrator_seeder_1.SeederOrchestrator(typeorm_config_1.default);
+    await seeder.run();
+    await typeorm_config_1.default.destroy();
+}
+//# sourceMappingURL=database-ops.js.map

package/dist/database/database-ops.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"database-ops.js","sourceRoot":"","sources":["../../src/database/database-ops.ts"],"names":[],"mappings":";;;;;AAMA,8CAIC;AAKD,wCAKC;AApBD,6EAAqD;AACrD,uEAAmE;AAK5D,KAAK,UAAU,iBAAiB;IACrC,MAAM,wBAAc,CAAC,UAAU,EAAE,CAAC;IAClC,MAAM,wBAAc,CAAC,aAAa,EAAE,CAAC;IACrC,MAAM,wBAAc,CAAC,OAAO,EAAE,CAAC;AACjC,CAAC;AAKM,KAAK,UAAU,cAAc;IAClC,MAAM,wBAAc,CAAC,UAAU,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,IAAI,wCAAkB,CAAC,wBAAc,CAAC,CAAC;IACtD,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC;IACnB,MAAM,wBAAc,CAAC,OAAO,EAAE,CAAC;AACjC,CAAC"}

package/dist/index.d.ts

@@ -74,3 +74,4 @@ export * from "./core/utils/password-util";
 export { UserPermissionEnum } from "./core/enums/user-permission";
 export { AUTH_DATABASE_CONNECTION } from "./common";
 export { AuthSeeder } from "./database/seeders/auth.seeder";
+export { runAuthMigrations, runAuthSeeding } from "./database/database-ops";

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AuthSeeder = exports.AUTH_DATABASE_CONNECTION = exports.UserPermissionEnum = void 0;
+exports.runAuthSeeding = exports.runAuthMigrations = exports.AuthSeeder = exports.AUTH_DATABASE_CONNECTION = exports.UserPermissionEnum = void 0;
 require("reflect-metadata");
 __exportStar(require("./modules/app.module"), exports);
 __exportStar(require("./modules/auth/auth.module"), exports);
@@ -94,4 +94,7 @@ var common_1 = require("./common");
 Object.defineProperty(exports, "AUTH_DATABASE_CONNECTION", { enumerable: true, get: function () { return common_1.AUTH_DATABASE_CONNECTION; } });
 var auth_seeder_1 = require("./database/seeders/auth.seeder");
 Object.defineProperty(exports, "AuthSeeder", { enumerable: true, get: function () { return auth_seeder_1.AuthSeeder; } });
+var database_ops_1 = require("./database/database-ops");
+Object.defineProperty(exports, "runAuthMigrations", { enumerable: true, get: function () { return database_ops_1.runAuthMigrations; } });
+Object.defineProperty(exports, "runAuthSeeding", { enumerable: true, get: function () { return database_ops_1.runAuthSeeding; } });
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,4BAA0B;AAE1B,uDAAqC;AAGrC,6DAA2C;AAC3C,8DAA4C;AAC5C,8DAA4C;AAC5C,oEAAkD;AAGlD,6DAA2C;AAC3C,8DAA4C;AAC5C,6DAA2C;AAC3C,6DAA2C;AAC3C,+DAA6C;AAC7C,sEAAoD;AACpD,qEAAmD;AAGnD,iEAA+C;AAC/C,kEAAgD;AAChD,iEAA+C;AAC/C,iEAA+C;AAC/C,mEAAiD;AACjD,0EAAwD;AACxD,0EAAwD;AACxD,yEAAuD;AAGvD,yEAAuD;AACvD,0EAAwD;AACxD,yEAAuD;AACvD,2EAAyD;AACzD,kFAAgE;AAChE,kFAAgE;AAChE,iFAA+D;AAG/D,6DAA2C;AAC3C,8DAA4C;AAC5C,6DAA2C;AAC3C,6DAA2C;AAC3C,+DAA6C;AAC7C,sEAAoD;AACpD,sEAAoD;AACpD,qEAAmD;AAGnD,mFAAiE;AACjE,oFAAkE;AAClE,mFAAiE;AACjE,mFAAiE;AACjE,qFAAmE;AACnE,4FAA0E;AAC1E,4FAA0E;AAC1E,2FAAyE;AAOzE,yEAAuD;AACvD,gFAA8D;AAC9D,gFAA8D;AAC9D,+EAA6D;AAG7D,mFAAiE;AACjE,oFAAkE;AAClE,mFAAiE;AACjE,mFAAiE;AACjE,qFAAmE;AACnE,4FAA0E;AAC1E,4FAA0E;AAC1E,2FAAyE;AAGzE,mEAAiD;AACjD,gEAA8C;AAC9C,4EAA0D;AAC1D,wEAAsD;AACtD,8EAA4D;AAG5D,8EAA4D;AAC5D,wEAAsD;AAGtD,yDAAuC;AACvC,sDAAoC;AACpC,wDAAsC;AACtC,2DAAyC;AACzC,iEAA+C;AAC/C,4DAA0C;AAC1C,2DAAyC;AACzC,uDAAqC;AACrC,oEAAkD;AAClD,6DAA2C;AAE3C,gEAAkE;AAAzD,qHAAA,kBAAkB,OAAA;AAG3B,mCAAoD;AAA3C,kHAAA,wBAAwB,OAAA;AAGjC,8DAA4D;AAAnD,yGAAA,UAAU,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,4BAA0B;AAE1B,uDAAqC;AAGrC,6DAA2C;AAC3C,8DAA4C;AAC5C,8DAA4C;AAC5C,oEAAkD;AAGlD,6DAA2C;AAC3C,8DAA4C;AAC5C,6DAA2C;AAC3C,6DAA2C;AAC3C,+DAA6C;AAC7C,sEAAoD;AACpD,qEAAmD;AAGnD,iEAA+C;AAC/C,kEAAgD;AAChD,iEAA+C;AAC/C,iEAA+C;AAC/C,mEAAiD;AACjD,0EAAwD;AACxD,0EAAwD;AACxD,yEAAuD;AAGvD,yEAAuD;AACvD,0EAAwD;AACxD,yEAAuD;AACvD,2EAAyD;AACzD,kFAAgE;AAChE,kFAAgE;AAChE,iFAA+D;AAG/D,6DAA2C;AAC3C,8DAA4C;AAC5C,6DAA2C;AAC3C,6DAA2C;AAC3C,+DAA6C;AAC7C,sEAAoD;AACpD,sEAAoD;AACpD,qEAAmD;AAGnD,mFAAiE;AACjE,oFAAkE;AAClE,mFAAiE;AACjE,mFAAiE;AACjE,qFAAmE;AACnE,4FAA0E;AAC1E,4FAA0E;AAC1E,2FAAyE;AAOzE,yEAAuD;AACvD,gFAA8D;AAC9D,gFAA8D;AAC9D,+EAA6D;AAG7D,mFAAiE;AACjE,oFAAkE;AAClE,mFAAiE;AACjE,mFAAiE;AACjE,qFAAmE;AACnE,4FAA0E;AAC1E,4FAA0E;AAC1E,2FAAyE;AAGzE,mEAAiD;AACjD,gEAA8C;AAC9C,4EAA0D;AAC1D,wEAAsD;AACtD,8EAA4D;AAG5D,8EAA4D;AAC5D,wEAAsD;AAGtD,yDAAuC;AACvC,sDAAoC;AACpC,wDAAsC;AACtC,2DAAyC;AACzC,iEAA+C;AAC/C,4DAA0C;AAC1C,2DAAyC;AACzC,uDAAqC;AACrC,oEAAkD;AAClD,6DAA2C;AAE3C,gEAAkE;AAAzD,qHAAA,kBAAkB,OAAA;AAG3B,mCAAoD;AAA3C,kHAAA,wBAAwB,OAAA;AAGjC,8DAA4D;AAAnD,yGAAA,UAAU,OAAA;AAEnB,wDAA4E;AAAnE,iHAAA,iBAAiB,OAAA;AAAE,8GAAA,cAAc,OAAA"}

package/dist/modules/app.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.module.js","sourceRoot":"","sources":["../../src/modules/app.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAAuD;AACvD,6CAAsE;AACtE,oDAAgD;AAChD,sCAAqD;AACrD,oDAA0C;AAC1C,oDAAgD;AAChD,oDAA0C;AAC1C,sEAA4D;AAE5D,qFAA0E;AAC1E,qFAA0E;AAC1E,0DAAsD;AACtD,0DAAsD;AACtD,oDAAgD;AAChD,sEAAkE;AAClE,qFAAgF;AAChF,qFAAgF;AAkCzE,IAAM,wBAAwB,gCAA9B,MAAM,wBAAwB;IACnC,MAAM,CAAC,OAAO,CAAC,OAA2B;QAExC,MAAM,aAAa,GAAyB;YAC1C,IAAI,EAAE,iCAAwB;YAC9B,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI;YAC3B,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI;YAC3B,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI;YAC/B,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ;YACnC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI;YAC/B,QAAQ,EAAE;gBACR,kBAAI;gBACJ,4BAAY;gBACZ,kBAAI;gBACJ,8BAAU;gBAEV,uCAAc;gBACd,uCAAc;aACf;YACD,WAAW,EAAE,KAAK;YAClB,GAAG,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK;YACjE,OAAO,EAAE,KAAK;YACd,qBAAqB,EAAE,KAAK;SAC7B,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC;QAC7C,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACrD,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC;QACjD,CAAC;QAED,OAAO;YACL,MAAM,EAAE,0BAAwB;YAChC,MAAM,EAAE,IAAI;YACZ,OAAO,EAAE;gBACP,uBAAa,CAAC,OAAO,CAAC,aAAa,CAAC;gBACpC,wBAAU;gBACV,wBAAU;gBACV,4BAAY;gBACZ,wBAAU;gBACV,oCAAgB;gBAEhB,6CAAoB;gBACpB,6CAAoB;aACrB;YACD,OAAO,EAAE;gBACP,uBAAa;gBACb,wBAAU;gBACV,wBAAU;gBACV,4BAAY;gBACZ,wBAAU;gBACV,oCAAgB;gBAEhB,6CAAoB;gBACpB,6CAAoB;aACrB;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AA5DY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,wBAAwB,CA4DpC"}
+{"version":3,"file":"app.module.js","sourceRoot":"","sources":["../../src/modules/app.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAAuD;AACvD,6CAAsE;AACtE,oDAAgD;AAChD,sCAAqD;AACrD,oDAA0C;AAC1C,oDAAgD;AAChD,oDAA0C;AAC1C,sEAA4D;AAC5D,qFAA0E;AAC1E,qFAA0E;AAC1E,0DAAsD;AACtD,0DAAsD;AACtD,oDAAgD;AAChD,sEAAkE;AAClE,qFAAgF;AAChF,qFAAgF;AAiCzE,IAAM,wBAAwB,gCAA9B,MAAM,wBAAwB;IACnC,MAAM,CAAC,OAAO,CAAC,OAA2B;QAExC,MAAM,aAAa,GAAyB;YAC1C,IAAI,EAAE,iCAAwB;YAC9B,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI;YAC3B,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI;YAC3B,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI;YAC/B,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ;YACnC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI;YAC/B,QAAQ,EAAE;gBACR,kBAAI;gBACJ,4BAAY;gBACZ,kBAAI;gBACJ,8BAAU;gBACV,uCAAc;gBACd,uCAAc;aACf;YACD,WAAW,EAAE,KAAK;YAClB,GAAG,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK;YACjE,OAAO,EAAE,KAAK;YACd,qBAAqB,EAAE,KAAK;SAC7B,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC;QAC7C,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACrD,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC;QACjD,CAAC;QAED,OAAO;YACL,MAAM,EAAE,0BAAwB;YAChC,MAAM,EAAE,IAAI;YACZ,OAAO,EAAE;gBACP,uBAAa,CAAC,OAAO,CAAC,aAAa,CAAC;gBACpC,wBAAU;gBACV,wBAAU;gBACV,4BAAY;gBACZ,wBAAU;gBACV,oCAAgB;gBAChB,6CAAoB;gBACpB,6CAAoB;aACrB;YACD,OAAO,EAAE;gBACP,uBAAa;gBACb,wBAAU;gBACV,wBAAU;gBACV,4BAAY;gBACZ,wBAAU;gBACV,oCAAgB;gBAChB,6CAAoB;gBACpB,6CAAoB;aACrB;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AAzDY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,wBAAwB,CAyDpC"}

package/dist/modules/role/dtos/create-role.dto.d.ts

@@ -1,5 +1,5 @@
 import { RoleDTO } from "./role.dto";
-declare const CreateRoleDTO_base: import("@nestjs/common").Type<Omit<RoleDTO, "id" | "createdAt" | "updatedAt" | "deletedAt" | "permissions">>;
+declare const CreateRoleDTO_base: import("@nestjs/common").Type<Omit<RoleDTO, "permissions" | "id" | "createdAt" | "updatedAt" | "deletedAt">>;
 export declare class CreateRoleDTO extends CreateRoleDTO_base {
     permissions: number[];
 }

package/dist/modules/user/dtos/create-user.dto.d.ts

@@ -1,5 +1,5 @@
 import { UserDTO } from "./user.dto";
-declare const CreateUserDTO_base: import("@nestjs/common").Type<Omit<UserDTO, "id" | "createdAt" | "updatedAt" | "deletedAt" | "roles">>;
+declare const CreateUserDTO_base: import("@nestjs/common").Type<Omit<UserDTO, "roles" | "id" | "createdAt" | "updatedAt" | "deletedAt">>;
 export declare class CreateUserDTO extends CreateUserDTO_base {
     roles: number[];
 }

package/dist/modules/user/dtos/user.dto.d.ts

@@ -5,6 +5,11 @@ export declare class UserDTO extends BaseDTO {
     email?: string;
     password?: string;
     username?: string;
+    name?: string;
+    shortName?: string;
+    phone?: string;
+    emailEvara?: string;
+    emailPrivate?: string;
     activated?: boolean;
     imageUrl?: string;
     resetPasswordRequest?: boolean;

package/dist/modules/user/dtos/user.dto.js

@@ -43,6 +43,56 @@ __decorate([
     (0, class_validator_1.IsNotEmpty)(),
     __metadata("design:type", String)
 ], UserDTO.prototype, "username", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({
+        example: "John Doe",
+        description: "Full name",
+        required: false,
+    }),
+    (0, class_validator_1.IsString)(),
+    (0, class_validator_1.IsOptional)(),
+    __metadata("design:type", String)
+], UserDTO.prototype, "name", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({
+        example: "JD",
+        description: "Short name",
+        required: false,
+    }),
+    (0, class_validator_1.IsString)(),
+    (0, class_validator_1.IsOptional)(),
+    __metadata("design:type", String)
+], UserDTO.prototype, "shortName", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({
+        example: "+1234567890",
+        description: "Phone number",
+        required: false,
+    }),
+    (0, class_validator_1.IsString)(),
+    (0, class_validator_1.IsOptional)(),
+    __metadata("design:type", String)
+], UserDTO.prototype, "phone", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({
+        example: "email@domain.com",
+        description: "Evara email",
+        required: false,
+    }),
+    (0, class_validator_1.IsString)(),
+    (0, class_validator_1.IsOptional)(),
+    __metadata("design:type", String)
+], UserDTO.prototype, "emailEvara", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({
+        example: "email@domain.com",
+        description: "Evara email",
+        required: false,
+    }),
+    (0, class_validator_1.IsString)(),
+    (0, class_validator_1.IsOptional)(),
+    __metadata("design:type", String)
+], UserDTO.prototype, "emailPrivate", void 0);
 __decorate([
     (0, swagger_1.ApiProperty)({
         example: 1,

package/dist/modules/user/dtos/user.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.dto.js","sourceRoot":"","sources":["../../../../src/modules/user/dtos/user.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8C;AAC9C,qDAAgE;AAChE,yDAA4C;AAC5C,2DAAuD;AAOvD,MAAa,OAAQ,SAAQ,kBAAO;CAgDnC;AAhDD,0BAgDC;AAvCC;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;AAOlB;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"}
+{"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"}

package/dist/modules/user/user.entity.d.ts

@@ -2,6 +2,11 @@ import "reflect-metadata";
 import { BaseEntity } from "../../core/utils/base.entity";
 import { Role } from "../role/role.entity";
 export declare class User extends BaseEntity {
+    name?: string;
+    shortName?: string;
+    phone?: string;
+    emailEvara?: string;
+    emailPrivate?: string;
     email?: string;
     password?: string;
     username?: string;

package/dist/modules/user/user.entity.js

@@ -23,6 +23,26 @@ let User = class User extends base_entity_1.BaseEntity {
     }
 };
 exports.User = User;
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", nullable: false }),
+    __metadata("design:type", String)
+], User.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", nullable: true }),
+    __metadata("design:type", String)
+], User.prototype, "shortName", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", nullable: true }),
+    __metadata("design:type", String)
+], User.prototype, "phone", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: "email_evara", type: "varchar", nullable: true }),
+    __metadata("design:type", String)
+], User.prototype, "emailEvara", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: "email_private", type: "varchar", nullable: true }),
+    __metadata("design:type", String)
+], User.prototype, "emailPrivate", void 0);
 __decorate([
     (0, typeorm_1.Column)({ unique: true, type: "varchar", nullable: false }),
     __metadata("design:type", String)

package/dist/modules/user/user.entity.js.map

@@ -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;;QAYL,cAAS,GAAa,KAAK,CAAC;QAM5B,yBAAoB,GAAa,KAAK,CAAC;IASzC,CAAC;CAAA,CAAA;AA3BY,oBAAI;AAEf;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;eA1BJ,IAAI;IADhB,IAAA,gBAAM,EAAC,OAAO,CAAC;GACH,IAAI,CA2BhB"}
+{"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"}

package/dist/modules/user/user.mapper.js

@@ -13,6 +13,11 @@ const allowedUserDtoKeys = [
     "activated",
     "imageUrl",
     "roles",
+    "name",
+    "shortName",
+    "emailEvara",
+    "emailPrivate",
+    "phone",
     "resetPasswordRequest",
 ];
 function mapUserToUserDtoSelective(userOrUsers, keys) {
@@ -40,6 +45,11 @@ const mapCreateUserDtoToEntity = (dto) => {
     user.activated = dto.activated ?? false;
     user.imageUrl = dto.imageUrl;
     user.password = dto.password;
+    user.emailEvara = dto.emailEvara;
+    user.emailPrivate = dto.emailPrivate;
+    user.name = dto.name;
+    user.shortName = dto.shortName;
+    user.phone = dto.phone;
     user.resetPasswordRequest = dto.resetPasswordRequest ?? false;
     if (dto.roles?.length) {
         user.roles = dto.roles.map((roleId) => {
@@ -60,6 +70,16 @@ const mapUpdateUserDtoToEntity = (dto, user) => {
         user.activated = dto.activated;
     if (dto.imageUrl !== undefined)
         user.imageUrl = dto.imageUrl;
+    if (dto.emailEvara !== undefined)
+        user.emailEvara = dto.emailEvara;
+    if (dto.emailPrivate !== undefined)
+        user.emailPrivate = dto.emailPrivate;
+    if (dto.name !== undefined)
+        user.name = dto.name;
+    if (dto.shortName !== undefined)
+        user.shortName = dto.shortName;
+    if (dto.phone !== undefined)
+        user.phone = dto.phone;
     if (dto.resetPasswordRequest !== undefined)
         user.resetPasswordRequest = dto.resetPasswordRequest;
     if (dto.password !== undefined && dto.password !== null)

package/dist/modules/user/user.mapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.mapper.js","sourceRoot":"","sources":["../../../src/modules/user/user.mapper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"user.mapper.js","sourceRoot":"","sources":["../../../src/modules/user/user.mapper.ts"],"names":[],"mappings":"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"}