@neohm/nestend 2.0.4 → 3.0.0
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/README.md +77 -28
- package/dist/admin/controllers/admin.user.controller.d.ts +1 -1
- package/dist/admin/controllers/admin.user.controller.js +4 -4
- package/dist/admin/controllers/admin.user.controller.js.map +1 -1
- package/dist/admin/dtos/add.admin.user.dto.d.ts +6 -2
- package/dist/admin/dtos/add.admin.user.dto.d.ts.map +1 -1
- package/dist/admin/dtos/add.admin.user.dto.js +33 -3
- package/dist/admin/dtos/add.admin.user.dto.js.map +1 -1
- package/dist/admin/dtos/base.user.dto.d.ts +0 -1
- package/dist/admin/dtos/base.user.dto.d.ts.map +1 -1
- package/dist/admin/dtos/base.user.dto.js +0 -11
- package/dist/admin/dtos/base.user.dto.js.map +1 -1
- package/dist/admin/es6.classes.d.ts +2 -1
- package/dist/admin/es6.classes.d.ts.map +1 -1
- package/dist/admin/es6.classes.js +24 -3
- package/dist/admin/es6.classes.js.map +1 -1
- package/dist/admin/libraries/admin.user.data.processor.d.ts +11 -4
- package/dist/admin/libraries/admin.user.data.processor.d.ts.map +1 -1
- package/dist/admin/libraries/admin.user.data.processor.js +55 -17
- package/dist/admin/libraries/admin.user.data.processor.js.map +1 -1
- package/dist/admin/libraries/bulk.user.data.processor.d.ts +1 -1
- package/dist/admin/libraries/bulk.user.data.processor.d.ts.map +1 -1
- package/dist/admin/libraries/bulk.user.data.processor.js +2 -13
- package/dist/admin/libraries/bulk.user.data.processor.js.map +1 -1
- package/dist/admin/libraries/client.user.data.processor.d.ts +1 -1
- package/dist/admin/libraries/client.user.data.processor.d.ts.map +1 -1
- package/dist/admin/libraries/client.user.data.processor.js +2 -6
- package/dist/admin/libraries/client.user.data.processor.js.map +1 -1
- package/dist/admin/libraries/scheduled.task.data.processor.d.ts +3 -3
- package/dist/admin/libraries/scheduled.task.data.processor.d.ts.map +1 -1
- package/dist/admin/libraries/scheduled.task.data.processor.js.map +1 -1
- package/dist/admin/libraries/tenant.data.processor.d.ts +2 -2
- package/dist/admin/libraries/tenant.data.processor.d.ts.map +1 -1
- package/dist/admin/libraries/tenant.data.processor.js.map +1 -1
- package/dist/admin/libraries/user.data.processor.d.ts +0 -11
- package/dist/admin/libraries/user.data.processor.d.ts.map +1 -1
- package/dist/admin/libraries/user.data.processor.js +0 -44
- package/dist/admin/libraries/user.data.processor.js.map +1 -1
- package/dist/admin/services/admin.access.service.d.ts +8 -8
- package/dist/admin/services/admin.access.service.d.ts.map +1 -1
- package/dist/admin/services/admin.access.service.js +8 -8
- package/dist/admin/services/admin.access.service.js.map +1 -1
- package/dist/auth/auth.module.d.ts.map +1 -1
- package/dist/auth/auth.module.js +17 -5
- package/dist/auth/auth.module.js.map +1 -1
- package/dist/auth/controllers/admin.auth.controller.d.ts +20 -0
- package/dist/auth/controllers/admin.auth.controller.d.ts.map +1 -0
- package/dist/auth/controllers/admin.auth.controller.js +95 -0
- package/dist/auth/controllers/admin.auth.controller.js.map +1 -0
- package/dist/auth/controllers/auth.controller.d.ts.map +1 -1
- package/dist/auth/controllers/auth.controller.js +7 -4
- package/dist/auth/controllers/auth.controller.js.map +1 -1
- package/dist/auth/dtos/admin.login.dto.d.ts +5 -0
- package/dist/auth/dtos/admin.login.dto.d.ts.map +1 -0
- package/dist/auth/dtos/admin.login.dto.js +30 -0
- package/dist/auth/dtos/admin.login.dto.js.map +1 -0
- package/dist/auth/entities/admin.user.entity.d.ts +11 -0
- package/dist/auth/entities/admin.user.entity.d.ts.map +1 -0
- package/dist/auth/entities/admin.user.entity.js +47 -0
- package/dist/auth/entities/admin.user.entity.js.map +1 -0
- package/dist/auth/entities/api.key.entity.d.ts +2 -2
- package/dist/auth/entities/api.key.entity.d.ts.map +1 -1
- package/dist/auth/entities/api.key.entity.js +2 -2
- package/dist/auth/entities/api.key.entity.js.map +1 -1
- package/dist/auth/entities/api.scope.entity.d.ts +13 -0
- package/dist/auth/entities/api.scope.entity.d.ts.map +1 -0
- package/dist/auth/entities/api.scope.entity.js +51 -0
- package/dist/auth/entities/api.scope.entity.js.map +1 -0
- package/dist/auth/entities/scope.entity.d.ts +7 -0
- package/dist/auth/entities/scope.entity.d.ts.map +1 -0
- package/dist/auth/entities/scope.entity.js +34 -0
- package/dist/auth/entities/scope.entity.js.map +1 -0
- package/dist/auth/entities/system.admin.role.entity.d.ts +11 -0
- package/dist/auth/entities/system.admin.role.entity.d.ts.map +1 -0
- package/dist/auth/entities/system.admin.role.entity.js +46 -0
- package/dist/auth/entities/system.admin.role.entity.js.map +1 -0
- package/dist/auth/entities/system.admin.user.role.entity.d.ts +10 -0
- package/dist/auth/entities/system.admin.user.role.entity.d.ts.map +1 -0
- package/dist/auth/entities/system.admin.user.role.entity.js +41 -0
- package/dist/auth/entities/system.admin.user.role.entity.js.map +1 -0
- package/dist/auth/entities/system.auth.session.entity.d.ts +9 -0
- package/dist/auth/entities/system.auth.session.entity.d.ts.map +1 -0
- package/dist/auth/entities/system.auth.session.entity.js +42 -0
- package/dist/auth/entities/system.auth.session.entity.js.map +1 -0
- package/dist/auth/entities/system.refresh.token.entity.d.ts +1 -0
- package/dist/auth/entities/system.refresh.token.entity.d.ts.map +1 -1
- package/dist/auth/entities/system.refresh.token.entity.js +4 -0
- package/dist/auth/entities/system.refresh.token.entity.js.map +1 -1
- package/dist/auth/entities/system.role.entity.d.ts +3 -4
- package/dist/auth/entities/system.role.entity.d.ts.map +1 -1
- package/dist/auth/entities/system.role.entity.js +5 -8
- package/dist/auth/entities/system.role.entity.js.map +1 -1
- package/dist/auth/es6.classes.d.ts +6 -4
- package/dist/auth/es6.classes.d.ts.map +1 -1
- package/dist/auth/es6.classes.js +32 -6
- package/dist/auth/es6.classes.js.map +1 -1
- package/dist/auth/helpers/admin.auth.d.ts +6 -0
- package/dist/auth/helpers/admin.auth.d.ts.map +1 -0
- package/dist/auth/helpers/admin.auth.js +29 -0
- package/dist/auth/helpers/admin.auth.js.map +1 -0
- package/dist/auth/helpers/api.key.context.d.ts +6 -0
- package/dist/auth/helpers/api.key.context.d.ts.map +1 -0
- package/dist/auth/helpers/api.key.context.js +15 -0
- package/dist/auth/helpers/api.key.context.js.map +1 -0
- package/dist/auth/helpers/auth.d.ts +6 -0
- package/dist/auth/helpers/auth.d.ts.map +1 -0
- package/dist/auth/helpers/auth.js +27 -0
- package/dist/auth/helpers/auth.js.map +1 -0
- package/dist/auth/middlewares/admin.jwt.middleware.d.ts +10 -0
- package/dist/auth/middlewares/admin.jwt.middleware.d.ts.map +1 -0
- package/dist/auth/middlewares/admin.jwt.middleware.js +59 -0
- package/dist/auth/middlewares/admin.jwt.middleware.js.map +1 -0
- package/dist/auth/middlewares/api.key.middleware.d.ts +10 -0
- package/dist/auth/middlewares/api.key.middleware.d.ts.map +1 -0
- package/dist/auth/middlewares/api.key.middleware.js +47 -0
- package/dist/auth/middlewares/api.key.middleware.js.map +1 -0
- package/dist/auth/middlewares/jwt.middleware.d.ts +10 -0
- package/dist/auth/middlewares/jwt.middleware.d.ts.map +1 -0
- package/dist/auth/middlewares/jwt.middleware.js +59 -0
- package/dist/auth/middlewares/jwt.middleware.js.map +1 -0
- package/dist/auth/services/admin.auth.service.d.ts +19 -0
- package/dist/auth/services/admin.auth.service.d.ts.map +1 -0
- package/dist/auth/services/admin.auth.service.js +160 -0
- package/dist/auth/services/admin.auth.service.js.map +1 -0
- package/dist/auth/services/auth.service.d.ts +4 -5
- package/dist/auth/services/auth.service.d.ts.map +1 -1
- package/dist/auth/services/auth.service.js +41 -35
- package/dist/auth/services/auth.service.js.map +1 -1
- package/dist/auth/types/auth.types.d.ts +7 -4
- package/dist/auth/types/auth.types.d.ts.map +1 -1
- package/dist/common/consumers/job.consumer.d.ts +1 -0
- package/dist/common/consumers/job.consumer.d.ts.map +1 -1
- package/dist/common/consumers/job.consumer.js +7 -2
- package/dist/common/consumers/job.consumer.js.map +1 -1
- package/dist/common/controllers/common.controller.js +1 -1
- package/dist/common/controllers/common.controller.js.map +1 -1
- package/dist/common/entities/common.admin.entity.d.ts +7 -0
- package/dist/common/entities/common.admin.entity.d.ts.map +1 -0
- package/dist/common/entities/common.admin.entity.js +28 -0
- package/dist/common/entities/common.admin.entity.js.map +1 -0
- package/dist/common/entities/root.entity.d.ts.map +1 -1
- package/dist/common/entities/root.entity.js +11 -2
- package/dist/common/entities/root.entity.js.map +1 -1
- package/dist/constants/entity.constants.d.ts +6 -0
- package/dist/constants/entity.constants.d.ts.map +1 -1
- package/dist/constants/entity.constants.js +6 -0
- package/dist/constants/entity.constants.js.map +1 -1
- package/dist/constants/entity.maps.d.ts +12 -0
- package/dist/constants/entity.maps.d.ts.map +1 -1
- package/dist/constants/entity.maps.js +12 -0
- package/dist/constants/entity.maps.js.map +1 -1
- package/dist/global/filters/global.exception.filter.d.ts.map +1 -1
- package/dist/global/filters/global.exception.filter.js +6 -2
- package/dist/global/filters/global.exception.filter.js.map +1 -1
- package/dist/global/utilities/migration.utility.d.ts +4 -0
- package/dist/global/utilities/migration.utility.d.ts.map +1 -1
- package/dist/global/utilities/migration.utility.js +70 -8
- package/dist/global/utilities/migration.utility.js.map +1 -1
- package/dist/index.d.ts +26 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +55 -8
- package/dist/index.js.map +1 -1
- package/dist/migrations/1749600000003.CreateSysRolesTable.d.ts.map +1 -1
- package/dist/migrations/1749600000003.CreateSysRolesTable.js +3 -4
- package/dist/migrations/1749600000003.CreateSysRolesTable.js.map +1 -1
- package/dist/migrations/1749600000021.CreateSysAdminUsersTable.d.ts +6 -0
- package/dist/migrations/1749600000021.CreateSysAdminUsersTable.d.ts.map +1 -0
- package/dist/migrations/1749600000021.CreateSysAdminUsersTable.js +23 -0
- package/dist/migrations/1749600000021.CreateSysAdminUsersTable.js.map +1 -0
- package/dist/migrations/1749600000022.CreateSysAdminRolesTable.d.ts +6 -0
- package/dist/migrations/1749600000022.CreateSysAdminRolesTable.d.ts.map +1 -0
- package/dist/migrations/1749600000022.CreateSysAdminRolesTable.js +21 -0
- package/dist/migrations/1749600000022.CreateSysAdminRolesTable.js.map +1 -0
- package/dist/migrations/1749600000023.CreateSysAdminUserRolesJoinTable.d.ts +6 -0
- package/dist/migrations/1749600000023.CreateSysAdminUserRolesJoinTable.d.ts.map +1 -0
- package/dist/migrations/1749600000023.CreateSysAdminUserRolesJoinTable.js +34 -0
- package/dist/migrations/1749600000023.CreateSysAdminUserRolesJoinTable.js.map +1 -0
- package/dist/migrations/1749600000024.CreateSysAuthSessionsTable.d.ts +6 -0
- package/dist/migrations/1749600000024.CreateSysAuthSessionsTable.d.ts.map +1 -0
- package/dist/migrations/1749600000024.CreateSysAuthSessionsTable.js +22 -0
- package/dist/migrations/1749600000024.CreateSysAuthSessionsTable.js.map +1 -0
- package/dist/migrations/1749600000025.CreateSysScopesTable.d.ts +6 -0
- package/dist/migrations/1749600000025.CreateSysScopesTable.d.ts.map +1 -0
- package/dist/migrations/1749600000025.CreateSysScopesTable.js +25 -0
- package/dist/migrations/1749600000025.CreateSysScopesTable.js.map +1 -0
- package/dist/migrations/1749600000026.CreateSysApiScopesTable.d.ts +6 -0
- package/dist/migrations/1749600000026.CreateSysApiScopesTable.d.ts.map +1 -0
- package/dist/migrations/1749600000026.CreateSysApiScopesTable.js +39 -0
- package/dist/migrations/1749600000026.CreateSysApiScopesTable.js.map +1 -0
- package/dist/migrations/1749600000027.RetargetSysApiKeysCreatedByToAdminUsers.d.ts +8 -0
- package/dist/migrations/1749600000027.RetargetSysApiKeysCreatedByToAdminUsers.d.ts.map +1 -0
- package/dist/migrations/1749600000027.RetargetSysApiKeysCreatedByToAdminUsers.js +31 -0
- package/dist/migrations/1749600000027.RetargetSysApiKeysCreatedByToAdminUsers.js.map +1 -0
- package/dist/migrations/1749600000028.RetargetSysTenantsCreatedByToAdminUsers.d.ts +8 -0
- package/dist/migrations/1749600000028.RetargetSysTenantsCreatedByToAdminUsers.d.ts.map +1 -0
- package/dist/migrations/1749600000028.RetargetSysTenantsCreatedByToAdminUsers.js +31 -0
- package/dist/migrations/1749600000028.RetargetSysTenantsCreatedByToAdminUsers.js.map +1 -0
- package/dist/migrations/1749600000029.AddIsAdminToSysRefreshTokensTable.d.ts +7 -0
- package/dist/migrations/1749600000029.AddIsAdminToSysRefreshTokensTable.d.ts.map +1 -0
- package/dist/migrations/1749600000029.AddIsAdminToSysRefreshTokensTable.js +31 -0
- package/dist/migrations/1749600000029.AddIsAdminToSysRefreshTokensTable.js.map +1 -0
- package/dist/tenant/entities/tenant.entity.d.ts +2 -3
- package/dist/tenant/entities/tenant.entity.d.ts.map +1 -1
- package/dist/tenant/entities/tenant.entity.js +2 -6
- package/dist/tenant/entities/tenant.entity.js.map +1 -1
- package/package.json +1 -1
- package/dist/auth/middlewares/auth.context.middleware.d.ts +0 -10
- package/dist/auth/middlewares/auth.context.middleware.d.ts.map +0 -1
- package/dist/auth/middlewares/auth.context.middleware.js +0 -37
- package/dist/auth/middlewares/auth.context.middleware.js.map +0 -1
- package/dist/auth/services/auth.context.service.d.ts +0 -9
- package/dist/auth/services/auth.context.service.d.ts.map +0 -1
- package/dist/auth/services/auth.context.service.js +0 -33
- package/dist/auth/services/auth.context.service.js.map +0 -1
|
@@ -3,22 +3,21 @@ import { DataSource } from 'typeorm';
|
|
|
3
3
|
import { UserEntity } from '../entities/user.entity';
|
|
4
4
|
import { CacheService } from '../../common/services/cache.service';
|
|
5
5
|
import { AuthenticatedAccess, AuthTokenPair, IssueTokensUser, TokenIssueContext } from '../types/auth.types';
|
|
6
|
-
import { AuthContextService } from './auth.context.service';
|
|
7
6
|
export declare class AuthService {
|
|
8
7
|
private readonly jwtService;
|
|
9
8
|
private readonly cacheService;
|
|
10
9
|
private readonly dataSource;
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
constructor(jwtService: JwtService, cacheService: CacheService, dataSource: DataSource, authContextService: AuthContextService);
|
|
14
|
-
validateAccess(): Promise<AuthenticatedAccess>;
|
|
10
|
+
constructor(jwtService: JwtService, cacheService: CacheService, dataSource: DataSource);
|
|
11
|
+
validateRole(roleIdentifier?: string): Promise<AuthenticatedAccess>;
|
|
15
12
|
validateCredentials(email: string, password: string): Promise<UserEntity>;
|
|
16
13
|
issueTokens(user: IssueTokensUser, context?: TokenIssueContext): Promise<AuthTokenPair>;
|
|
17
14
|
refresh(rawRefreshToken: string, context?: TokenIssueContext): Promise<AuthTokenPair>;
|
|
18
15
|
revokeAllForUser(userUuid: string): Promise<void>;
|
|
19
16
|
revokeOne(rawRefreshToken: string): Promise<void>;
|
|
20
17
|
revokeAccessToken(jti: string, ttlSeconds: number): Promise<void>;
|
|
18
|
+
logout(rawRefreshToken: string): Promise<void>;
|
|
21
19
|
private hashToken;
|
|
22
20
|
private get refreshTokenRepo();
|
|
21
|
+
private get sessionRepo();
|
|
23
22
|
}
|
|
24
23
|
//# sourceMappingURL=auth.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/auth.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,EAAsB,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/auth.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,EAAsB,MAAM,SAAS,CAAC;AAIzD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAEnE,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,eAAe,EACf,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAI7B,qBACa,WAAW;IAEpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAFV,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,UAAU;IAYnC,YAAY,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;IA+BnE,mBAAmB,CACvB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,UAAU,CAAC;IAuBhB,WAAW,CACf,IAAI,EAAE,eAAe,EACrB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,aAAa,CAAC;IAuDnB,OAAO,CACX,eAAe,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,aAAa,CAAC;IAgCnB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASjD,SAAS,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUjD,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjE,MAAM,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYpD,OAAO,CAAC,SAAS;IAIjB,OAAO,KAAK,gBAAgB,GAE3B;IAED,OAAO,KAAK,WAAW,GAEtB;CACF"}
|
|
@@ -8,7 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
-
var AuthService_1;
|
|
12
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
12
|
exports.AuthService = void 0;
|
|
14
13
|
const common_1 = require("@nestjs/common");
|
|
@@ -16,47 +15,35 @@ const jwt_1 = require("@nestjs/jwt");
|
|
|
16
15
|
const typeorm_1 = require("typeorm");
|
|
17
16
|
const crypto_1 = require("crypto");
|
|
18
17
|
const system_refresh_token_entity_1 = require("../entities/system.refresh.token.entity");
|
|
18
|
+
const system_auth_session_entity_1 = require("../entities/system.auth.session.entity");
|
|
19
19
|
const user_entity_1 = require("../entities/user.entity");
|
|
20
|
+
const user_role_entity_1 = require("../entities/user.role.entity");
|
|
20
21
|
const cache_service_1 = require("../../common/services/cache.service");
|
|
21
22
|
const access_exception_1 = require("../../global/exceptions/access.exception");
|
|
22
|
-
const
|
|
23
|
+
const auth_1 = require("../helpers/auth");
|
|
23
24
|
const auth_utilities_1 = require("../utilities/auth.utilities");
|
|
24
|
-
let AuthService =
|
|
25
|
-
constructor(jwtService, cacheService, dataSource
|
|
25
|
+
let AuthService = class AuthService {
|
|
26
|
+
constructor(jwtService, cacheService, dataSource) {
|
|
26
27
|
this.jwtService = jwtService;
|
|
27
28
|
this.cacheService = cacheService;
|
|
28
29
|
this.dataSource = dataSource;
|
|
29
|
-
this.authContextService = authContextService;
|
|
30
|
-
this.logger = new common_1.Logger(AuthService_1.name);
|
|
31
30
|
}
|
|
32
|
-
async
|
|
33
|
-
const
|
|
34
|
-
if (!token)
|
|
35
|
-
throw new access_exception_1.AccessException('Authentication required: no access token.');
|
|
36
|
-
let payload;
|
|
37
|
-
try {
|
|
38
|
-
payload = await this.jwtService.verifyAsync(token, {
|
|
39
|
-
secret: process.env.ACCESS_TOKEN_SECRET,
|
|
40
|
-
});
|
|
41
|
-
}
|
|
42
|
-
catch {
|
|
43
|
-
throw new access_exception_1.AccessException('Invalid or expired access token.');
|
|
44
|
-
}
|
|
45
|
-
if (payload.jti) {
|
|
46
|
-
const revoked = await this.cacheService.getRaw(`blocklist:${payload.jti}`);
|
|
47
|
-
if (revoked)
|
|
48
|
-
throw new access_exception_1.AccessException('Access token has been revoked.');
|
|
49
|
-
}
|
|
50
|
-
const user = await user_entity_1.UserEntity.findOne({
|
|
51
|
-
where: { id: payload.sub },
|
|
52
|
-
relations: { userRoles: { role: true } },
|
|
53
|
-
});
|
|
31
|
+
async validateRole(roleIdentifier) {
|
|
32
|
+
const user = auth_1.Auth.user();
|
|
54
33
|
if (!user)
|
|
55
|
-
throw new access_exception_1.AccessException('
|
|
56
|
-
const
|
|
34
|
+
throw new access_exception_1.AccessException('Authentication required: no active session.');
|
|
35
|
+
const userRoles = await user_role_entity_1.UserRoleEntity.find({
|
|
36
|
+
where: { user_id: user.id },
|
|
37
|
+
relations: { role: true },
|
|
38
|
+
});
|
|
39
|
+
const roles = userRoles
|
|
57
40
|
.map((userRole) => userRole.role)
|
|
58
41
|
.filter((role) => !!role);
|
|
59
|
-
|
|
42
|
+
if (roleIdentifier &&
|
|
43
|
+
!roles.some((role) => role.identifier === roleIdentifier)) {
|
|
44
|
+
throw new access_exception_1.AccessException(`This action requires the "${roleIdentifier}" role.`);
|
|
45
|
+
}
|
|
46
|
+
return { user, roles };
|
|
60
47
|
}
|
|
61
48
|
async validateCredentials(email, password) {
|
|
62
49
|
const user = await this.dataSource
|
|
@@ -82,7 +69,16 @@ let AuthService = AuthService_1 = class AuthService {
|
|
|
82
69
|
const jti = (0, crypto_1.randomUUID)();
|
|
83
70
|
const accessExpiry = process.env.ACCESS_TOKEN_EXPIRY;
|
|
84
71
|
const refreshExpiry = process.env.REFRESH_TOKEN_EXPIRY;
|
|
85
|
-
const
|
|
72
|
+
const sessionIdentifier = this.hashToken(`${Date.now()}:${user.id}`);
|
|
73
|
+
const sessionExpiresAt = new Date(Date.now() + auth_utilities_1.AuthUtility.parseExpiryMs(accessExpiry));
|
|
74
|
+
await this.sessionRepo.save(this.sessionRepo.create({
|
|
75
|
+
user_id: user.id,
|
|
76
|
+
is_admin: false,
|
|
77
|
+
session_identifier: sessionIdentifier,
|
|
78
|
+
expires_at: sessionExpiresAt,
|
|
79
|
+
invalidated_at: null,
|
|
80
|
+
}));
|
|
81
|
+
const accessToken = await this.jwtService.signAsync({ sub: user.id, email: user.email, jti, sid: sessionIdentifier }, {
|
|
86
82
|
secret: process.env.ACCESS_TOKEN_SECRET,
|
|
87
83
|
expiresIn: accessExpiry,
|
|
88
84
|
});
|
|
@@ -94,6 +90,7 @@ let AuthService = AuthService_1 = class AuthService {
|
|
|
94
90
|
const expiresAt = new Date(Date.now() + auth_utilities_1.AuthUtility.parseExpiryMs(refreshExpiry));
|
|
95
91
|
await this.refreshTokenRepo.save(this.refreshTokenRepo.create({
|
|
96
92
|
user_id: user.id,
|
|
93
|
+
is_admin: false,
|
|
97
94
|
token_hash: tokenHash,
|
|
98
95
|
expires_at: expiresAt,
|
|
99
96
|
revoked_at: null,
|
|
@@ -148,19 +145,28 @@ let AuthService = AuthService_1 = class AuthService {
|
|
|
148
145
|
async revokeAccessToken(jti, ttlSeconds) {
|
|
149
146
|
await this.cacheService.setRaw(`blocklist:${jti}`, '1', ttlSeconds);
|
|
150
147
|
}
|
|
148
|
+
async logout(rawRefreshToken) {
|
|
149
|
+
await this.revokeOne(rawRefreshToken);
|
|
150
|
+
const sessionIdentifier = auth_1.Auth.session();
|
|
151
|
+
if (sessionIdentifier) {
|
|
152
|
+
await this.sessionRepo.update({ session_identifier: sessionIdentifier, is_admin: false }, { invalidated_at: new Date() });
|
|
153
|
+
}
|
|
154
|
+
}
|
|
151
155
|
hashToken(token) {
|
|
152
156
|
return (0, crypto_1.createHash)('sha256').update(token).digest('hex');
|
|
153
157
|
}
|
|
154
158
|
get refreshTokenRepo() {
|
|
155
159
|
return this.dataSource.getRepository(system_refresh_token_entity_1.SystemRefreshTokenEntity);
|
|
156
160
|
}
|
|
161
|
+
get sessionRepo() {
|
|
162
|
+
return this.dataSource.getRepository(system_auth_session_entity_1.SystemAuthSessionEntity);
|
|
163
|
+
}
|
|
157
164
|
};
|
|
158
165
|
exports.AuthService = AuthService;
|
|
159
|
-
exports.AuthService = AuthService =
|
|
166
|
+
exports.AuthService = AuthService = __decorate([
|
|
160
167
|
(0, common_1.Injectable)(),
|
|
161
168
|
__metadata("design:paramtypes", [jwt_1.JwtService,
|
|
162
169
|
cache_service_1.CacheService,
|
|
163
|
-
typeorm_1.DataSource
|
|
164
|
-
auth_context_service_1.AuthContextService])
|
|
170
|
+
typeorm_1.DataSource])
|
|
165
171
|
], AuthService);
|
|
166
172
|
//# sourceMappingURL=auth.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../src/auth/services/auth.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../src/auth/services/auth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,21 +1,24 @@
|
|
|
1
1
|
import type { UserEntity } from '../entities/user.entity';
|
|
2
2
|
import type { SystemRoleEntity } from '../entities/system.role.entity';
|
|
3
|
+
import type { AdminUserEntity } from '../entities/admin.user.entity';
|
|
4
|
+
import type { SystemAdminRoleEntity } from '../entities/system.admin.role.entity';
|
|
3
5
|
export interface RequestUser {
|
|
4
6
|
userId: string;
|
|
5
7
|
email: string;
|
|
6
8
|
}
|
|
7
|
-
export interface AuthContext {
|
|
8
|
-
token?: string;
|
|
9
|
-
}
|
|
10
9
|
export interface AuthenticatedAccess {
|
|
11
10
|
user: UserEntity;
|
|
12
11
|
roles: SystemRoleEntity[];
|
|
13
|
-
|
|
12
|
+
}
|
|
13
|
+
export interface AdminAuthenticatedAccess {
|
|
14
|
+
user: AdminUserEntity;
|
|
15
|
+
roles: SystemAdminRoleEntity[];
|
|
14
16
|
}
|
|
15
17
|
export interface JwtPayload {
|
|
16
18
|
sub: string;
|
|
17
19
|
email: string;
|
|
18
20
|
jti?: string;
|
|
21
|
+
sid?: string;
|
|
19
22
|
iat?: number;
|
|
20
23
|
exp?: number;
|
|
21
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.types.d.ts","sourceRoot":"","sources":["../../../src/auth/types/auth.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.types.d.ts","sourceRoot":"","sources":["../../../src/auth/types/auth.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAElF,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf;AAGD,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,gBAAgB,EAAE,CAAC;CAC3B;AAGD,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,eAAe,CAAC;IACtB,KAAK,EAAE,qBAAqB,EAAE,CAAC;CAChC;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB"}
|
|
@@ -19,6 +19,7 @@ export declare class JobConsumer extends WorkerHost implements OnApplicationBoot
|
|
|
19
19
|
private enrolScheduledEventDriver;
|
|
20
20
|
private persistFinalFailure;
|
|
21
21
|
private persistFailure;
|
|
22
|
+
private elapsed;
|
|
22
23
|
private jobName;
|
|
23
24
|
}
|
|
24
25
|
//# sourceMappingURL=job.consumer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job.consumer.d.ts","sourceRoot":"","sources":["../../../src/common/consumers/job.consumer.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAU,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAyBzD,qBAIa,WAAY,SAAQ,UAAW,YAAW,sBAAsB;IAG/D,OAAO,CAAC,QAAQ,CAAC,YAAY;IAFzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA6B;gBAEvB,YAAY,EAAE,YAAY;IASjD,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAavC,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAsBrC,OAAO,CAAC,SAAS;YAUH,aAAa;IAmC3B,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;IAMxB,WAAW,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"job.consumer.d.ts","sourceRoot":"","sources":["../../../src/common/consumers/job.consumer.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAU,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAyBzD,qBAIa,WAAY,SAAQ,UAAW,YAAW,sBAAsB;IAG/D,OAAO,CAAC,QAAQ,CAAC,YAAY;IAFzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA6B;gBAEvB,YAAY,EAAE,YAAY;IASjD,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAavC,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAsBrC,OAAO,CAAC,SAAS;YAUH,aAAa;IAmC3B,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;IAMxB,WAAW,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;IAYrB,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAavC,QAAQ,IAAI,IAAI;IAKhB,SAAS,IAAI,IAAI;IAKjB,OAAO,IAAI,IAAI;YAUD,yBAAyB;YAyBzB,mBAAmB;YAanB,cAAc;IA2B5B,OAAO,CAAC,OAAO;IAKf,OAAO,CAAC,OAAO;CAKhB"}
|
|
@@ -82,12 +82,12 @@ let JobConsumer = class JobConsumer extends bullmq_1.WorkerHost {
|
|
|
82
82
|
onCompleted(job) {
|
|
83
83
|
this.queueService.data.stats.pending_jobs = Math.max(0, this.queueService.data.stats.pending_jobs - 1);
|
|
84
84
|
this.queueService.data.stats.completed_jobs++;
|
|
85
|
-
this.logger.log(`[COMPLETED] ${job.id} : ${this.jobName(job)}`);
|
|
85
|
+
this.logger.log(`[COMPLETED] ${job.id} : ${this.jobName(job)}${this.elapsed(job)}`);
|
|
86
86
|
}
|
|
87
87
|
async onFailed(job) {
|
|
88
88
|
this.queueService.data.stats.pending_jobs = Math.max(0, this.queueService.data.stats.pending_jobs - 1);
|
|
89
89
|
this.queueService.data.stats.failed_jobs++;
|
|
90
|
-
this.logger.error(`[FAILED] ${job?.
|
|
90
|
+
this.logger.error(`[FAILED] ${job?.queueName} : ${this.jobName(job)}${this.elapsed(job)}`);
|
|
91
91
|
await this.persistFinalFailure(job);
|
|
92
92
|
}
|
|
93
93
|
onPaused() {
|
|
@@ -137,6 +137,11 @@ let JobConsumer = class JobConsumer extends bullmq_1.WorkerHost {
|
|
|
137
137
|
this.logger.error(`Failed to persist failed job: ${error instanceof Error ? error.message : String(error)}`);
|
|
138
138
|
}
|
|
139
139
|
}
|
|
140
|
+
elapsed(job) {
|
|
141
|
+
if (!job?.processedOn || !job?.finishedOn)
|
|
142
|
+
return '';
|
|
143
|
+
return ` [${job.finishedOn - job.processedOn}ms]`;
|
|
144
|
+
}
|
|
140
145
|
jobName(job) {
|
|
141
146
|
const name = job?.name === 'generic.job.trigger' ? job?.data?.name : job?.name;
|
|
142
147
|
return name || 'undefined job';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job.consumer.js","sourceRoot":"","sources":["../../../src/common/consumers/job.consumer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"job.consumer.js","sourceRoot":"","sources":["../../../src/common/consumers/job.consumer.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ let CommonController = class CommonController {
|
|
|
21
21
|
return { status: 'ok', timestamp: new Date().toISOString() };
|
|
22
22
|
}
|
|
23
23
|
async me() {
|
|
24
|
-
const { user, roles } = await this.authService.
|
|
24
|
+
const { user, roles } = await this.authService.validateRole();
|
|
25
25
|
return { user, roles };
|
|
26
26
|
}
|
|
27
27
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.controller.js","sourceRoot":"","sources":["../../../src/common/controllers/common.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAiD;AACjD,6CAA+C;AAC/C,mEAA+D;AAYxD,IAAe,gBAAgB,GAA/B,MAAe,gBAAgB;IACpC,YAA+B,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IAI3D,MAAM;QACJ,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC;IAC/D,CAAC;IAMK,AAAN,KAAK,CAAC,EAAE;QAGN,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"common.controller.js","sourceRoot":"","sources":["../../../src/common/controllers/common.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAiD;AACjD,6CAA+C;AAC/C,mEAA+D;AAYxD,IAAe,gBAAgB,GAA/B,MAAe,gBAAgB;IACpC,YAA+B,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IAI3D,MAAM;QACJ,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC;IAC/D,CAAC;IAMK,AAAN,KAAK,CAAC,EAAE;QAGN,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;QAC9D,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IACzB,CAAC;CACF,CAAA;AAnBqB,4CAAgB;AAKpC;IAFC,IAAA,YAAG,EAAC,QAAQ,CAAC;IACb,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC;;;;8CAGzC;AAMK;IAJL,IAAA,YAAG,EAAC,IAAI,CAAC;IACT,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,yDAAyD;KACnE,CAAC;;;;0CAMD;2BAlBmB,gBAAgB;IADrC,IAAA,mBAAU,GAAE;qCAEiC,0BAAW;GADnC,gBAAgB,CAmBrC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { RootEntity } from './root.entity';
|
|
2
|
+
import { AdminUserEntity } from '../../auth/entities/admin.user.entity';
|
|
3
|
+
export declare abstract class CommonAdminEntity extends RootEntity {
|
|
4
|
+
created_by: string;
|
|
5
|
+
creator: AdminUserEntity;
|
|
6
|
+
}
|
|
7
|
+
//# sourceMappingURL=common.admin.entity.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"common.admin.entity.d.ts","sourceRoot":"","sources":["../../../src/common/entities/common.admin.entity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAExE,8BAAsB,iBAAkB,SAAQ,UAAU;IAExD,UAAU,EAAE,MAAM,CAAC;IAInB,OAAO,EAAE,eAAe,CAAC;CAC1B"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.CommonAdminEntity = void 0;
|
|
13
|
+
const typeorm_1 = require("typeorm");
|
|
14
|
+
const root_entity_1 = require("./root.entity");
|
|
15
|
+
const admin_user_entity_1 = require("../../auth/entities/admin.user.entity");
|
|
16
|
+
class CommonAdminEntity extends root_entity_1.RootEntity {
|
|
17
|
+
}
|
|
18
|
+
exports.CommonAdminEntity = CommonAdminEntity;
|
|
19
|
+
__decorate([
|
|
20
|
+
(0, typeorm_1.Column)({ type: 'uuid', nullable: true }),
|
|
21
|
+
__metadata("design:type", String)
|
|
22
|
+
], CommonAdminEntity.prototype, "created_by", void 0);
|
|
23
|
+
__decorate([
|
|
24
|
+
(0, typeorm_1.ManyToOne)(() => admin_user_entity_1.AdminUserEntity),
|
|
25
|
+
(0, typeorm_1.JoinColumn)({ name: 'created_by' }),
|
|
26
|
+
__metadata("design:type", admin_user_entity_1.AdminUserEntity)
|
|
27
|
+
], CommonAdminEntity.prototype, "creator", void 0);
|
|
28
|
+
//# sourceMappingURL=common.admin.entity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"common.admin.entity.js","sourceRoot":"","sources":["../../../src/common/entities/common.admin.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAwD;AACxD,+CAA2C;AAC3C,6EAAwE;AAExE,MAAsB,iBAAkB,SAAQ,wBAAU;CAOzD;AAPD,8CAOC;AALC;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACtB;AAInB;IAFC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,mCAAe,CAAC;IAChC,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;8BAC1B,mCAAe;kDAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"root.entity.d.ts","sourceRoot":"","sources":["../../../src/common/entities/root.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAKV,eAAe,EACf,cAAc,EACd,gBAAgB,EAIjB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EACL,eAAe,EACf,eAAe,EAEhB,MAAM,iCAAiC,CAAC;AAEzC,8BAAsB,UAAW,SAAQ,UAAU;
|
|
1
|
+
{"version":3,"file":"root.entity.d.ts","sourceRoot":"","sources":["../../../src/common/entities/root.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAKV,eAAe,EACf,cAAc,EACd,gBAAgB,EAIjB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EACL,eAAe,EACf,eAAe,EAEhB,MAAM,iCAAiC,CAAC;AAEzC,8BAAsB,UAAW,SAAQ,UAAU;IAWjD,EAAE,EAAE,MAAM,CAAC;IAGX,EAAE,EAAE,MAAM,CAAC;IAGX,UAAU,EAAE,IAAI,CAAC;IAGjB,UAAU,EAAE,IAAI,CAAC;IAGjB,UAAU,EAAE,IAAI,CAAC;WAWJ,YAAY,CAAC,OAAO,SAAS,UAAU,EAClD,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,EAC1B,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG;QAAE,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAA;KAAE,GACtE,OAAO,CAAC,OAAO,CAAC;WAUN,UAAU,CAAC,OAAO,SAAS,UAAU,EAChD,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,EAC1B,QAAQ,EAAE,cAAc,CAAC,OAAO,CAAC,GAChC,OAAO,CAAC,MAAM,CAAC;WAQL,UAAU,CAAC,OAAO,SAAS,UAAU,EAChD,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,EAC1B,QAAQ,EAAE,cAAc,CAAC,OAAO,CAAC,GAChC,OAAO,CAAC,MAAM,CAAC;WAQL,OAAO,CAAC,OAAO,SAAS,UAAU,EAC7C,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,EAC1B,QAAQ,EAAE,cAAc,CAAC,OAAO,CAAC,GAChC,OAAO,CAAC,MAAM,CAAC;WAQL,QAAQ,CAAC,OAAO,SAAS,UAAU,EAC9C,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,EAC1B,KAAK,EAAE,eAAe,EACtB,OAAO,CAAC,EAAE,eAAe,CAAC,OAAO,CAAC,GACjC,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAWpC,OAAO,CAAC,MAAM,CAAC,YAAY;IAQ3B,OAAO,CAAC,MAAM,CAAC,iBAAiB;CAQjC"}
|
|
@@ -18,7 +18,9 @@ class RootEntity extends typeorm_1.BaseEntity {
|
|
|
18
18
|
const existingRecord = await repository.findOne(options);
|
|
19
19
|
if (existingRecord)
|
|
20
20
|
return existingRecord;
|
|
21
|
-
|
|
21
|
+
const where = { ...options.where };
|
|
22
|
+
delete where.id;
|
|
23
|
+
return repository.create(where);
|
|
22
24
|
}
|
|
23
25
|
static async softDelete(criteria) {
|
|
24
26
|
const result = await this.repositoryOf().softDelete(this.normalizeCriteria(criteria));
|
|
@@ -54,7 +56,14 @@ class RootEntity extends typeorm_1.BaseEntity {
|
|
|
54
56
|
}
|
|
55
57
|
exports.RootEntity = RootEntity;
|
|
56
58
|
__decorate([
|
|
57
|
-
(0, typeorm_1.Column)({
|
|
59
|
+
(0, typeorm_1.Column)({
|
|
60
|
+
type: 'bigint',
|
|
61
|
+
generated: 'increment',
|
|
62
|
+
transformer: {
|
|
63
|
+
to: (value) => value,
|
|
64
|
+
from: (value) => (value == null ? value : Number(value)),
|
|
65
|
+
},
|
|
66
|
+
}),
|
|
58
67
|
__metadata("design:type", Number)
|
|
59
68
|
], RootEntity.prototype, "sn", void 0);
|
|
60
69
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"root.entity.js","sourceRoot":"","sources":["../../../src/common/entities/root.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAYiB;AAEjB,4EAIyC;AAEzC,MAAsB,UAAW,SAAQ,oBAAU;
|
|
1
|
+
{"version":3,"file":"root.entity.js","sourceRoot":"","sources":["../../../src/common/entities/root.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,5 +19,11 @@ export declare const baseEntityConstants: {
|
|
|
19
19
|
readonly systemScheduledTask: "system.scheduled.task";
|
|
20
20
|
readonly emailTemplate: "email.template";
|
|
21
21
|
readonly emailNotificationLog: "email.notification.log";
|
|
22
|
+
readonly adminUser: "admin.user";
|
|
23
|
+
readonly systemAdminRole: "system.admin.role";
|
|
24
|
+
readonly systemAdminUserRole: "system.admin.user.role";
|
|
25
|
+
readonly systemAuthSession: "system.auth.session";
|
|
26
|
+
readonly scope: "scope";
|
|
27
|
+
readonly apiScope: "api.scope";
|
|
22
28
|
};
|
|
23
29
|
//# sourceMappingURL=entity.constants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity.constants.d.ts","sourceRoot":"","sources":["../../src/constants/entity.constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB
|
|
1
|
+
{"version":3,"file":"entity.constants.d.ts","sourceRoot":"","sources":["../../src/constants/entity.constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BtB,CAAC"}
|
|
@@ -22,5 +22,11 @@ exports.baseEntityConstants = {
|
|
|
22
22
|
systemScheduledTask: 'system.scheduled.task',
|
|
23
23
|
emailTemplate: 'email.template',
|
|
24
24
|
emailNotificationLog: 'email.notification.log',
|
|
25
|
+
adminUser: 'admin.user',
|
|
26
|
+
systemAdminRole: 'system.admin.role',
|
|
27
|
+
systemAdminUserRole: 'system.admin.user.role',
|
|
28
|
+
systemAuthSession: 'system.auth.session',
|
|
29
|
+
scope: 'scope',
|
|
30
|
+
apiScope: 'api.scope',
|
|
25
31
|
};
|
|
26
32
|
//# sourceMappingURL=entity.constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity.constants.js","sourceRoot":"","sources":["../../src/constants/entity.constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,mBAAmB,GAAG;IACjC,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,aAAa;IAC1B,UAAU,EAAE,aAAa;IACzB,QAAQ,EAAE,WAAW;IACrB,kBAAkB,EAAE,sBAAsB;IAC1C,kBAAkB,EAAE,sBAAsB;IAC1C,cAAc,EAAE,iBAAiB;IACjC,eAAe,EAAE,mBAAmB;IACpC,cAAc,EAAE,iBAAiB;IACjC,kBAAkB,EAAE,qBAAqB;IACzC,cAAc,EAAE,kBAAkB;IAClC,QAAQ,EAAE,UAAU;IACpB,WAAW,EAAE,cAAc;IAC3B,MAAM,EAAE,QAAQ;IAChB,eAAe,EAAE,mBAAmB;IACpC,MAAM,EAAE,SAAS;IACjB,cAAc,EAAE,iBAAiB;IACjC,mBAAmB,EAAE,uBAAuB;IAC5C,aAAa,EAAE,gBAAgB;IAC/B,oBAAoB,EAAE,wBAAwB;
|
|
1
|
+
{"version":3,"file":"entity.constants.js","sourceRoot":"","sources":["../../src/constants/entity.constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,mBAAmB,GAAG;IACjC,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,aAAa;IAC1B,UAAU,EAAE,aAAa;IACzB,QAAQ,EAAE,WAAW;IACrB,kBAAkB,EAAE,sBAAsB;IAC1C,kBAAkB,EAAE,sBAAsB;IAC1C,cAAc,EAAE,iBAAiB;IACjC,eAAe,EAAE,mBAAmB;IACpC,cAAc,EAAE,iBAAiB;IACjC,kBAAkB,EAAE,qBAAqB;IACzC,cAAc,EAAE,kBAAkB;IAClC,QAAQ,EAAE,UAAU;IACpB,WAAW,EAAE,cAAc;IAC3B,MAAM,EAAE,QAAQ;IAChB,eAAe,EAAE,mBAAmB;IACpC,MAAM,EAAE,SAAS;IACjB,cAAc,EAAE,iBAAiB;IACjC,mBAAmB,EAAE,uBAAuB;IAC5C,aAAa,EAAE,gBAAgB;IAC/B,oBAAoB,EAAE,wBAAwB;IAC9C,SAAS,EAAE,YAAY;IACvB,eAAe,EAAE,mBAAmB;IACpC,mBAAmB,EAAE,wBAAwB;IAC7C,iBAAiB,EAAE,qBAAqB;IACxC,KAAK,EAAE,OAAO;IACd,QAAQ,EAAE,WAAW;CACb,CAAC"}
|
|
@@ -4,6 +4,12 @@ import { SystemRoleEntity } from '../auth/entities/system.role.entity';
|
|
|
4
4
|
import { UserDetailsEntity } from '../auth/entities/user.details.entity';
|
|
5
5
|
import { UserEntity } from '../auth/entities/user.entity';
|
|
6
6
|
import { UserRoleEntity } from '../auth/entities/user.role.entity';
|
|
7
|
+
import { AdminUserEntity } from '../auth/entities/admin.user.entity';
|
|
8
|
+
import { SystemAdminRoleEntity } from '../auth/entities/system.admin.role.entity';
|
|
9
|
+
import { SystemAdminUserRoleEntity } from '../auth/entities/system.admin.user.role.entity';
|
|
10
|
+
import { SystemAuthSessionEntity } from '../auth/entities/system.auth.session.entity';
|
|
11
|
+
import { ScopeEntity } from '../auth/entities/scope.entity';
|
|
12
|
+
import { ApiScopeEntity } from '../auth/entities/api.scope.entity';
|
|
7
13
|
import { ActivityLogEntity } from '../common/entities/activity.log.entity';
|
|
8
14
|
import { DocumentEntity } from '../common/entities/document.entity';
|
|
9
15
|
import { ScheduledEventEntity } from '../common/entities/scheduled.event.entity';
|
|
@@ -39,5 +45,11 @@ export declare const baseEntityMaps: {
|
|
|
39
45
|
readonly "system.scheduled.task": typeof SystemScheduledTaskEntity;
|
|
40
46
|
readonly "email.template": typeof EmailTemplateEntity;
|
|
41
47
|
readonly "email.notification.log": typeof EmailNotificationLogEntity;
|
|
48
|
+
readonly "admin.user": typeof AdminUserEntity;
|
|
49
|
+
readonly "system.admin.role": typeof SystemAdminRoleEntity;
|
|
50
|
+
readonly "system.admin.user.role": typeof SystemAdminUserRoleEntity;
|
|
51
|
+
readonly "system.auth.session": typeof SystemAuthSessionEntity;
|
|
52
|
+
readonly scope: typeof ScopeEntity;
|
|
53
|
+
readonly "api.scope": typeof ApiScopeEntity;
|
|
42
54
|
};
|
|
43
55
|
//# sourceMappingURL=entity.maps.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity.maps.d.ts","sourceRoot":"","sources":["../../src/constants/entity.maps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAC;AACxF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AAC1F,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AACpF,OAAO,EAAE,wBAAwB,EAAE,MAAM,+CAA+C,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAC;AAC5F,OAAO,EAAE,0BAA0B,EAAE,MAAM,wDAAwD,CAAC;AACpG,OAAO,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AACrF,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAKhE,eAAO,MAAM,cAAc
|
|
1
|
+
{"version":3,"file":"entity.maps.d.ts","sourceRoot":"","sources":["../../src/constants/entity.maps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAC;AACxF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2CAA2C,CAAC;AAClF,OAAO,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAC;AAC3F,OAAO,EAAE,uBAAuB,EAAE,MAAM,6CAA6C,CAAC;AACtF,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AAC1F,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AACpF,OAAO,EAAE,wBAAwB,EAAE,MAAM,+CAA+C,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAC;AAC5F,OAAO,EAAE,0BAA0B,EAAE,MAAM,wDAAwD,CAAC;AACpG,OAAO,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AACrF,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAKhE,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BjB,CAAC"}
|
|
@@ -7,6 +7,12 @@ const system_role_entity_1 = require("../auth/entities/system.role.entity");
|
|
|
7
7
|
const user_details_entity_1 = require("../auth/entities/user.details.entity");
|
|
8
8
|
const user_entity_1 = require("../auth/entities/user.entity");
|
|
9
9
|
const user_role_entity_1 = require("../auth/entities/user.role.entity");
|
|
10
|
+
const admin_user_entity_1 = require("../auth/entities/admin.user.entity");
|
|
11
|
+
const system_admin_role_entity_1 = require("../auth/entities/system.admin.role.entity");
|
|
12
|
+
const system_admin_user_role_entity_1 = require("../auth/entities/system.admin.user.role.entity");
|
|
13
|
+
const system_auth_session_entity_1 = require("../auth/entities/system.auth.session.entity");
|
|
14
|
+
const scope_entity_1 = require("../auth/entities/scope.entity");
|
|
15
|
+
const api_scope_entity_1 = require("../auth/entities/api.scope.entity");
|
|
10
16
|
const activity_log_entity_1 = require("../common/entities/activity.log.entity");
|
|
11
17
|
const document_entity_1 = require("../common/entities/document.entity");
|
|
12
18
|
const scheduled_event_entity_1 = require("../common/entities/scheduled.event.entity");
|
|
@@ -43,5 +49,11 @@ exports.baseEntityMaps = {
|
|
|
43
49
|
[entity_constants_1.baseEntityConstants.systemScheduledTask]: system_scheduled_task_entity_1.SystemScheduledTaskEntity,
|
|
44
50
|
[entity_constants_1.baseEntityConstants.emailTemplate]: email_template_entity_1.EmailTemplateEntity,
|
|
45
51
|
[entity_constants_1.baseEntityConstants.emailNotificationLog]: email_notification_log_entity_1.EmailNotificationLogEntity,
|
|
52
|
+
[entity_constants_1.baseEntityConstants.adminUser]: admin_user_entity_1.AdminUserEntity,
|
|
53
|
+
[entity_constants_1.baseEntityConstants.systemAdminRole]: system_admin_role_entity_1.SystemAdminRoleEntity,
|
|
54
|
+
[entity_constants_1.baseEntityConstants.systemAdminUserRole]: system_admin_user_role_entity_1.SystemAdminUserRoleEntity,
|
|
55
|
+
[entity_constants_1.baseEntityConstants.systemAuthSession]: system_auth_session_entity_1.SystemAuthSessionEntity,
|
|
56
|
+
[entity_constants_1.baseEntityConstants.scope]: scope_entity_1.ScopeEntity,
|
|
57
|
+
[entity_constants_1.baseEntityConstants.apiScope]: api_scope_entity_1.ApiScopeEntity,
|
|
46
58
|
};
|
|
47
59
|
//# sourceMappingURL=entity.maps.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity.maps.js","sourceRoot":"","sources":["../../src/constants/entity.maps.ts"],"names":[],"mappings":";;;AAAA,oEAA+D;AAC/D,8FAAwF;AACxF,4EAAuE;AACvE,8EAAyE;AACzE,8DAA0D;AAC1D,wEAAmE;AACnE,gFAA2E;AAC3E,wEAAoE;AACpE,sFAAiF;AACjF,wFAAkF;AAClF,sFAAiF;AACjF,gGAA0F;AAC1F,0FAAoF;AACpF,8FAAyF;AACzF,sFAAiF;AACjF,kGAA4F;AAC5F,0GAAoG;AACpG,0FAAqF;AACrF,gGAA0F;AAC1F,oEAAgE;AAChE,yDAAyD;AAI5C,QAAA,cAAc,GAAG;IAC5B,CAAC,sCAAmB,CAAC,IAAI,CAAC,EAAE,wBAAU;IACtC,CAAC,sCAAmB,CAAC,WAAW,CAAC,EAAE,uCAAiB;IACpD,CAAC,sCAAmB,CAAC,UAAU,CAAC,EAAE,qCAAgB;IAClD,CAAC,sCAAmB,CAAC,QAAQ,CAAC,EAAE,iCAAc;IAC9C,CAAC,sCAAmB,CAAC,kBAAkB,CAAC,EAAE,sDAAwB;IAClE,CAAC,sCAAmB,CAAC,kBAAkB,CAAC,EAAE,sDAAwB;IAClE,CAAC,sCAAmB,CAAC,cAAc,CAAC,EAAE,6CAAoB;IAC1D,CAAC,sCAAmB,CAAC,eAAe,CAAC,EAAE,gDAAqB;IAC5D,CAAC,sCAAmB,CAAC,cAAc,CAAC,EAAE,6CAAoB;IAC1D,CAAC,sCAAmB,CAAC,kBAAkB,CAAC,EAAE,qDAAwB;IAClE,CAAC,sCAAmB,CAAC,cAAc,CAAC,EAAE,8CAAoB;IAC1D,CAAC,sCAAmB,CAAC,QAAQ,CAAC,EAAE,gCAAc;IAC9C,CAAC,sCAAmB,CAAC,WAAW,CAAC,EAAE,uCAAiB;IACpD,CAAC,sCAAmB,CAAC,MAAM,CAAC,EAAE,4BAAY;IAC1C,CAAC,sCAAmB,CAAC,eAAe,CAAC,EAAE,gDAAqB;IAC5D,CAAC,sCAAmB,CAAC,MAAM,CAAC,EAAE,6BAAY;IAC1C,CAAC,sCAAmB,CAAC,cAAc,CAAC,EAAE,6CAAoB;IAC1D,CAAC,sCAAmB,CAAC,mBAAmB,CAAC,EAAE,wDAAyB;IACpE,CAAC,sCAAmB,CAAC,aAAa,CAAC,EAAE,2CAAmB;IACxD,CAAC,sCAAmB,CAAC,oBAAoB,CAAC,EAAE,0DAA0B;
|
|
1
|
+
{"version":3,"file":"entity.maps.js","sourceRoot":"","sources":["../../src/constants/entity.maps.ts"],"names":[],"mappings":";;;AAAA,oEAA+D;AAC/D,8FAAwF;AACxF,4EAAuE;AACvE,8EAAyE;AACzE,8DAA0D;AAC1D,wEAAmE;AACnE,0EAAqE;AACrE,wFAAkF;AAClF,kGAA2F;AAC3F,4FAAsF;AACtF,gEAA4D;AAC5D,wEAAmE;AACnE,gFAA2E;AAC3E,wEAAoE;AACpE,sFAAiF;AACjF,wFAAkF;AAClF,sFAAiF;AACjF,gGAA0F;AAC1F,0FAAoF;AACpF,8FAAyF;AACzF,sFAAiF;AACjF,kGAA4F;AAC5F,0GAAoG;AACpG,0FAAqF;AACrF,gGAA0F;AAC1F,oEAAgE;AAChE,yDAAyD;AAI5C,QAAA,cAAc,GAAG;IAC5B,CAAC,sCAAmB,CAAC,IAAI,CAAC,EAAE,wBAAU;IACtC,CAAC,sCAAmB,CAAC,WAAW,CAAC,EAAE,uCAAiB;IACpD,CAAC,sCAAmB,CAAC,UAAU,CAAC,EAAE,qCAAgB;IAClD,CAAC,sCAAmB,CAAC,QAAQ,CAAC,EAAE,iCAAc;IAC9C,CAAC,sCAAmB,CAAC,kBAAkB,CAAC,EAAE,sDAAwB;IAClE,CAAC,sCAAmB,CAAC,kBAAkB,CAAC,EAAE,sDAAwB;IAClE,CAAC,sCAAmB,CAAC,cAAc,CAAC,EAAE,6CAAoB;IAC1D,CAAC,sCAAmB,CAAC,eAAe,CAAC,EAAE,gDAAqB;IAC5D,CAAC,sCAAmB,CAAC,cAAc,CAAC,EAAE,6CAAoB;IAC1D,CAAC,sCAAmB,CAAC,kBAAkB,CAAC,EAAE,qDAAwB;IAClE,CAAC,sCAAmB,CAAC,cAAc,CAAC,EAAE,8CAAoB;IAC1D,CAAC,sCAAmB,CAAC,QAAQ,CAAC,EAAE,gCAAc;IAC9C,CAAC,sCAAmB,CAAC,WAAW,CAAC,EAAE,uCAAiB;IACpD,CAAC,sCAAmB,CAAC,MAAM,CAAC,EAAE,4BAAY;IAC1C,CAAC,sCAAmB,CAAC,eAAe,CAAC,EAAE,gDAAqB;IAC5D,CAAC,sCAAmB,CAAC,MAAM,CAAC,EAAE,6BAAY;IAC1C,CAAC,sCAAmB,CAAC,cAAc,CAAC,EAAE,6CAAoB;IAC1D,CAAC,sCAAmB,CAAC,mBAAmB,CAAC,EAAE,wDAAyB;IACpE,CAAC,sCAAmB,CAAC,aAAa,CAAC,EAAE,2CAAmB;IACxD,CAAC,sCAAmB,CAAC,oBAAoB,CAAC,EAAE,0DAA0B;IACtE,CAAC,sCAAmB,CAAC,SAAS,CAAC,EAAE,mCAAe;IAChD,CAAC,sCAAmB,CAAC,eAAe,CAAC,EAAE,gDAAqB;IAC5D,CAAC,sCAAmB,CAAC,mBAAmB,CAAC,EAAE,yDAAyB;IACpE,CAAC,sCAAmB,CAAC,iBAAiB,CAAC,EAAE,oDAAuB;IAChE,CAAC,sCAAmB,CAAC,KAAK,CAAC,EAAE,0BAAW;IACxC,CAAC,sCAAmB,CAAC,QAAQ,CAAC,EAAE,iCAAc;CACtC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global.exception.filter.d.ts","sourceRoot":"","sources":["../../../src/global/filters/global.exception.filter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEb,eAAe,EAIhB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"global.exception.filter.d.ts","sourceRoot":"","sources":["../../../src/global/filters/global.exception.filter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEb,eAAe,EAIhB,MAAM,gBAAgB,CAAC;AAYxB,qBACa,qBAAsB,YAAW,eAAe;IAC3D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiC;IAExD,KAAK,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,GAAG,IAAI;IAmCpD,OAAO,CAAC,cAAc;CAgCvB"}
|
|
@@ -19,16 +19,19 @@ let GlobalExceptionFilter = class GlobalExceptionFilter {
|
|
|
19
19
|
const status = exception instanceof common_1.HttpException
|
|
20
20
|
? exception.getStatus()
|
|
21
21
|
: common_1.HttpStatus.INTERNAL_SERVER_ERROR;
|
|
22
|
-
const { message, error } = this.extractMessage(exception, status);
|
|
22
|
+
const { message, error, errors } = this.extractMessage(exception, status);
|
|
23
23
|
const body = {
|
|
24
24
|
statusCode: status,
|
|
25
25
|
message,
|
|
26
26
|
error,
|
|
27
|
+
...(errors ? { errors } : {}),
|
|
27
28
|
path: request.originalUrl,
|
|
28
29
|
timestamp: new Date().toISOString(),
|
|
29
30
|
};
|
|
30
31
|
if (status >= 500) {
|
|
31
|
-
this.logger.error(`${request.method} ${request.originalUrl} ${status}`, exception instanceof Error
|
|
32
|
+
this.logger.error(`${request.method} ${request.originalUrl} ${status}`, exception instanceof Error
|
|
33
|
+
? exception.stack
|
|
34
|
+
: JSON.stringify(exception));
|
|
32
35
|
}
|
|
33
36
|
else {
|
|
34
37
|
this.logger.warn(`${request.method} ${request.originalUrl} ${status}`);
|
|
@@ -45,6 +48,7 @@ let GlobalExceptionFilter = class GlobalExceptionFilter {
|
|
|
45
48
|
return {
|
|
46
49
|
message: obj.message ?? exception.message,
|
|
47
50
|
error: obj.error ?? exception.name,
|
|
51
|
+
errors: obj.errors,
|
|
48
52
|
};
|
|
49
53
|
}
|
|
50
54
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global.exception.filter.js","sourceRoot":"","sources":["../../../src/global/filters/global.exception.filter.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAOwB;
|
|
1
|
+
{"version":3,"file":"global.exception.filter.js","sourceRoot":"","sources":["../../../src/global/filters/global.exception.filter.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAOwB;AAajB,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAA3B;QACY,WAAM,GAAG,IAAI,eAAM,CAAC,iBAAiB,CAAC,CAAC;IAqE1D,CAAC;IAnEC,KAAK,CAAC,SAAkB,EAAE,IAAmB;QAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAChC,MAAM,QAAQ,GAAG,GAAG,CAAC,WAAW,EAAY,CAAC;QAC7C,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU,EAAW,CAAC;QAE1C,MAAM,MAAM,GACV,SAAS,YAAY,sBAAa;YAChC,CAAC,CAAC,SAAS,CAAC,SAAS,EAAE;YACvB,CAAC,CAAC,mBAAU,CAAC,qBAAqB,CAAC;QAEvC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAE1E,MAAM,IAAI,GAAsB;YAC9B,UAAU,EAAE,MAAM;YAClB,OAAO;YACP,KAAK;YACL,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7B,IAAI,EAAE,OAAO,CAAC,WAAW;YACzB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACpC,CAAC;QAEF,IAAI,MAAM,IAAI,GAAG,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,WAAW,IAAI,MAAM,EAAE,EACpD,SAAS,YAAY,KAAK;gBACxB,CAAC,CAAC,SAAS,CAAC,KAAK;gBACjB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAC9B,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,WAAW,IAAI,MAAM,EAAE,CAAC,CAAC;QACzE,CAAC;QAED,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAEO,cAAc,CACpB,SAAkB,EAClB,MAAc;QAMd,IAAI,SAAS,YAAY,sBAAa,EAAE,CAAC;YACvC,MAAM,GAAG,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;YACpC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;gBAC5B,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC;YACjD,CAAC;YACD,MAAM,GAAG,GAAG,GAIX,CAAC;YACF,OAAO;gBACL,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,SAAS,CAAC,OAAO;gBACzC,KAAK,EAAE,GAAG,CAAC,KAAK,IAAI,SAAS,CAAC,IAAI;gBAClC,MAAM,EAAE,GAAG,CAAC,MAAM;aACnB,CAAC;QACJ,CAAC;QACD,OAAO;YACL,OAAO,EACL,SAAS,YAAY,KAAK;gBACxB,CAAC,CAAC,SAAS,CAAC,OAAO;gBACnB,CAAC,CAAC,uBAAuB;YAC7B,KAAK,EAAE,mBAAU,CAAC,MAAM,CAAC,IAAI,OAAO;SACrC,CAAC;IACJ,CAAC;CACF,CAAA;AAtEY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,cAAK,GAAE;GACK,qBAAqB,CAsEjC"}
|
|
@@ -10,6 +10,10 @@ export declare abstract class MigrationUtility implements MigrationInterface {
|
|
|
10
10
|
abstract process(): void;
|
|
11
11
|
up(queryRunner: QueryRunner): Promise<void>;
|
|
12
12
|
down(queryRunner: QueryRunner): Promise<void>;
|
|
13
|
+
private _addColumns;
|
|
14
|
+
private _dropColumns;
|
|
15
|
+
private _declaresPrimary;
|
|
16
|
+
private _sameColumns;
|
|
13
17
|
primary(name?: string): this;
|
|
14
18
|
rootPrimary(): this;
|
|
15
19
|
string(name: string, mods?: StringColumnModifiers): this;
|