@neohm/nestend 3.1.0 → 3.1.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/admin/controllers/admin.role.controller.d.ts +23 -0
- package/dist/admin/controllers/admin.role.controller.d.ts.map +1 -0
- package/dist/admin/controllers/admin.role.controller.js +66 -0
- package/dist/admin/controllers/admin.role.controller.js.map +1 -0
- package/dist/admin/controllers/admin.scheduled.task.controller.d.ts +1 -0
- package/dist/admin/controllers/admin.scheduled.task.controller.d.ts.map +1 -1
- package/dist/admin/controllers/admin.scheduled.task.controller.js +16 -0
- package/dist/admin/controllers/admin.scheduled.task.controller.js.map +1 -1
- package/dist/admin/controllers/admin.tenant.controller.d.ts +1 -0
- package/dist/admin/controllers/admin.tenant.controller.d.ts.map +1 -1
- package/dist/admin/controllers/admin.tenant.controller.js +16 -0
- package/dist/admin/controllers/admin.tenant.controller.js.map +1 -1
- package/dist/admin/controllers/admin.user.controller.d.ts +21 -1
- package/dist/admin/controllers/admin.user.controller.d.ts.map +1 -1
- package/dist/admin/controllers/admin.user.controller.js +70 -1
- package/dist/admin/controllers/admin.user.controller.js.map +1 -1
- package/dist/admin/dtos/admin.user.list.dto.d.ts +4 -0
- package/dist/admin/dtos/admin.user.list.dto.d.ts.map +1 -0
- package/dist/admin/dtos/admin.user.list.dto.js +8 -0
- package/dist/admin/dtos/admin.user.list.dto.js.map +1 -0
- package/dist/admin/dtos/client.user.list.dto.d.ts +4 -0
- package/dist/admin/dtos/client.user.list.dto.d.ts.map +1 -0
- package/dist/admin/dtos/client.user.list.dto.js +8 -0
- package/dist/admin/dtos/client.user.list.dto.js.map +1 -0
- package/dist/admin/dtos/role.list.dto.d.ts +4 -0
- package/dist/admin/dtos/role.list.dto.d.ts.map +1 -0
- package/dist/admin/dtos/role.list.dto.js +8 -0
- package/dist/admin/dtos/role.list.dto.js.map +1 -0
- package/dist/admin/es6.classes.d.ts +12 -4
- package/dist/admin/es6.classes.d.ts.map +1 -1
- package/dist/admin/es6.classes.js +23 -0
- package/dist/admin/es6.classes.js.map +1 -1
- package/dist/admin/libraries/admin.user.delete.processor.d.ts +11 -0
- package/dist/admin/libraries/admin.user.delete.processor.d.ts.map +1 -0
- package/dist/admin/libraries/admin.user.delete.processor.js +60 -0
- package/dist/admin/libraries/admin.user.delete.processor.js.map +1 -0
- package/dist/admin/libraries/admin.user.list.processor.d.ts +15 -0
- package/dist/admin/libraries/admin.user.list.processor.d.ts.map +1 -0
- package/dist/admin/libraries/admin.user.list.processor.js +30 -0
- package/dist/admin/libraries/admin.user.list.processor.js.map +1 -0
- package/dist/admin/libraries/client.user.delete.processor.d.ts +9 -0
- package/dist/admin/libraries/client.user.delete.processor.d.ts.map +1 -0
- package/dist/admin/libraries/client.user.delete.processor.js +28 -0
- package/dist/admin/libraries/client.user.delete.processor.js.map +1 -0
- package/dist/admin/libraries/client.user.list.processor.d.ts +15 -0
- package/dist/admin/libraries/client.user.list.processor.d.ts.map +1 -0
- package/dist/admin/libraries/client.user.list.processor.js +51 -0
- package/dist/admin/libraries/client.user.list.processor.js.map +1 -0
- package/dist/admin/libraries/role.list.processor.d.ts +26 -0
- package/dist/admin/libraries/role.list.processor.d.ts.map +1 -0
- package/dist/admin/libraries/role.list.processor.js +54 -0
- package/dist/admin/libraries/role.list.processor.js.map +1 -0
- package/dist/admin/libraries/scheduled.task.delete.processor.d.ts +9 -0
- package/dist/admin/libraries/scheduled.task.delete.processor.d.ts.map +1 -0
- package/dist/admin/libraries/scheduled.task.delete.processor.js +28 -0
- package/dist/admin/libraries/scheduled.task.delete.processor.js.map +1 -0
- package/dist/admin/libraries/scheduled.task.list.processor.js +2 -2
- package/dist/admin/libraries/scheduled.task.list.processor.js.map +1 -1
- package/dist/admin/libraries/tenant.delete.processor.d.ts +9 -0
- package/dist/admin/libraries/tenant.delete.processor.d.ts.map +1 -0
- package/dist/admin/libraries/tenant.delete.processor.js +34 -0
- package/dist/admin/libraries/tenant.delete.processor.js.map +1 -0
- package/dist/admin/libraries/tenant.list.processor.js +5 -5
- package/dist/admin/libraries/tenant.list.processor.js.map +1 -1
- package/dist/admin/types/admin.types.d.ts +5 -0
- package/dist/admin/types/admin.types.d.ts.map +1 -1
- package/dist/auth/helpers/admin.auth.d.ts +4 -1
- package/dist/auth/helpers/admin.auth.d.ts.map +1 -1
- package/dist/auth/helpers/admin.auth.js +9 -3
- package/dist/auth/helpers/admin.auth.js.map +1 -1
- package/dist/auth/helpers/auth.d.ts +4 -1
- package/dist/auth/helpers/auth.d.ts.map +1 -1
- package/dist/auth/helpers/auth.js +9 -3
- package/dist/auth/helpers/auth.js.map +1 -1
- package/dist/auth/middlewares/admin.jwt.middleware.d.ts +1 -0
- package/dist/auth/middlewares/admin.jwt.middleware.d.ts.map +1 -1
- package/dist/auth/middlewares/admin.jwt.middleware.js +28 -19
- package/dist/auth/middlewares/admin.jwt.middleware.js.map +1 -1
- package/dist/auth/middlewares/jwt.middleware.d.ts +1 -0
- package/dist/auth/middlewares/jwt.middleware.d.ts.map +1 -1
- package/dist/auth/middlewares/jwt.middleware.js +28 -19
- package/dist/auth/middlewares/jwt.middleware.js.map +1 -1
- package/dist/auth/utilities/access.revocation.d.ts +5 -0
- package/dist/auth/utilities/access.revocation.d.ts.map +1 -0
- package/dist/auth/utilities/access.revocation.js +15 -0
- package/dist/auth/utilities/access.revocation.js.map +1 -0
- package/dist/common/consumers/job.consumer.d.ts +6 -2
- package/dist/common/consumers/job.consumer.d.ts.map +1 -1
- package/dist/common/consumers/job.consumer.js +21 -1
- package/dist/common/consumers/job.consumer.js.map +1 -1
- package/dist/common/es6.classes.d.ts +2 -2
- package/dist/common/jobs/common.job.d.ts +1 -0
- package/dist/common/jobs/common.job.d.ts.map +1 -1
- package/dist/common/jobs/common.job.js +9 -0
- package/dist/common/jobs/common.job.js.map +1 -1
- package/dist/common/libraries/common.list.processor.d.ts +2 -0
- package/dist/common/libraries/common.list.processor.d.ts.map +1 -1
- package/dist/common/libraries/common.list.processor.js +31 -0
- package/dist/common/libraries/common.list.processor.js.map +1 -1
- package/dist/common/services/queue.service.d.ts.map +1 -1
- package/dist/common/services/queue.service.js +1 -1
- package/dist/common/services/queue.service.js.map +1 -1
- package/dist/common/types/list.types.d.ts +2 -0
- package/dist/common/types/list.types.d.ts.map +1 -1
- package/dist/index.d.ts +14 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +28 -3
- package/dist/index.js.map +1 -1
- package/dist/migrations/1749600000024.CreateSysAuthSessionsTable.d.ts.map +1 -1
- package/dist/migrations/1749600000024.CreateSysAuthSessionsTable.js +1 -0
- package/dist/migrations/1749600000024.CreateSysAuthSessionsTable.js.map +1 -1
- package/package.json +1 -1
|
@@ -5,16 +5,22 @@ const async_hooks_1 = require("async_hooks");
|
|
|
5
5
|
const user_entity_1 = require("../entities/user.entity");
|
|
6
6
|
const storage = new async_hooks_1.AsyncLocalStorage();
|
|
7
7
|
class Auth {
|
|
8
|
-
static async
|
|
8
|
+
static async loadUserContext(userId, sessionIdentifier) {
|
|
9
9
|
const user = await user_entity_1.UserEntity.findOne({ where: { id: userId } });
|
|
10
10
|
if (!user)
|
|
11
|
-
return;
|
|
11
|
+
return null;
|
|
12
12
|
const userObject = { ...user };
|
|
13
13
|
delete userObject.password;
|
|
14
14
|
delete userObject.created_at;
|
|
15
15
|
delete userObject.updated_at;
|
|
16
16
|
delete userObject.deleted_at;
|
|
17
|
-
|
|
17
|
+
return { user: userObject, sessionIdentifier };
|
|
18
|
+
}
|
|
19
|
+
static runWithContext(context, callback) {
|
|
20
|
+
return storage.run(context, callback);
|
|
21
|
+
}
|
|
22
|
+
static enterContext(context) {
|
|
23
|
+
storage.enterWith(context);
|
|
18
24
|
}
|
|
19
25
|
static user() {
|
|
20
26
|
return storage.getStore()?.user;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/auth/helpers/auth.ts"],"names":[],"mappings":";;;AAAA,6CAAgD;AAChD,yDAAqD;AAGrD,MAAM,OAAO,GAAG,IAAI,+BAAiB,EAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/auth/helpers/auth.ts"],"names":[],"mappings":";;;AAAA,6CAAgD;AAChD,yDAAqD;AAGrD,MAAM,OAAO,GAAG,IAAI,+BAAiB,EAAoB,CAAC;AAS1D,MAAa,IAAI;IAMf,MAAM,CAAC,KAAK,CAAC,eAAe,CAC1B,MAAc,EACd,iBAA0B;QAE1B,MAAM,IAAI,GAAG,MAAM,wBAAU,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACjE,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC;QAEvB,MAAM,UAAU,GAAwB,EAAE,GAAG,IAAI,EAAE,CAAC;QACpD,OAAO,UAAU,CAAC,QAAQ,CAAC;QAC3B,OAAO,UAAU,CAAC,UAAU,CAAC;QAC7B,OAAO,UAAU,CAAC,UAAU,CAAC;QAC7B,OAAO,UAAU,CAAC,UAAU,CAAC;QAE7B,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,iBAAiB,EAAE,CAAC;IACjD,CAAC;IAWD,MAAM,CAAC,cAAc,CAAI,OAAyB,EAAE,QAAiB;QACnE,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACxC,CAAC;IAOD,MAAM,CAAC,YAAY,CAAC,OAAyB;QAC3C,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,IAAI;QACT,OAAO,OAAO,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC;IAClC,CAAC;IAED,MAAM,CAAC,OAAO;QACZ,OAAO,OAAO,CAAC,QAAQ,EAAE,EAAE,iBAAiB,CAAC;IAC/C,CAAC;CACF;AAnDD,oBAmDC"}
|
|
@@ -5,6 +5,7 @@ export declare class AdminJwtMiddleware implements NestMiddleware {
|
|
|
5
5
|
private readonly jwtService;
|
|
6
6
|
constructor(jwtService: JwtService);
|
|
7
7
|
use(request: Request, _response: Response, next: NextFunction): Promise<void>;
|
|
8
|
+
private resolveContext;
|
|
8
9
|
private extractToken;
|
|
9
10
|
}
|
|
10
11
|
//# sourceMappingURL=admin.jwt.middleware.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin.jwt.middleware.d.ts","sourceRoot":"","sources":["../../../src/auth/middlewares/admin.jwt.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAkB1D,qBACa,kBAAmB,YAAW,cAAc;IAC3C,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,EAAE,UAAU;IAE7C,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,QAAQ,EACnB,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"admin.jwt.middleware.d.ts","sourceRoot":"","sources":["../../../src/auth/middlewares/admin.jwt.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAkB1D,qBACa,kBAAmB,YAAW,cAAc;IAC3C,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,EAAE,UAAU;IAE7C,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,QAAQ,EACnB,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC;YAcF,cAAc;IA4B5B,OAAO,CAAC,YAAY;CAOrB"}
|
|
@@ -19,28 +19,37 @@ let AdminJwtMiddleware = class AdminJwtMiddleware {
|
|
|
19
19
|
this.jwtService = jwtService;
|
|
20
20
|
}
|
|
21
21
|
async use(request, _response, next) {
|
|
22
|
-
const
|
|
23
|
-
if (
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
secret: process.env.ACCESS_TOKEN_SECRET,
|
|
27
|
-
});
|
|
28
|
-
if (payload.sid) {
|
|
29
|
-
const session = await system_auth_session_entity_1.SystemAuthSessionEntity.findOne({
|
|
30
|
-
where: { session_identifier: payload.sid, is_admin: true },
|
|
31
|
-
});
|
|
32
|
-
const active = !!session &&
|
|
33
|
-
!session.invalidated_at &&
|
|
34
|
-
session.expires_at.getTime() > Date.now();
|
|
35
|
-
if (active)
|
|
36
|
-
await admin_auth_1.AdminAuth.setAdminUserContext(payload.sub, payload.sid);
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
catch {
|
|
40
|
-
}
|
|
22
|
+
const context = await this.resolveContext(request);
|
|
23
|
+
if (context) {
|
|
24
|
+
admin_auth_1.AdminAuth.runWithContext(context, next);
|
|
25
|
+
return;
|
|
41
26
|
}
|
|
42
27
|
next();
|
|
43
28
|
}
|
|
29
|
+
async resolveContext(request) {
|
|
30
|
+
const token = this.extractToken(request);
|
|
31
|
+
if (!token)
|
|
32
|
+
return null;
|
|
33
|
+
try {
|
|
34
|
+
const payload = await this.jwtService.verifyAsync(token, {
|
|
35
|
+
secret: process.env.ACCESS_TOKEN_SECRET,
|
|
36
|
+
});
|
|
37
|
+
if (!payload.sid)
|
|
38
|
+
return null;
|
|
39
|
+
const session = await system_auth_session_entity_1.SystemAuthSessionEntity.findOne({
|
|
40
|
+
where: { session_identifier: payload.sid, is_admin: true },
|
|
41
|
+
});
|
|
42
|
+
const active = !!session &&
|
|
43
|
+
!session.invalidated_at &&
|
|
44
|
+
session.expires_at.getTime() > Date.now();
|
|
45
|
+
if (!active)
|
|
46
|
+
return null;
|
|
47
|
+
return await admin_auth_1.AdminAuth.loadAdminUserContext(payload.sub, payload.sid);
|
|
48
|
+
}
|
|
49
|
+
catch {
|
|
50
|
+
return null;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
44
53
|
extractToken(request) {
|
|
45
54
|
const header = request.headers['authorization'];
|
|
46
55
|
if (!header)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin.jwt.middleware.js","sourceRoot":"","sources":["../../../src/auth/middlewares/admin.jwt.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4D;AAC5D,qCAAyC;AAEzC,uFAAiF;AAEjF,sDAAkD;AAgB3C,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IAEvD,KAAK,CAAC,GAAG,CACP,OAAgB,EAChB,SAAmB,EACnB,IAAkB;QAElB,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACzC,IAAI,KAAK,
|
|
1
|
+
{"version":3,"file":"admin.jwt.middleware.js","sourceRoot":"","sources":["../../../src/auth/middlewares/admin.jwt.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4D;AAC5D,qCAAyC;AAEzC,uFAAiF;AAEjF,sDAAkD;AAgB3C,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IAEvD,KAAK,CAAC,GAAG,CACP,OAAgB,EAChB,SAAmB,EACnB,IAAkB;QAElB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAKnD,IAAI,OAAO,EAAE,CAAC;YACZ,sBAAS,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACxC,OAAO;QACT,CAAC;QACD,IAAI,EAAE,CAAC;IACT,CAAC;IAGO,KAAK,CAAC,cAAc,CAC1B,OAAgB;QAEhB,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAa,KAAK,EAAE;gBACnE,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;aACxC,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,CAAC,GAAG;gBAAE,OAAO,IAAI,CAAC;YAE9B,MAAM,OAAO,GAAG,MAAM,oDAAuB,CAAC,OAAO,CAAC;gBACpD,KAAK,EAAE,EAAE,kBAAkB,EAAE,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE;aAC3D,CAAC,CAAC;YACH,MAAM,MAAM,GACV,CAAC,CAAC,OAAO;gBACT,CAAC,OAAO,CAAC,cAAc;gBACvB,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC5C,IAAI,CAAC,MAAM;gBAAE,OAAO,IAAI,CAAC;YAEzB,OAAO,MAAM,sBAAS,CAAC,oBAAoB,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;QACxE,CAAC;QAAC,MAAM,CAAC;YAEP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAEO,YAAY,CAAC,OAAgB;QACnC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAChD,IAAI,CAAC,MAAM;YAAE,OAAO,SAAS,CAAC;QAC9B,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE,WAAW,EAAE,KAAK,QAAQ,IAAI,CAAC,KAAK;YAAE,OAAO,SAAS,CAAC;QACnE,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;CACF,CAAA;AAxDY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAE8B,gBAAU;GADxC,kBAAkB,CAwD9B"}
|
|
@@ -5,6 +5,7 @@ export declare class JwtMiddleware implements NestMiddleware {
|
|
|
5
5
|
private readonly jwtService;
|
|
6
6
|
constructor(jwtService: JwtService);
|
|
7
7
|
use(request: Request, _response: Response, next: NextFunction): Promise<void>;
|
|
8
|
+
private resolveContext;
|
|
8
9
|
private extractToken;
|
|
9
10
|
}
|
|
10
11
|
//# sourceMappingURL=jwt.middleware.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt.middleware.d.ts","sourceRoot":"","sources":["../../../src/auth/middlewares/jwt.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAkB1D,qBACa,aAAc,YAAW,cAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,EAAE,UAAU;IAE7C,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,QAAQ,EACnB,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"jwt.middleware.d.ts","sourceRoot":"","sources":["../../../src/auth/middlewares/jwt.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAkB1D,qBACa,aAAc,YAAW,cAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,EAAE,UAAU;IAE7C,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,QAAQ,EACnB,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC;YAcF,cAAc;IA4B5B,OAAO,CAAC,YAAY;CAOrB"}
|
|
@@ -19,28 +19,37 @@ let JwtMiddleware = class JwtMiddleware {
|
|
|
19
19
|
this.jwtService = jwtService;
|
|
20
20
|
}
|
|
21
21
|
async use(request, _response, next) {
|
|
22
|
-
const
|
|
23
|
-
if (
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
secret: process.env.ACCESS_TOKEN_SECRET,
|
|
27
|
-
});
|
|
28
|
-
if (payload.sid) {
|
|
29
|
-
const session = await system_auth_session_entity_1.SystemAuthSessionEntity.findOne({
|
|
30
|
-
where: { session_identifier: payload.sid, is_admin: false },
|
|
31
|
-
});
|
|
32
|
-
const active = !!session &&
|
|
33
|
-
!session.invalidated_at &&
|
|
34
|
-
session.expires_at.getTime() > Date.now();
|
|
35
|
-
if (active)
|
|
36
|
-
await auth_1.Auth.setUserContext(payload.sub, payload.sid);
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
catch {
|
|
40
|
-
}
|
|
22
|
+
const context = await this.resolveContext(request);
|
|
23
|
+
if (context) {
|
|
24
|
+
auth_1.Auth.runWithContext(context, next);
|
|
25
|
+
return;
|
|
41
26
|
}
|
|
42
27
|
next();
|
|
43
28
|
}
|
|
29
|
+
async resolveContext(request) {
|
|
30
|
+
const token = this.extractToken(request);
|
|
31
|
+
if (!token)
|
|
32
|
+
return null;
|
|
33
|
+
try {
|
|
34
|
+
const payload = await this.jwtService.verifyAsync(token, {
|
|
35
|
+
secret: process.env.ACCESS_TOKEN_SECRET,
|
|
36
|
+
});
|
|
37
|
+
if (!payload.sid)
|
|
38
|
+
return null;
|
|
39
|
+
const session = await system_auth_session_entity_1.SystemAuthSessionEntity.findOne({
|
|
40
|
+
where: { session_identifier: payload.sid, is_admin: false },
|
|
41
|
+
});
|
|
42
|
+
const active = !!session &&
|
|
43
|
+
!session.invalidated_at &&
|
|
44
|
+
session.expires_at.getTime() > Date.now();
|
|
45
|
+
if (!active)
|
|
46
|
+
return null;
|
|
47
|
+
return await auth_1.Auth.loadUserContext(payload.sub, payload.sid);
|
|
48
|
+
}
|
|
49
|
+
catch {
|
|
50
|
+
return null;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
44
53
|
extractToken(request) {
|
|
45
54
|
const header = request.headers['authorization'];
|
|
46
55
|
if (!header)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt.middleware.js","sourceRoot":"","sources":["../../../src/auth/middlewares/jwt.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4D;AAC5D,qCAAyC;AAEzC,uFAAiF;AAEjF,0CAAuC;AAgBhC,IAAM,aAAa,GAAnB,MAAM,aAAa;IACxB,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IAEvD,KAAK,CAAC,GAAG,CACP,OAAgB,EAChB,SAAmB,EACnB,IAAkB;QAElB,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACzC,IAAI,KAAK,
|
|
1
|
+
{"version":3,"file":"jwt.middleware.js","sourceRoot":"","sources":["../../../src/auth/middlewares/jwt.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4D;AAC5D,qCAAyC;AAEzC,uFAAiF;AAEjF,0CAAuC;AAgBhC,IAAM,aAAa,GAAnB,MAAM,aAAa;IACxB,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IAEvD,KAAK,CAAC,GAAG,CACP,OAAgB,EAChB,SAAmB,EACnB,IAAkB;QAElB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAKnD,IAAI,OAAO,EAAE,CAAC;YACZ,WAAI,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACnC,OAAO;QACT,CAAC;QACD,IAAI,EAAE,CAAC;IACT,CAAC;IAGO,KAAK,CAAC,cAAc,CAC1B,OAAgB;QAEhB,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAa,KAAK,EAAE;gBACnE,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;aACxC,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,CAAC,GAAG;gBAAE,OAAO,IAAI,CAAC;YAE9B,MAAM,OAAO,GAAG,MAAM,oDAAuB,CAAC,OAAO,CAAC;gBACpD,KAAK,EAAE,EAAE,kBAAkB,EAAE,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE;aAC5D,CAAC,CAAC;YACH,MAAM,MAAM,GACV,CAAC,CAAC,OAAO;gBACT,CAAC,OAAO,CAAC,cAAc;gBACvB,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC5C,IAAI,CAAC,MAAM;gBAAE,OAAO,IAAI,CAAC;YAEzB,OAAO,MAAM,WAAI,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9D,CAAC;QAAC,MAAM,CAAC;YAEP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAEO,YAAY,CAAC,OAAgB;QACnC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAChD,IAAI,CAAC,MAAM;YAAE,OAAO,SAAS,CAAC;QAC9B,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE,WAAW,EAAE,KAAK,QAAQ,IAAI,CAAC,KAAK;YAAE,OAAO,SAAS,CAAC;QACnE,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;CACF,CAAA;AAxDY,sCAAa;wBAAb,aAAa;IADzB,IAAA,mBAAU,GAAE;qCAE8B,gBAAU;GADxC,aAAa,CAwDzB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"access.revocation.d.ts","sourceRoot":"","sources":["../../../src/auth/utilities/access.revocation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAU,MAAM,SAAS,CAAC;AAgBhD,qBAAa,gBAAgB;WACd,SAAS,CACpB,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,IAAI,CAAC;CAejB"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AccessRevocation = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
5
|
+
const system_auth_session_entity_1 = require("../entities/system.auth.session.entity");
|
|
6
|
+
const system_refresh_token_entity_1 = require("../entities/system.refresh.token.entity");
|
|
7
|
+
class AccessRevocation {
|
|
8
|
+
static async revokeAll(manager, userId, isAdmin) {
|
|
9
|
+
const now = new Date();
|
|
10
|
+
await manager.update(system_auth_session_entity_1.SystemAuthSessionEntity, { user_id: userId, is_admin: isAdmin, invalidated_at: (0, typeorm_1.IsNull)() }, { invalidated_at: now });
|
|
11
|
+
await manager.update(system_refresh_token_entity_1.SystemRefreshTokenEntity, { user_id: userId, is_admin: isAdmin, revoked_at: (0, typeorm_1.IsNull)() }, { revoked_at: now });
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
exports.AccessRevocation = AccessRevocation;
|
|
15
|
+
//# sourceMappingURL=access.revocation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"access.revocation.js","sourceRoot":"","sources":["../../../src/auth/utilities/access.revocation.ts"],"names":[],"mappings":";;;AAAA,qCAAgD;AAChD,uFAAiF;AACjF,yFAAmF;AAcnF,MAAa,gBAAgB;IAC3B,MAAM,CAAC,KAAK,CAAC,SAAS,CACpB,OAAsB,EACtB,MAAc,EACd,OAAgB;QAEhB,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QAEvB,MAAM,OAAO,CAAC,MAAM,CAClB,oDAAuB,EACvB,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,IAAA,gBAAM,GAAE,EAAE,EAChE,EAAE,cAAc,EAAE,GAAG,EAAE,CACxB,CAAC;QAEF,MAAM,OAAO,CAAC,MAAM,CAClB,sDAAwB,EACxB,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,IAAA,gBAAM,GAAE,EAAE,EAC5D,EAAE,UAAU,EAAE,GAAG,EAAE,CACpB,CAAC;IACJ,CAAC;CACF;AApBD,4CAoBC"}
|
|
@@ -1,17 +1,21 @@
|
|
|
1
1
|
import { WorkerHost } from '@nestjs/bullmq';
|
|
2
|
-
import { OnApplicationBootstrap } from '@nestjs/common';
|
|
2
|
+
import { OnApplicationBootstrap, OnModuleDestroy } from '@nestjs/common';
|
|
3
3
|
import { Job } from 'bullmq';
|
|
4
4
|
import { QueueService } from '../services/queue.service';
|
|
5
|
-
export declare class JobConsumer extends WorkerHost implements OnApplicationBootstrap {
|
|
5
|
+
export declare class JobConsumer extends WorkerHost implements OnApplicationBootstrap, OnModuleDestroy {
|
|
6
6
|
private readonly queueService;
|
|
7
7
|
private readonly logger;
|
|
8
8
|
private bootstrapped;
|
|
9
9
|
private workerReady;
|
|
10
10
|
private enrolment;
|
|
11
|
+
private readonly onUnhandledRejection;
|
|
12
|
+
private readonly onUncaughtException;
|
|
11
13
|
constructor(queueService: QueueService);
|
|
12
14
|
onApplicationBootstrap(): Promise<void>;
|
|
13
15
|
private enrolWhenReady;
|
|
14
16
|
process(job: Job): Promise<any>;
|
|
17
|
+
onModuleDestroy(): void;
|
|
18
|
+
private guardProcess;
|
|
15
19
|
private setWorker;
|
|
16
20
|
private handleNextJob;
|
|
17
21
|
onActive(job: Job): void;
|
|
@@ -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,
|
|
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,EAEL,sBAAsB,EACtB,eAAe,EAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAyBzD,qBAIa,WACX,SAAQ,UACR,YAAW,sBAAsB,EAAE,eAAe;IAgCtC,OAAO,CAAC,QAAQ,CAAC,YAAY;IA9BzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA6B;IAGpD,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,WAAW,CAAS;IAE5B,OAAO,CAAC,SAAS,CAA8B;IAO/C,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAOnC;IAEF,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAKlC;gBAE2B,YAAY,EAAE,YAAY;IASjD,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;YAoC/B,cAAc;IAmBtB,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAqBrC,eAAe,IAAI,IAAI;IA2BvB,OAAO,CAAC,YAAY;IAYpB,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;IAiBvC,QAAQ,IAAI,IAAI;IAKhB,SAAS,IAAI,IAAI;IAKjB,OAAO,IAAI,IAAI;YAgBD,yBAAyB;YAyBzB,mBAAmB;YAanB,cAAc;IA2B5B,OAAO,CAAC,OAAO;IAKf,OAAO,CAAC,OAAO;CAOhB"}
|
|
@@ -27,8 +27,15 @@ let JobConsumer = class JobConsumer extends bullmq_1.WorkerHost {
|
|
|
27
27
|
this.bootstrapped = false;
|
|
28
28
|
this.workerReady = false;
|
|
29
29
|
this.enrolment = null;
|
|
30
|
+
this.onUnhandledRejection = (reason) => {
|
|
31
|
+
this.logger.error(`Unhandled rejection in worker process: ${reason instanceof Error ? reason.message : String(reason)}`, reason instanceof Error ? reason.stack : undefined);
|
|
32
|
+
};
|
|
33
|
+
this.onUncaughtException = (error) => {
|
|
34
|
+
this.logger.error(`Uncaught exception in worker process: ${error.message}`, error.stack);
|
|
35
|
+
};
|
|
30
36
|
}
|
|
31
37
|
async onApplicationBootstrap() {
|
|
38
|
+
this.guardProcess();
|
|
32
39
|
this.setWorker();
|
|
33
40
|
if (!this.worker.isRunning())
|
|
34
41
|
this.worker.run().catch((error) => {
|
|
@@ -64,6 +71,18 @@ let JobConsumer = class JobConsumer extends bullmq_1.WorkerHost {
|
|
|
64
71
|
await this.handleNextJob(data.nextQueuePayload);
|
|
65
72
|
return response;
|
|
66
73
|
}
|
|
74
|
+
onModuleDestroy() {
|
|
75
|
+
process.off('unhandledRejection', this.onUnhandledRejection);
|
|
76
|
+
process.off('uncaughtException', this.onUncaughtException);
|
|
77
|
+
}
|
|
78
|
+
guardProcess() {
|
|
79
|
+
if (process
|
|
80
|
+
.listeners('unhandledRejection')
|
|
81
|
+
.includes(this.onUnhandledRejection))
|
|
82
|
+
return;
|
|
83
|
+
process.on('unhandledRejection', this.onUnhandledRejection);
|
|
84
|
+
process.on('uncaughtException', this.onUncaughtException);
|
|
85
|
+
}
|
|
67
86
|
setWorker() {
|
|
68
87
|
if (this.queueService.workerInstance)
|
|
69
88
|
return;
|
|
@@ -105,7 +124,8 @@ let JobConsumer = class JobConsumer extends bullmq_1.WorkerHost {
|
|
|
105
124
|
async onFailed(job) {
|
|
106
125
|
this.queueService.data.stats.pending_jobs = Math.max(0, this.queueService.data.stats.pending_jobs - 1);
|
|
107
126
|
this.queueService.data.stats.failed_jobs++;
|
|
108
|
-
|
|
127
|
+
const attempt = `attempt ${job?.attemptsMade ?? 0}/${job?.opts?.attempts ?? 1}`;
|
|
128
|
+
this.logger.error(`[FAILED] ${job?.id} : ${this.jobName(job)}${this.elapsed(job)} (${attempt}) - ${job?.failedReason || 'no reason reported'}`, (job?.stacktrace ?? []).join('\n') || undefined);
|
|
109
129
|
await this.persistFinalFailure(job);
|
|
110
130
|
}
|
|
111
131
|
onPaused() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job.consumer.js","sourceRoot":"","sources":["../../../src/common/consumers/job.consumer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAsE;AACtE,
|
|
1
|
+
{"version":3,"file":"job.consumer.js","sourceRoot":"","sources":["../../../src/common/consumers/job.consumer.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,8 +24,8 @@ import { SystemScheduledTaskSubscriber } from './subscribers/system.scheduled.ta
|
|
|
24
24
|
export declare const es6Classes: {
|
|
25
25
|
controllers: any[];
|
|
26
26
|
services: readonly [typeof AuditService, typeof CacheService, typeof EncryptionService, typeof FeatureFlagService, typeof MonitoringService, typeof QueueService, typeof RemoteRequestService, typeof SqlService, typeof SystemPropertyService];
|
|
27
|
-
libraries: (typeof CommonDataProcessor | typeof
|
|
28
|
-
dtos: (typeof
|
|
27
|
+
libraries: (typeof CommonDataProcessor | typeof CommonListProcessor | typeof CronScheduleResolver | typeof IntervalScheduleResolver | typeof OnceScheduleResolver)[];
|
|
28
|
+
dtos: (typeof FilterDto | typeof SortDto | typeof CommonListFilterDto | typeof CommonPayloadDto | typeof DatabaseEventDto)[];
|
|
29
29
|
jobs: (typeof DispatchScheduledEventJob | typeof SetScheduledEventJob | typeof SystemScheduledTaskJob)[];
|
|
30
30
|
subscribers: (typeof SystemScheduledTaskSubscriber)[];
|
|
31
31
|
};
|
|
@@ -11,6 +11,7 @@ export declare abstract class CommonJob {
|
|
|
11
11
|
constructor(identifier: string);
|
|
12
12
|
getIdentifier(): string;
|
|
13
13
|
abstract handle(data: any): Promise<void>;
|
|
14
|
+
execute(data: any): Promise<void>;
|
|
14
15
|
dispatch(data?: any, options?: AddJobOptions): Promise<DispatchedJobInfo>;
|
|
15
16
|
delayedDispatch(data?: any, options?: AddJobOptions): Promise<DispatchedJobInfo>;
|
|
16
17
|
protected isNewRecord(event: DatabaseEventDto<any>): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.job.d.ts","sourceRoot":"","sources":["../../../src/common/jobs/common.job.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,8BAAsB,SAAS;IAQjB,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM;IAPjD,SAAS,CAAC,QAAQ,CAAC,MAAM,SAAqC;IAGvD,cAAc,EAAE,OAAO,CAAS;IAChC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAa;IAChD,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;gBAExB,UAAU,EAAE,MAAM;IAGjD,aAAa,IAAI,MAAM;IAIvB,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"common.job.d.ts","sourceRoot":"","sources":["../../../src/common/jobs/common.job.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,8BAAsB,SAAS;IAQjB,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM;IAPjD,SAAS,CAAC,QAAQ,CAAC,MAAM,SAAqC;IAGvD,cAAc,EAAE,OAAO,CAAS;IAChC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAa;IAChD,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;gBAExB,UAAU,EAAE,MAAM;IAGjD,aAAa,IAAI,MAAM;IAIvB,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBnC,OAAO,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAcjC,QAAQ,CACZ,IAAI,CAAC,EAAE,GAAG,EACV,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,iBAAiB,CAAC;IAQvB,eAAe,CACnB,IAAI,CAAC,EAAE,GAAG,EACV,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,iBAAiB,CAAC;IAW7B,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,gBAAgB,CAAC,GAAG,CAAC,GAAG,OAAO;IAO5D,SAAS,CAAC,eAAe,CACvB,KAAK,EAAE,gBAAgB,CAAC,GAAG,CAAC,EAC5B,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GACxB,OAAO;IAQV,SAAS,CAAC,kBAAkB,CAC1B,KAAK,EAAE,gBAAgB,CAAC,GAAG,CAAC,EAC5B,OAAO,EAAE,MAAM,EAAE,GAChB,OAAO;CAGX"}
|
|
@@ -12,6 +12,15 @@ class CommonJob {
|
|
|
12
12
|
getIdentifier() {
|
|
13
13
|
return this.identifier;
|
|
14
14
|
}
|
|
15
|
+
async execute(data) {
|
|
16
|
+
try {
|
|
17
|
+
await this.handle(data);
|
|
18
|
+
}
|
|
19
|
+
catch (error) {
|
|
20
|
+
this.logger.error(`Job "${this.identifier}" failed: ${error instanceof Error ? error.message : String(error)}`, error instanceof Error ? error.stack : undefined);
|
|
21
|
+
throw error;
|
|
22
|
+
}
|
|
23
|
+
}
|
|
15
24
|
async dispatch(data, options) {
|
|
16
25
|
return this.queueService.addJob(this.identifier, data, {
|
|
17
26
|
...(options || {}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.job.js","sourceRoot":"","sources":["../../../src/common/jobs/common.job.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AAKxC,MAAsB,SAAS;IAQ7B,YAA+B,UAAkB;QAAlB,eAAU,GAAV,UAAU,CAAQ;QAP9B,WAAM,GAAG,IAAI,eAAM,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAGvD,mBAAc,GAAY,KAAK,CAAC;QAChC,aAAQ,GAAuB,SAAS,CAAC;IAGI,CAAC;IAGrD,aAAa;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;
|
|
1
|
+
{"version":3,"file":"common.job.js","sourceRoot":"","sources":["../../../src/common/jobs/common.job.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AAKxC,MAAsB,SAAS;IAQ7B,YAA+B,UAAkB;QAAlB,eAAU,GAAV,UAAU,CAAQ;QAP9B,WAAM,GAAG,IAAI,eAAM,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAGvD,mBAAc,GAAY,KAAK,CAAC;QAChC,aAAQ,GAAuB,SAAS,CAAC;IAGI,CAAC;IAGrD,aAAa;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAoBD,KAAK,CAAC,OAAO,CAAC,IAAS;QACrB,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,QAAQ,IAAI,CAAC,UAAU,aACrB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CACvD,EAAE,EACF,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CACjD,CAAC;YACF,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,IAAU,EACV,OAAuB;QAEvB,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE;YACrD,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;YAElB,cAAc,EAAE,OAAO,EAAE,cAAc,IAAI,IAAI,CAAC,cAAc;SAC/D,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,IAAU,EACV,OAAuB;QAEvB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;YACzB,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;YAClB,KAAK,EAAE,OAAO,EAAE,KAAK,IAAI,GAAG;SAC7B,CAAC,CAAC;IACL,CAAC;IAMS,WAAW,CAAC,KAA4B;QAChD,IAAI,KAAK,EAAE,SAAS,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;QAC/C,MAAM,QAAQ,GAAG,KAAK,EAAE,cAA8C,CAAC;QACvE,OAAO,QAAQ,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC1C,CAAC;IAGS,eAAe,CACvB,KAA4B,EAC5B,MAAyB;QAEzB,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QACzC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAC1D,MAAM,OAAO,GAAG,CAAC,KAAK,EAAE,cAAc,IAAI,EAAE,CAAa,CAAC;QAC1D,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IACtD,CAAC;IAGS,kBAAkB,CAC1B,KAA4B,EAC5B,OAAiB;QAEjB,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC;CACF;AAhGD,8BAgGC"}
|
|
@@ -18,6 +18,8 @@ export declare class CommonListProcessor {
|
|
|
18
18
|
private constructFinalQuery;
|
|
19
19
|
private constructOrderByStatement;
|
|
20
20
|
private constructFilterConditions;
|
|
21
|
+
private constructSoftDeleteCondition;
|
|
22
|
+
private constructSearchCondition;
|
|
21
23
|
private resolveColumn;
|
|
22
24
|
private transformFilterValue;
|
|
23
25
|
private splitFilterValue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.list.processor.d.ts","sourceRoot":"","sources":["../../../src/common/libraries/common.list.processor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAMrE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAEL,sBAAsB,EAEvB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"common.list.processor.d.ts","sourceRoot":"","sources":["../../../src/common/libraries/common.list.processor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAMrE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAEL,sBAAsB,EAEvB,MAAM,qBAAqB,CAAC;AAc7B,qBAAa,mBAAmB;IAC9B,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAC1C,SAAS,CAAC,MAAM,EAAE,sBAAsB,CAAC;IACzC,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAC;IAEvC,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,CAAM;IACpC,SAAS,CAAC,YAAY,EAAE,SAAS,CAAM;cAEvB,MAAM;;;;;;;IA4BtB,OAAO,CAAC,mBAAmB;IA8B3B,OAAO,CAAC,yBAAyB;IA+BjC,OAAO,CAAC,yBAAyB;IAgCjC,OAAO,CAAC,4BAA4B;IAyBpC,OAAO,CAAC,wBAAwB;IAqBhC,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,oBAAoB;IA2B5B,OAAO,CAAC,gBAAgB;IAaxB,OAAO,CAAC,eAAe;CAiCxB"}
|
|
@@ -7,6 +7,11 @@ const filter_value_type_enum_1 = require("../enums/filter.value.type.enum");
|
|
|
7
7
|
const sort_direction_enum_1 = require("../enums/sort.direction.enum");
|
|
8
8
|
const sql_default_enum_1 = require("../enums/sql.default.enum");
|
|
9
9
|
const filter_operator_registry_1 = require("./filter.operator.registry");
|
|
10
|
+
const SEARCH_PARAM = 'search_str';
|
|
11
|
+
const SOFT_DELETE_COLUMN = 'deleted_at';
|
|
12
|
+
function escapeLikePattern(value) {
|
|
13
|
+
return value.replace(/[\\%_]/g, (character) => `\\${character}`);
|
|
14
|
+
}
|
|
10
15
|
class CommonListProcessor {
|
|
11
16
|
constructor() {
|
|
12
17
|
this.conditions = [];
|
|
@@ -14,6 +19,8 @@ class CommonListProcessor {
|
|
|
14
19
|
}
|
|
15
20
|
async handle() {
|
|
16
21
|
this.constructFilterConditions();
|
|
22
|
+
this.constructSearchCondition();
|
|
23
|
+
this.constructSoftDeleteCondition();
|
|
17
24
|
const finalQuery = this.constructFinalQuery();
|
|
18
25
|
const page = Math.max(this.payload?.page ?? sql_default_enum_1.SqlDefault.PAGE, 1);
|
|
19
26
|
const limit = Math.max(this.payload?.limit ?? sql_default_enum_1.SqlDefault.LIMIT, 1);
|
|
@@ -71,6 +78,30 @@ class CommonListProcessor {
|
|
|
71
78
|
Object.assign(this.filterParams, params);
|
|
72
79
|
}
|
|
73
80
|
}
|
|
81
|
+
constructSoftDeleteCondition() {
|
|
82
|
+
if (this.config.includeDeleted)
|
|
83
|
+
return;
|
|
84
|
+
const column = this.config.columns.find((candidate) => candidate.identifier === SOFT_DELETE_COLUMN);
|
|
85
|
+
if (!column)
|
|
86
|
+
return;
|
|
87
|
+
const filtered = (this.payload?.filters ?? []).some((filter) => filter.identifier === SOFT_DELETE_COLUMN);
|
|
88
|
+
if (filtered)
|
|
89
|
+
return;
|
|
90
|
+
this.conditions.push(`${SOFT_DELETE_COLUMN} IS NULL`);
|
|
91
|
+
}
|
|
92
|
+
constructSearchCondition() {
|
|
93
|
+
const term = this.payload?.str?.trim();
|
|
94
|
+
if (!term)
|
|
95
|
+
return;
|
|
96
|
+
const columns = this.config.columns.filter((column) => column.searchable);
|
|
97
|
+
if (!columns.length)
|
|
98
|
+
throw new operation_exception_1.OperationException('This list does not support free-text search');
|
|
99
|
+
const clause = columns
|
|
100
|
+
.map((column) => `CAST(${column.identifier} AS TEXT) ILIKE :${SEARCH_PARAM} ESCAPE '\\'`)
|
|
101
|
+
.join(' or ');
|
|
102
|
+
this.conditions.push(clause);
|
|
103
|
+
this.filterParams[SEARCH_PARAM] = `%${escapeLikePattern(term)}%`;
|
|
104
|
+
}
|
|
74
105
|
resolveColumn(identifier) {
|
|
75
106
|
const column = this.config.columns.find((candidate) => candidate.identifier === identifier);
|
|
76
107
|
if (!column)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.list.processor.js","sourceRoot":"","sources":["../../../src/common/libraries/common.list.processor.ts"],"names":[],"mappings":";;;AAAA,qFAAiF;AAGjF,wEAAmE;AACnE,4EAAsE;AACtE,sEAA6D;AAC7D,gEAAuD;AAQvD,yEAA8D;
|
|
1
|
+
{"version":3,"file":"common.list.processor.js","sourceRoot":"","sources":["../../../src/common/libraries/common.list.processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.service.d.ts","sourceRoot":"","sources":["../../../src/common/services/queue.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,MAAM,EACN,eAAe,EACf,YAAY,EACb,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAc,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,eAAe,EAEf,WAAW,EACX,UAAU,EACV,WAAW,EACX,UAAU,EACX,MAAM,sBAAsB,CAAC;AAE9B,YAAY,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,qBACa,YAAa,YAAW,YAAY,EAAE,eAAe;IAmB9D,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;IArBnC,SAAS,CAAC,QAAQ,CAAC,MAAM,SAA8B;IAEhD,cAAc,EAAE,MAAM,GAAG,IAAI,CAAQ;IACrC,IAAI,EAAE;QACX,UAAU,EAAE,MAAM,CAAC;QACnB,KAAK,EAAE,UAAU,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,OAAO,CAAC;QACjB,UAAU,EAAE,OAAO,CAAC;KACrB,CAAC;IACK,SAAS,EAAE,MAAM,CAAC;IAEzB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAGxB;gBAGe,aAAa,EAAE,KAAK,EACpB,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,gBAAgB,EAC3B,eAAe,CAAC,EAAE,WAAW;IAyBhD,YAAY,IAAI,IAAI;
|
|
1
|
+
{"version":3,"file":"queue.service.d.ts","sourceRoot":"","sources":["../../../src/common/services/queue.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,7 +47,7 @@ let QueueService = class QueueService {
|
|
|
47
47
|
const instance = wrapper.instance;
|
|
48
48
|
if (instance instanceof common_job_1.CommonJob) {
|
|
49
49
|
const identifier = instance.getIdentifier();
|
|
50
|
-
this.registerJob(identifier, instance, (data) => instance.
|
|
50
|
+
this.registerJob(identifier, instance, (data) => instance.execute(data));
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
this.validateExpectedJobs();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.service.js","sourceRoot":"","sources":["../../../src/common/services/queue.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"queue.service.js","sourceRoot":"","sources":["../../../src/common/services/queue.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,9 +12,11 @@ export interface CommonListFilterConfig {
|
|
|
12
12
|
query: string;
|
|
13
13
|
columns: CommonFilterColumn[];
|
|
14
14
|
defaultSort?: SortConfig;
|
|
15
|
+
includeDeleted?: boolean;
|
|
15
16
|
}
|
|
16
17
|
export interface CommonFilterColumn {
|
|
17
18
|
key: string;
|
|
18
19
|
identifier: string;
|
|
20
|
+
searchable?: boolean;
|
|
19
21
|
}
|
|
20
22
|
//# sourceMappingURL=list.types.d.ts.map
|