@hed-hog/core 0.0.140 → 0.0.144
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/auth/auth.service.js +3 -3
- package/dist/auth/auth.service.js.map +1 -1
- package/dist/auth/guards/auth.guard.d.ts.map +1 -1
- package/dist/auth/guards/auth.guard.js +10 -0
- package/dist/auth/guards/auth.guard.js.map +1 -1
- package/dist/role/guards/role.guard.d.ts.map +1 -1
- package/dist/role/guards/role.guard.js +4 -1
- package/dist/role/guards/role.guard.js.map +1 -1
- package/dist/session/session.controller.d.ts +12 -3
- package/dist/session/session.controller.d.ts.map +1 -1
- package/dist/session/session.controller.js +26 -10
- package/dist/session/session.controller.js.map +1 -1
- package/dist/session/session.service.d.ts +10 -3
- package/dist/session/session.service.d.ts.map +1 -1
- package/dist/session/session.service.js +69 -11
- package/dist/session/session.service.js.map +1 -1
- package/dist/token/token.module.d.ts.map +1 -1
- package/dist/token/token.module.js +2 -0
- package/dist/token/token.module.js.map +1 -1
- package/dist/token/token.service.d.ts +3 -1
- package/dist/token/token.service.d.ts.map +1 -1
- package/dist/token/token.service.js +30 -6
- package/dist/token/token.service.js.map +1 -1
- package/hedhog/data/route.yaml +10 -0
- package/package.json +3 -3
- package/src/auth/auth.service.ts +8 -8
- package/src/auth/guards/auth.guard.ts +18 -5
- package/src/language/en.json +2 -1
- package/src/language/pt.json +2 -1
- package/src/role/guards/role.guard.ts +7 -1
- package/src/session/session.controller.ts +22 -7
- package/src/session/session.service.ts +90 -11
- package/src/token/token.module.ts +2 -0
- package/src/token/token.service.ts +29 -1
|
@@ -68,9 +68,9 @@ let AuthService = class AuthService {
|
|
|
68
68
|
this.challenge = challenge;
|
|
69
69
|
}
|
|
70
70
|
async getAuthenticationPayload(locale, userId, ipAddress, userAgent) {
|
|
71
|
-
const payload = { sub: userId };
|
|
72
|
-
const accessToken = await this.token.createAccessToken(payload);
|
|
73
71
|
const { token: refreshToken, session } = await this.session.create(locale, userId, ipAddress, userAgent);
|
|
72
|
+
const payload = { sub: userId, sessionId: session.id };
|
|
73
|
+
const accessToken = await this.token.createAccessToken(payload);
|
|
74
74
|
return {
|
|
75
75
|
accessToken,
|
|
76
76
|
refreshToken,
|
|
@@ -382,7 +382,7 @@ let AuthService = class AuthService {
|
|
|
382
382
|
}
|
|
383
383
|
const { session, token } = await this.session.refresh(locale, refreshToken, ipAddress, userAgent);
|
|
384
384
|
const user = await this.user.findUserById(locale, session.user_id);
|
|
385
|
-
const payload = { sub: user.id };
|
|
385
|
+
const payload = { sub: user.id, sessionId: session.id };
|
|
386
386
|
const accessToken = await this.token.createAccessToken(payload);
|
|
387
387
|
return { accessToken, refreshToken: token, session };
|
|
388
388
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/auth/auth.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/auth/auth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.guard.d.ts","sourceRoot":"","sources":["../../../src/auth/guards/auth.guard.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"auth.guard.d.ts","sourceRoot":"","sources":["../../../src/auth/guards/auth.guard.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,WAAW,EACX,gBAAgB,EAGjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,qBACa,SAAU,YAAW,WAAW;IAEzC,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,SAAS;gBADT,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,SAAS;IAGxB,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAiD9D,OAAO,CAAC,sBAAsB;CAK/B"}
|
|
@@ -25,14 +25,24 @@ let AuthGuard = class AuthGuard {
|
|
|
25
25
|
context.getHandler(),
|
|
26
26
|
context.getClass(),
|
|
27
27
|
]);
|
|
28
|
+
const withRole = this.reflector.getAllAndOverride(api_1.WITH_ROLE, [
|
|
29
|
+
context.getHandler(),
|
|
30
|
+
context.getClass(),
|
|
31
|
+
]);
|
|
28
32
|
const request = context.switchToHttp().getRequest();
|
|
29
33
|
const token = this.extractTokenFromHeader(request);
|
|
30
34
|
const locale = request.headers['locale'] || request.headers['accept-language'] || 'en';
|
|
35
|
+
// If endpoint requires role/authentication and no token provided
|
|
31
36
|
if (!token) {
|
|
32
37
|
if (isPublic) {
|
|
33
38
|
return true;
|
|
34
39
|
}
|
|
40
|
+
else if (withRole) {
|
|
41
|
+
// @Role() decorator requires authentication
|
|
42
|
+
throw new common_1.UnauthorizedException((0, api_locale_1.getLocaleText)('accessDenied', locale, 'Access denied.'));
|
|
43
|
+
}
|
|
35
44
|
else {
|
|
45
|
+
// No explicit decorator, default behavior (deny)
|
|
36
46
|
throw new common_1.UnauthorizedException((0, api_locale_1.getLocaleText)('accessDenied', locale, 'Access denied.'));
|
|
37
47
|
}
|
|
38
48
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.guard.js","sourceRoot":"","sources":["../../../src/auth/guards/auth.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"auth.guard.js","sourceRoot":"","sources":["../../../src/auth/guards/auth.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sCAAwD;AACxD,oDAAoD;AACpD,2CAKwB;AACxB,uCAAyC;AAEzC,6DAAyD;AAGlD,IAAM,SAAS,GAAf,MAAM,SAAS;IACpB,YACU,KAAmB,EACnB,SAAoB;QADpB,UAAK,GAAL,KAAK,CAAc;QACnB,cAAS,GAAT,SAAS,CAAW;IAC1B,CAAC;IAEL,KAAK,CAAC,WAAW,CAAC,OAAyB;QACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAU,mBAAa,EAAE;YACxE,OAAO,CAAC,UAAU,EAAE;YACpB,OAAO,CAAC,QAAQ,EAAE;SACnB,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAU,eAAS,EAAE;YACpE,OAAO,CAAC,UAAU,EAAE;YACpB,OAAO,CAAC,QAAQ,EAAE;SACnB,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;QACpD,MAAM,KAAK,GAAG,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;QACnD,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,IAAI,CAAC;QAEvF,iEAAiE;QACjE,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,IAAI,QAAQ,EAAE,CAAC;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,IAAI,QAAQ,EAAE,CAAC;gBACpB,4CAA4C;gBAC5C,MAAM,IAAI,8BAAqB,CAC7B,IAAA,0BAAa,EAAC,cAAc,EAAE,MAAM,EAAE,gBAAgB,CAAC,CACxD,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,iDAAiD;gBACjD,MAAM,IAAI,8BAAqB,CAC7B,IAAA,0BAAa,EAAC,cAAc,EAAE,MAAM,EAAE,gBAAgB,CAAC,CACxD,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAEvD,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC;QAC5B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,QAAQ,EAAE,CAAC;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,6DAA6D;gBAC7D,MAAM,OAAO,GAAG,CAAC,KAAa,aAAb,KAAK,uBAAL,KAAK,CAAU,OAAO,MAAK,KAAa,aAAb,KAAK,uBAAL,KAAK,CAAU,IAAI,CAAA,IAAI,cAAc,CAAC;gBAClF,MAAM,IAAI,8BAAqB,CAAC,OAAO,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,sBAAsB,CAAC,OAAgB;;QAC7C,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,MAAA,MAAA,OAAO,CAAC,OAAO,CAAC,aAAa,0CAAE,KAAK,CAAC,GAAG,CAAC,mCAAI,EAAE,CAAC;QAEtE,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/C,CAAC;CACF,CAAA;AA5DY,8BAAS;oBAAT,SAAS;IADrB,IAAA,mBAAU,GAAE;qCAGM,4BAAY;QACR,gBAAS;GAHnB,SAAS,CA4DrB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.guard.d.ts","sourceRoot":"","sources":["../../../src/role/guards/role.guard.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EACL,WAAW,EACX,gBAAgB,EAMjB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,qBACa,SAAU,YAAW,WAAW;IAEzC,OAAO,CAAC,SAAS;IAEjB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAFf,SAAS,EAAE,SAAS,EAEX,MAAM,EAAE,aAAa;IAGlC,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"role.guard.d.ts","sourceRoot":"","sources":["../../../src/role/guards/role.guard.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EACL,WAAW,EACX,gBAAgB,EAMjB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,qBACa,SAAU,YAAW,WAAW;IAEzC,OAAO,CAAC,SAAS;IAEjB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAFf,SAAS,EAAE,SAAS,EAEX,MAAM,EAAE,aAAa;IAGlC,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAmG9D,OAAO,CAAC,sBAAsB;CAI/B"}
|
|
@@ -98,7 +98,10 @@ let RoleGuard = class RoleGuard {
|
|
|
98
98
|
},
|
|
99
99
|
},
|
|
100
100
|
});
|
|
101
|
-
|
|
101
|
+
if (route !== 1) {
|
|
102
|
+
throw new common_1.UnauthorizedException(`Access denied. User does not have permission to access ${httpMethod} ${fullPath}`);
|
|
103
|
+
}
|
|
104
|
+
return true;
|
|
102
105
|
}
|
|
103
106
|
extractTokenFromHeader(request) {
|
|
104
107
|
var _a, _b;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.guard.js","sourceRoot":"","sources":["../../../src/role/guards/role.guard.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"role.guard.js","sourceRoot":"","sources":["../../../src/role/guards/role.guard.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,18 @@ import { SessionService } from './session.service';
|
|
|
3
3
|
export declare class SessionController {
|
|
4
4
|
private readonly sessionService;
|
|
5
5
|
constructor(sessionService: SessionService);
|
|
6
|
+
getUserSessionsActive(paginationParams: PaginationDTO, { id }: {
|
|
7
|
+
id: any;
|
|
8
|
+
}, locale: string): Promise<{
|
|
9
|
+
data: any[];
|
|
10
|
+
total: any;
|
|
11
|
+
lastPage: number;
|
|
12
|
+
page: number;
|
|
13
|
+
pageSize: number;
|
|
14
|
+
}>;
|
|
6
15
|
getUserSessions(paginationParams: PaginationDTO, { id }: {
|
|
7
16
|
id: any;
|
|
8
|
-
}): Promise<{
|
|
17
|
+
}, locale: string): Promise<{
|
|
9
18
|
data: any[];
|
|
10
19
|
total: any;
|
|
11
20
|
lastPage: number;
|
|
@@ -14,13 +23,13 @@ export declare class SessionController {
|
|
|
14
23
|
}>;
|
|
15
24
|
revokeAllOtherSessions({ id }: {
|
|
16
25
|
id: any;
|
|
17
|
-
}): Promise<import("@prisma/client").Prisma.BatchPayload>;
|
|
26
|
+
}, sessionId: number): Promise<import("@prisma/client").Prisma.BatchPayload>;
|
|
18
27
|
revokeAllSessions({ id }: {
|
|
19
28
|
id: any;
|
|
20
29
|
}): Promise<import("@prisma/client").Prisma.BatchPayload>;
|
|
21
30
|
revokeSession({ id: userId }: {
|
|
22
31
|
id: any;
|
|
23
|
-
}, sessionId: number): Promise<{
|
|
32
|
+
}, sessionId: number, locale: string): Promise<{
|
|
24
33
|
id: number;
|
|
25
34
|
hash: string;
|
|
26
35
|
created_at: Date;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.controller.d.ts","sourceRoot":"","sources":["../../src/session/session.controller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session.controller.d.ts","sourceRoot":"","sources":["../../src/session/session.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAEpE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,qBAEa,iBAAiB;IAEtB,OAAO,CAAC,QAAQ,CAAC,cAAc;gBAAd,cAAc,EAAE,cAAc;IAI7C,qBAAqB,CACT,gBAAgB,EAAE,aAAa,EACrC,EAAE,EAAE,EAAE;;KAAA,EACJ,MAAM,EAAE,MAAM;;;;;;;IAMtB,eAAe,CACH,gBAAgB,EAAE,aAAa,EACrC,EAAE,EAAE,EAAE;;KAAA,EACJ,MAAM,EAAE,MAAM;;;;;;;IAMtB,sBAAsB,CAAS,EAAE,EAAE,EAAE;;KAAA,EAAa,SAAS,EAAE,MAAM;IAKnE,iBAAiB,CAAS,EAAE,EAAE,EAAE;;KAAA;IAKhC,aAAa,CACP,EAAE,EAAE,EAAE,MAAM,EAAE;;KAAA,EACY,SAAS,EAAE,MAAM,EACzC,MAAM,EAAE,MAAM;;;;;;;;;;;CAI/B"}
|
|
@@ -14,6 +14,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.SessionController = void 0;
|
|
16
16
|
const api_1 = require("@hed-hog/api");
|
|
17
|
+
const api_locale_1 = require("@hed-hog/api-locale");
|
|
17
18
|
const api_pagination_1 = require("@hed-hog/api-pagination");
|
|
18
19
|
const common_1 = require("@nestjs/common");
|
|
19
20
|
const session_service_1 = require("./session.service");
|
|
@@ -21,33 +22,47 @@ let SessionController = class SessionController {
|
|
|
21
22
|
constructor(sessionService) {
|
|
22
23
|
this.sessionService = sessionService;
|
|
23
24
|
}
|
|
24
|
-
async
|
|
25
|
-
return this.sessionService.
|
|
25
|
+
async getUserSessionsActive(paginationParams, { id }, locale) {
|
|
26
|
+
return this.sessionService.getUserSessionsActive(paginationParams, id, locale);
|
|
26
27
|
}
|
|
27
|
-
async
|
|
28
|
-
return this.sessionService.
|
|
28
|
+
async getUserSessions(paginationParams, { id }, locale) {
|
|
29
|
+
return this.sessionService.getUserSessions(paginationParams, id, locale);
|
|
30
|
+
}
|
|
31
|
+
async revokeAllOtherSessions({ id }, sessionId) {
|
|
32
|
+
return this.sessionService.revokeAllOtherSessions(id, sessionId);
|
|
29
33
|
}
|
|
30
34
|
async revokeAllSessions({ id }) {
|
|
31
35
|
return this.sessionService.revokeAllSessions(id);
|
|
32
36
|
}
|
|
33
|
-
async revokeSession({ id: userId }, sessionId) {
|
|
34
|
-
return this.sessionService.revokeUserSession(userId, sessionId);
|
|
37
|
+
async revokeSession({ id: userId }, sessionId, locale) {
|
|
38
|
+
return this.sessionService.revokeUserSession(userId, sessionId, locale);
|
|
35
39
|
}
|
|
36
40
|
};
|
|
37
41
|
exports.SessionController = SessionController;
|
|
42
|
+
__decorate([
|
|
43
|
+
(0, common_1.Get)('active'),
|
|
44
|
+
__param(0, (0, api_pagination_1.Pagination)()),
|
|
45
|
+
__param(1, (0, api_1.User)()),
|
|
46
|
+
__param(2, (0, api_locale_1.Locale)()),
|
|
47
|
+
__metadata("design:type", Function),
|
|
48
|
+
__metadata("design:paramtypes", [api_pagination_1.PaginationDTO, Object, String]),
|
|
49
|
+
__metadata("design:returntype", Promise)
|
|
50
|
+
], SessionController.prototype, "getUserSessionsActive", null);
|
|
38
51
|
__decorate([
|
|
39
52
|
(0, common_1.Get)('user'),
|
|
40
53
|
__param(0, (0, api_pagination_1.Pagination)()),
|
|
41
54
|
__param(1, (0, api_1.User)()),
|
|
55
|
+
__param(2, (0, api_locale_1.Locale)()),
|
|
42
56
|
__metadata("design:type", Function),
|
|
43
|
-
__metadata("design:paramtypes", [api_pagination_1.PaginationDTO, Object]),
|
|
57
|
+
__metadata("design:paramtypes", [api_pagination_1.PaginationDTO, Object, String]),
|
|
44
58
|
__metadata("design:returntype", Promise)
|
|
45
59
|
], SessionController.prototype, "getUserSessions", null);
|
|
46
60
|
__decorate([
|
|
47
61
|
(0, common_1.Delete)('revoke-all-other'),
|
|
48
62
|
__param(0, (0, api_1.User)()),
|
|
63
|
+
__param(1, (0, api_1.Session)()),
|
|
49
64
|
__metadata("design:type", Function),
|
|
50
|
-
__metadata("design:paramtypes", [Object]),
|
|
65
|
+
__metadata("design:paramtypes", [Object, Number]),
|
|
51
66
|
__metadata("design:returntype", Promise)
|
|
52
67
|
], SessionController.prototype, "revokeAllOtherSessions", null);
|
|
53
68
|
__decorate([
|
|
@@ -60,9 +75,10 @@ __decorate([
|
|
|
60
75
|
__decorate([
|
|
61
76
|
(0, common_1.Delete)(':sessionId/revoke'),
|
|
62
77
|
__param(0, (0, api_1.User)()),
|
|
63
|
-
__param(1, (0, common_1.Param)('sessionId')),
|
|
78
|
+
__param(1, (0, common_1.Param)('sessionId', common_1.ParseIntPipe)),
|
|
79
|
+
__param(2, (0, api_locale_1.Locale)()),
|
|
64
80
|
__metadata("design:type", Function),
|
|
65
|
-
__metadata("design:paramtypes", [Object, Number]),
|
|
81
|
+
__metadata("design:paramtypes", [Object, Number, String]),
|
|
66
82
|
__metadata("design:returntype", Promise)
|
|
67
83
|
], SessionController.prototype, "revokeSession", null);
|
|
68
84
|
exports.SessionController = SessionController = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.controller.js","sourceRoot":"","sources":["../../src/session/session.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"session.controller.js","sourceRoot":"","sources":["../../src/session/session.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sCAAmD;AACnD,oDAA6C;AAC7C,4DAAoE;AACpE,2CAA8E;AAC9E,uDAAmD;AAG5C,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC1B,YACqB,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;IAChD,CAAC;IAGE,AAAN,KAAK,CAAC,qBAAqB,CACT,gBAA+B,EACrC,EAAE,EAAE,EAAE,EACJ,MAAc;QAExB,OAAO,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,gBAAgB,EAAE,EAAE,EAAC,MAAM,CAAC,CAAA;IACjF,CAAC;IAGK,AAAN,KAAK,CAAC,eAAe,CACH,gBAA+B,EACrC,EAAE,EAAE,EAAE,EACJ,MAAc;QAExB,OAAO,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,gBAAgB,EAAE,EAAE,EAAC,MAAM,CAAC,CAAA;IAC3E,CAAC;IAGK,AAAN,KAAK,CAAC,sBAAsB,CAAS,EAAE,EAAE,EAAE,EAAa,SAAiB;QACrE,OAAO,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,EAAE,EAAE,SAAS,CAAC,CAAA;IACpE,CAAC;IAGK,AAAN,KAAK,CAAC,iBAAiB,CAAS,EAAE,EAAE,EAAE;QAClC,OAAO,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAA;IACpD,CAAC;IAGK,AAAN,KAAK,CAAC,aAAa,CACP,EAAE,EAAE,EAAE,MAAM,EAAE,EACY,SAAiB,EACzC,MAAc;QAExB,OAAO,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,CAAA;IAC3E,CAAC;CACJ,CAAA;AAzCY,8CAAiB;AAMpB;IADL,IAAA,YAAG,EAAC,QAAQ,CAAC;IAET,WAAA,IAAA,2BAAU,GAAE,CAAA;IACZ,WAAA,IAAA,UAAI,GAAE,CAAA;IACN,WAAA,IAAA,mBAAM,GAAE,CAAA;;qCAFuB,8BAAa;;8DAKhD;AAGK;IADL,IAAA,YAAG,EAAC,MAAM,CAAC;IAEP,WAAA,IAAA,2BAAU,GAAE,CAAA;IACZ,WAAA,IAAA,UAAI,GAAE,CAAA;IACN,WAAA,IAAA,mBAAM,GAAE,CAAA;;qCAFuB,8BAAa;;wDAKhD;AAGK;IADL,IAAA,eAAM,EAAC,kBAAkB,CAAC;IACG,WAAA,IAAA,UAAI,GAAE,CAAA;IAAU,WAAA,IAAA,aAAO,GAAE,CAAA;;;;+DAEtD;AAGK;IADL,IAAA,eAAM,EAAC,YAAY,CAAC;IACI,WAAA,IAAA,UAAI,GAAE,CAAA;;;;0DAE9B;AAGK;IADL,IAAA,eAAM,EAAC,mBAAmB,CAAC;IAEvB,WAAA,IAAA,UAAI,GAAE,CAAA;IACN,WAAA,IAAA,cAAK,EAAC,WAAW,EAAE,qBAAY,CAAC,CAAA;IAChC,WAAA,IAAA,mBAAM,GAAE,CAAA;;;;sDAGZ;4BAxCQ,iBAAiB;IAF7B,IAAA,UAAI,GAAE;IACN,IAAA,mBAAU,EAAC,UAAU,CAAC;qCAGkB,gCAAc;GAF1C,iBAAiB,CAyC7B"}
|
|
@@ -43,7 +43,14 @@ export declare class SessionService {
|
|
|
43
43
|
};
|
|
44
44
|
}>;
|
|
45
45
|
deleteRefreshTokenCookie(res: any, refreshToken: string): Promise<import("@prisma/client").Prisma.BatchPayload>;
|
|
46
|
-
getUserSessions(paginationParams: PaginationDTO, userId: number): Promise<{
|
|
46
|
+
getUserSessions(paginationParams: PaginationDTO, userId: number, locale: string): Promise<{
|
|
47
|
+
data: any[];
|
|
48
|
+
total: any;
|
|
49
|
+
lastPage: number;
|
|
50
|
+
page: number;
|
|
51
|
+
pageSize: number;
|
|
52
|
+
}>;
|
|
53
|
+
getUserSessionsActive(paginationParams: PaginationDTO, userId: number, locale: string): Promise<{
|
|
47
54
|
data: any[];
|
|
48
55
|
total: any;
|
|
49
56
|
lastPage: number;
|
|
@@ -52,9 +59,9 @@ export declare class SessionService {
|
|
|
52
59
|
}>;
|
|
53
60
|
private fetchGeoByIp;
|
|
54
61
|
private markRevokedByFilter;
|
|
55
|
-
revokeAllOtherSessions(userId: number): Promise<import("@prisma/client").Prisma.BatchPayload>;
|
|
62
|
+
revokeAllOtherSessions(userId: number, sessionId: number): Promise<import("@prisma/client").Prisma.BatchPayload>;
|
|
56
63
|
revokeAllSessions(userId: number): Promise<import("@prisma/client").Prisma.BatchPayload>;
|
|
57
|
-
revokeUserSession(userId: number, sessionId: number): Promise<{
|
|
64
|
+
revokeUserSession(userId: number, sessionId: number, locale: string): Promise<{
|
|
58
65
|
id: number;
|
|
59
66
|
hash: string;
|
|
60
67
|
created_at: Date;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.service.d.ts","sourceRoot":"","sources":["../../src/session/session.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAanD,qBACa,cAAc;IAGvB,OAAO,CAAC,MAAM;IAEd,OAAO,CAAC,QAAQ;IAEhB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAExB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAEtB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAErB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAErB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAZ1B,MAAM,EAAE,aAAa,EAErB,QAAQ,EAAE,eAAe,EAEhB,OAAO,EAAE,cAAc,EAEvB,KAAK,EAAE,YAAY,EAEnB,IAAI,EAAE,WAAW,EAEjB,IAAI,EAAE,WAAW,EAEjB,iBAAiB,EAAE,iBAAiB;IAGjD,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;;;;;;;;;;;;;;IAsC3E,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;;;;;;;;;;;;;;IAwBlF,wBAAwB,CAAC,GAAG,KAAA,EAAE,YAAY,EAAE,MAAM;IAclD,eAAe,CAAC,gBAAgB,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM;;;;;;;
|
|
1
|
+
{"version":3,"file":"session.service.d.ts","sourceRoot":"","sources":["../../src/session/session.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAanD,qBACa,cAAc;IAGvB,OAAO,CAAC,MAAM;IAEd,OAAO,CAAC,QAAQ;IAEhB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAExB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAEtB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAErB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAErB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAZ1B,MAAM,EAAE,aAAa,EAErB,QAAQ,EAAE,eAAe,EAEhB,OAAO,EAAE,cAAc,EAEvB,KAAK,EAAE,YAAY,EAEnB,IAAI,EAAE,WAAW,EAEjB,IAAI,EAAE,WAAW,EAEjB,iBAAiB,EAAE,iBAAiB;IAGjD,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;;;;;;;;;;;;;;IAsC3E,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;;;;;;;;;;;;;;IAwBlF,wBAAwB,CAAC,GAAG,KAAA,EAAE,YAAY,EAAE,MAAM;IAclD,eAAe,CAAC,gBAAgB,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;;;;IAiD/E,qBAAqB,CAAC,gBAAgB,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;;;;YAiD7E,YAAY;YAmBZ,mBAAmB;IAQ3B,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAexD,iBAAiB,CAAC,MAAM,EAAE,MAAM;IAIhC,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;;;;;;;;IA0BzE;;;;;;OAMG;YACW,mBAAmB;CAsClC"}
|
|
@@ -97,8 +97,15 @@ let SessionService = class SessionService {
|
|
|
97
97
|
},
|
|
98
98
|
});
|
|
99
99
|
}
|
|
100
|
-
async getUserSessions(paginationParams, userId) {
|
|
100
|
+
async getUserSessions(paginationParams, userId, locale) {
|
|
101
101
|
var _a, _b, _c;
|
|
102
|
+
const userExists = await this.prisma.user.findUnique({
|
|
103
|
+
where: { id: userId },
|
|
104
|
+
select: { id: true },
|
|
105
|
+
});
|
|
106
|
+
if (!userExists) {
|
|
107
|
+
throw new common_1.BadRequestException((0, api_locale_1.getLocaleText)('session.userNotFound', locale, 'User not found.'));
|
|
108
|
+
}
|
|
102
109
|
try {
|
|
103
110
|
const paginate = await this.paginationService.paginatePrismaModel(this.prisma.user_session, Object.assign(Object.assign({}, paginationParams), { where: { user_id: userId } }));
|
|
104
111
|
const itemsWithLocation = await Promise.all(paginate.data.map(async (s) => {
|
|
@@ -126,7 +133,46 @@ let SessionService = class SessionService {
|
|
|
126
133
|
};
|
|
127
134
|
}
|
|
128
135
|
catch (err) {
|
|
129
|
-
throw new common_1.HttpException('
|
|
136
|
+
throw new common_1.HttpException((0, api_locale_1.getLocaleText)('session.errorFetchingSessions', locale, 'Error fetching user sessions'), common_1.HttpStatus.SERVICE_UNAVAILABLE);
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
async getUserSessionsActive(paginationParams, userId, locale) {
|
|
140
|
+
var _a, _b, _c;
|
|
141
|
+
const userExists = await this.prisma.user.findUnique({
|
|
142
|
+
where: { id: userId },
|
|
143
|
+
select: { id: true },
|
|
144
|
+
});
|
|
145
|
+
if (!userExists) {
|
|
146
|
+
throw new common_1.BadRequestException((0, api_locale_1.getLocaleText)('session.userNotFound', locale, 'User not found.'));
|
|
147
|
+
}
|
|
148
|
+
try {
|
|
149
|
+
const paginate = await this.paginationService.paginatePrismaModel(this.prisma.user_session, Object.assign(Object.assign({}, paginationParams), { where: { user_id: userId, revoked_at: null, expires_at: { gt: new Date() } } }));
|
|
150
|
+
const itemsWithLocation = await Promise.all(paginate.data.map(async (s) => {
|
|
151
|
+
const ip = s.ip_address || s.ip || null;
|
|
152
|
+
let location = null;
|
|
153
|
+
if (ip && ip !== '127.0.0.1' && ip !== '::1') {
|
|
154
|
+
try {
|
|
155
|
+
location = await this.fetchGeoByIp(ip);
|
|
156
|
+
}
|
|
157
|
+
catch (_a) {
|
|
158
|
+
location = { ip, raw: null };
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
else if (ip) {
|
|
162
|
+
location = { ip: '127.0.0.1', country: 'Localhost', region: '', city: '' };
|
|
163
|
+
}
|
|
164
|
+
return Object.assign(Object.assign({}, s), { location });
|
|
165
|
+
}));
|
|
166
|
+
return {
|
|
167
|
+
data: itemsWithLocation,
|
|
168
|
+
total: paginate.total || 0,
|
|
169
|
+
lastPage: Math.ceil((paginate.total || 0) / (paginate.pageSize || 1)),
|
|
170
|
+
page: (_a = paginate.page) !== null && _a !== void 0 ? _a : 1,
|
|
171
|
+
pageSize: (_c = (_b = paginate.pageSize) !== null && _b !== void 0 ? _b : paginationParams.pageSize) !== null && _c !== void 0 ? _c : 10,
|
|
172
|
+
};
|
|
173
|
+
}
|
|
174
|
+
catch (err) {
|
|
175
|
+
throw new common_1.HttpException((0, api_locale_1.getLocaleText)('session.errorFetchingSessions', locale, 'Error fetching user sessions'), common_1.HttpStatus.SERVICE_UNAVAILABLE);
|
|
130
176
|
}
|
|
131
177
|
}
|
|
132
178
|
async fetchGeoByIp(ip) {
|
|
@@ -154,26 +200,38 @@ let SessionService = class SessionService {
|
|
|
154
200
|
data: { revoked_at: new Date() },
|
|
155
201
|
});
|
|
156
202
|
}
|
|
157
|
-
async revokeAllOtherSessions(userId) {
|
|
158
|
-
const latestSession = await this.prisma.user_session.
|
|
159
|
-
where: {
|
|
160
|
-
|
|
203
|
+
async revokeAllOtherSessions(userId, sessionId) {
|
|
204
|
+
const latestSession = await this.prisma.user_session.findUnique({
|
|
205
|
+
where: {
|
|
206
|
+
id: sessionId
|
|
207
|
+
},
|
|
161
208
|
select: { id: true },
|
|
162
209
|
});
|
|
163
210
|
if (!latestSession) {
|
|
164
211
|
return { count: 0 };
|
|
165
212
|
}
|
|
166
|
-
return this.markRevokedByFilter(userId, {
|
|
213
|
+
return this.markRevokedByFilter(userId, {
|
|
214
|
+
NOT: { id: latestSession.id },
|
|
215
|
+
revoked_at: null
|
|
216
|
+
}, 'revokeAllOtherSessions');
|
|
167
217
|
}
|
|
168
218
|
async revokeAllSessions(userId) {
|
|
169
|
-
return this.markRevokedByFilter(userId, {}, 'revokeAllSessions');
|
|
219
|
+
return this.markRevokedByFilter(userId, { revoked_at: null }, 'revokeAllSessions');
|
|
170
220
|
}
|
|
171
|
-
async revokeUserSession(userId, sessionId) {
|
|
172
|
-
await this.
|
|
173
|
-
return this.prisma.user_session.update({
|
|
221
|
+
async revokeUserSession(userId, sessionId, locale) {
|
|
222
|
+
const session = await this.prisma.user_session.findFirst({
|
|
174
223
|
where: {
|
|
175
224
|
id: sessionId,
|
|
176
225
|
user_id: userId
|
|
226
|
+
}
|
|
227
|
+
});
|
|
228
|
+
if (!session) {
|
|
229
|
+
throw new common_1.BadRequestException((0, api_locale_1.getLocaleText)('session.notFound', locale, 'Session not found or does not belong to user'));
|
|
230
|
+
}
|
|
231
|
+
await this.user.registerUserActivity(userId, "revokeSession");
|
|
232
|
+
return this.prisma.user_session.update({
|
|
233
|
+
where: {
|
|
234
|
+
id: sessionId
|
|
177
235
|
},
|
|
178
236
|
data: {
|
|
179
237
|
revoked_at: new Date()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.service.js","sourceRoot":"","sources":["../../src/session/session.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"session.service.js","sourceRoot":"","sources":["../../src/session/session.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.module.d.ts","sourceRoot":"","sources":["../../src/token/token.module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"token.module.d.ts","sourceRoot":"","sources":["../../src/token/token.module.ts"],"names":[],"mappings":"AAMA,qBASa,WAAW;CAAG"}
|
|
@@ -7,6 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.TokenModule = void 0;
|
|
10
|
+
const api_prisma_1 = require("@hed-hog/api-prisma");
|
|
10
11
|
const common_1 = require("@nestjs/common");
|
|
11
12
|
const security_module_1 = require("../security/security.module");
|
|
12
13
|
const setting_module_1 = require("../setting/setting.module");
|
|
@@ -19,6 +20,7 @@ exports.TokenModule = TokenModule = __decorate([
|
|
|
19
20
|
providers: [token_service_1.TokenService],
|
|
20
21
|
exports: [token_service_1.TokenService],
|
|
21
22
|
imports: [
|
|
23
|
+
(0, common_1.forwardRef)(() => api_prisma_1.PrismaModule),
|
|
22
24
|
(0, common_1.forwardRef)(() => setting_module_1.SettingModule),
|
|
23
25
|
(0, common_1.forwardRef)(() => security_module_1.SecurityModule),
|
|
24
26
|
]
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.module.js","sourceRoot":"","sources":["../../src/token/token.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,iEAA6D;AAC7D,8DAA0D;AAC1D,mDAA+C;
|
|
1
|
+
{"version":3,"file":"token.module.js","sourceRoot":"","sources":["../../src/token/token.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,oDAAmD;AACnD,2CAAoD;AACpD,iEAA6D;AAC7D,8DAA0D;AAC1D,mDAA+C;AAWxC,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,kCAAW;sBAAX,WAAW;IATvB,IAAA,eAAM,EAAC;QACN,SAAS,EAAE,CAAC,4BAAY,CAAC;QACzB,OAAO,EAAE,CAAC,4BAAY,CAAC;QACvB,OAAO,EAAE;YACL,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,yBAAY,CAAC;YAC9B,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,8BAAa,CAAC;YAC/B,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,gCAAc,CAAC;SACjC;KACJ,CAAC;GACW,WAAW,CAAG"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
|
+
import { PrismaService } from "@hed-hog/api-prisma";
|
|
1
2
|
import { JwtService } from "@nestjs/jwt";
|
|
2
3
|
import { SecurityService } from "../security/security.service";
|
|
3
4
|
import { SettingService } from "../setting/setting.service";
|
|
4
5
|
export declare class TokenService {
|
|
6
|
+
private readonly prisma;
|
|
5
7
|
private readonly jwt;
|
|
6
8
|
private readonly security;
|
|
7
9
|
private readonly setting;
|
|
8
|
-
constructor(jwt: JwtService, security: SecurityService, setting: SettingService);
|
|
10
|
+
constructor(prisma: PrismaService, jwt: JwtService, security: SecurityService, setting: SettingService);
|
|
9
11
|
verify(locale: string, token: string): Promise<any>;
|
|
10
12
|
createAccessToken(payload: Record<string, any>): Promise<string>;
|
|
11
13
|
createOpaqueToken(size?: number): Promise<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.service.d.ts","sourceRoot":"","sources":["../../src/token/token.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"token.service.d.ts","sourceRoot":"","sources":["../../src/token/token.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,qBACa,YAAY;IAGrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAEvB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAEpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAEzB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBANP,MAAM,EAAE,aAAa,EAErB,GAAG,EAAE,UAAU,EAEf,QAAQ,EAAE,eAAe,EAEzB,OAAO,EAAE,cAAc;IAGpC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IA0CpC,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAM9C,iBAAiB,CAAC,IAAI,SAAK;YAInB,eAAe;IAgBvB,wBAAwB,CAAC,GAAG,KAAA,GAAG,OAAO,CAAC,IAAI,CAAC;IAe5C,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAA,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB1F,uBAAuB,CAAC,OAAO,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAOxG,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAgBxH,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;CAUtD"}
|
|
@@ -14,21 +14,44 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.TokenService = void 0;
|
|
16
16
|
const api_locale_1 = require("@hed-hog/api-locale");
|
|
17
|
+
const api_prisma_1 = require("@hed-hog/api-prisma");
|
|
17
18
|
const common_1 = require("@nestjs/common");
|
|
18
19
|
const jwt_1 = require("@nestjs/jwt");
|
|
19
20
|
const security_service_1 = require("../security/security.service");
|
|
20
21
|
const setting_service_1 = require("../setting/setting.service");
|
|
21
22
|
let TokenService = class TokenService {
|
|
22
|
-
constructor(jwt, security, setting) {
|
|
23
|
+
constructor(prisma, jwt, security, setting) {
|
|
24
|
+
this.prisma = prisma;
|
|
23
25
|
this.jwt = jwt;
|
|
24
26
|
this.security = security;
|
|
25
27
|
this.setting = setting;
|
|
26
28
|
}
|
|
27
29
|
async verify(locale, token) {
|
|
28
30
|
try {
|
|
29
|
-
|
|
31
|
+
const payload = await this.jwt.verifyAsync(token, {
|
|
30
32
|
secret: this.security.getJwtSecret(),
|
|
31
33
|
});
|
|
34
|
+
// Verify session is not revoked (only if prisma is available)
|
|
35
|
+
if (payload.sessionId && this.prisma) {
|
|
36
|
+
try {
|
|
37
|
+
const session = await this.prisma.user_session.findUnique({
|
|
38
|
+
where: { id: payload.sessionId },
|
|
39
|
+
select: { revoked_at: true, expires_at: true }
|
|
40
|
+
});
|
|
41
|
+
if (!session || session.revoked_at !== null || session.expires_at <= new Date()) {
|
|
42
|
+
throw new common_1.UnauthorizedException((0, api_locale_1.getLocaleText)('sessionRevoked', locale, 'Session has been revoked.'));
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
catch (sessionError) {
|
|
46
|
+
// If it's an Unauthorized error from revoked session, rethrow it
|
|
47
|
+
if (sessionError instanceof common_1.UnauthorizedException) {
|
|
48
|
+
throw sessionError;
|
|
49
|
+
}
|
|
50
|
+
// Otherwise, log the error but allow auth to continue
|
|
51
|
+
console.error('Session validation error:', sessionError);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
return payload;
|
|
32
55
|
}
|
|
33
56
|
catch (error) {
|
|
34
57
|
console.log('JWT ERROR', error);
|
|
@@ -123,10 +146,11 @@ let TokenService = class TokenService {
|
|
|
123
146
|
exports.TokenService = TokenService;
|
|
124
147
|
exports.TokenService = TokenService = __decorate([
|
|
125
148
|
(0, common_1.Injectable)(),
|
|
126
|
-
__param(
|
|
127
|
-
__param(
|
|
128
|
-
__param(
|
|
129
|
-
__metadata("design:paramtypes", [
|
|
149
|
+
__param(1, (0, common_1.Inject)((0, common_1.forwardRef)(() => jwt_1.JwtService))),
|
|
150
|
+
__param(2, (0, common_1.Inject)((0, common_1.forwardRef)(() => security_service_1.SecurityService))),
|
|
151
|
+
__param(3, (0, common_1.Inject)((0, common_1.forwardRef)(() => setting_service_1.SettingService))),
|
|
152
|
+
__metadata("design:paramtypes", [api_prisma_1.PrismaService,
|
|
153
|
+
jwt_1.JwtService,
|
|
130
154
|
security_service_1.SecurityService,
|
|
131
155
|
setting_service_1.SettingService])
|
|
132
156
|
], TokenService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.service.js","sourceRoot":"","sources":["../../src/token/token.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oDAAoD;AACpD,2CAA2G;AAC3G,qCAAyC;AACzC,mEAA+D;AAC/D,gEAA4D;AAGrD,IAAM,YAAY,GAAlB,MAAM,YAAY;IAEvB,
|
|
1
|
+
{"version":3,"file":"token.service.js","sourceRoot":"","sources":["../../src/token/token.service.ts"],"names":[],"mappings":"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"}
|
package/hedhog/data/route.yaml
CHANGED
|
@@ -62,6 +62,16 @@
|
|
|
62
62
|
slug: admin-access
|
|
63
63
|
- where:
|
|
64
64
|
slug: user
|
|
65
|
+
- url: /sessions/active
|
|
66
|
+
method: GET
|
|
67
|
+
relations:
|
|
68
|
+
role:
|
|
69
|
+
- where:
|
|
70
|
+
slug: admin
|
|
71
|
+
- where:
|
|
72
|
+
slug: admin-access
|
|
73
|
+
- where:
|
|
74
|
+
slug: user
|
|
65
75
|
- url: /menu/system
|
|
66
76
|
method: GET
|
|
67
77
|
relations:
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hed-hog/core",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.144",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"types": "dist/index.d.ts",
|
|
6
6
|
"dependencies": {
|
|
@@ -29,11 +29,11 @@
|
|
|
29
29
|
"sharp": "^0.34.2",
|
|
30
30
|
"speakeasy": "^2.0.0",
|
|
31
31
|
"uuid": "^11.1.0",
|
|
32
|
-
"@hed-hog/api-locale": "0.0.11",
|
|
33
32
|
"@hed-hog/api-prisma": "0.0.4",
|
|
34
|
-
"@hed-hog/api-
|
|
33
|
+
"@hed-hog/api-locale": "0.0.11",
|
|
35
34
|
"@hed-hog/types": "0.0.1",
|
|
36
35
|
"@hed-hog/api-pagination": "0.0.5",
|
|
36
|
+
"@hed-hog/api-mail": "0.0.7",
|
|
37
37
|
"@hed-hog/api": "0.0.3"
|
|
38
38
|
},
|
|
39
39
|
"exports": {
|
package/src/auth/auth.service.ts
CHANGED
|
@@ -2,11 +2,11 @@ import { getLocaleText } from '@hed-hog/api-locale';
|
|
|
2
2
|
import { PrismaService } from '@hed-hog/api-prisma';
|
|
3
3
|
import { User } from '@hed-hog/types';
|
|
4
4
|
import {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
5
|
+
BadRequestException,
|
|
6
|
+
forwardRef,
|
|
7
|
+
Inject,
|
|
8
|
+
Injectable,
|
|
9
|
+
NotFoundException,
|
|
10
10
|
} from '@nestjs/common';
|
|
11
11
|
import { ChallengeService } from '../challenge/challenge.service';
|
|
12
12
|
import { MailService as MailManagerService } from '../mail/mail.service';
|
|
@@ -42,9 +42,9 @@ export class AuthService {
|
|
|
42
42
|
|
|
43
43
|
async getAuthenticationPayload(locale: string, userId: number, ipAddress: string,
|
|
44
44
|
userAgent: string) {
|
|
45
|
-
const payload = { sub: userId };
|
|
46
|
-
const accessToken = await this.token.createAccessToken(payload);
|
|
47
45
|
const { token: refreshToken, session } = await this.session.create(locale, userId, ipAddress, userAgent);
|
|
46
|
+
const payload = { sub: userId, sessionId: session.id };
|
|
47
|
+
const accessToken = await this.token.createAccessToken(payload);
|
|
48
48
|
|
|
49
49
|
return {
|
|
50
50
|
accessToken,
|
|
@@ -453,7 +453,7 @@ export class AuthService {
|
|
|
453
453
|
);
|
|
454
454
|
|
|
455
455
|
const user = await this.user.findUserById(locale, session.user_id);
|
|
456
|
-
const payload = { sub: user.id };
|
|
456
|
+
const payload = { sub: user.id, sessionId: session.id };
|
|
457
457
|
const accessToken = await this.token.createAccessToken(payload);
|
|
458
458
|
|
|
459
459
|
return { accessToken, refreshToken: token, session };
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { IS_PUBLIC_KEY } from '@hed-hog/api';
|
|
1
|
+
import { IS_PUBLIC_KEY, WITH_ROLE } from '@hed-hog/api';
|
|
2
2
|
import { getLocaleText } from '@hed-hog/api-locale';
|
|
3
3
|
import {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
4
|
+
CanActivate,
|
|
5
|
+
ExecutionContext,
|
|
6
|
+
Injectable,
|
|
7
|
+
UnauthorizedException,
|
|
8
8
|
} from '@nestjs/common';
|
|
9
9
|
import { Reflector } from '@nestjs/core';
|
|
10
10
|
import { Request } from 'express';
|
|
@@ -23,19 +23,32 @@ export class AuthGuard implements CanActivate {
|
|
|
23
23
|
context.getClass(),
|
|
24
24
|
]);
|
|
25
25
|
|
|
26
|
+
const withRole = this.reflector.getAllAndOverride<boolean>(WITH_ROLE, [
|
|
27
|
+
context.getHandler(),
|
|
28
|
+
context.getClass(),
|
|
29
|
+
]);
|
|
30
|
+
|
|
26
31
|
const request = context.switchToHttp().getRequest();
|
|
27
32
|
const token = this.extractTokenFromHeader(request);
|
|
28
33
|
const locale = request.headers['locale'] || request.headers['accept-language'] || 'en';
|
|
29
34
|
|
|
35
|
+
// If endpoint requires role/authentication and no token provided
|
|
30
36
|
if (!token) {
|
|
31
37
|
if (isPublic) {
|
|
32
38
|
return true;
|
|
39
|
+
} else if (withRole) {
|
|
40
|
+
// @Role() decorator requires authentication
|
|
41
|
+
throw new UnauthorizedException(
|
|
42
|
+
getLocaleText('accessDenied', locale, 'Access denied.'),
|
|
43
|
+
);
|
|
33
44
|
} else {
|
|
45
|
+
// No explicit decorator, default behavior (deny)
|
|
34
46
|
throw new UnauthorizedException(
|
|
35
47
|
getLocaleText('accessDenied', locale, 'Access denied.'),
|
|
36
48
|
);
|
|
37
49
|
}
|
|
38
50
|
}
|
|
51
|
+
|
|
39
52
|
try {
|
|
40
53
|
const payload = await this.token.verify(locale, token);
|
|
41
54
|
|
package/src/language/en.json
CHANGED
|
@@ -166,5 +166,6 @@
|
|
|
166
166
|
}
|
|
167
167
|
},
|
|
168
168
|
"mail_sent_not_found": "Mail sent record not found.",
|
|
169
|
-
"validationSslugMustBeString": "Slug must be a string."
|
|
169
|
+
"validationSslugMustBeString": "Slug must be a string.",
|
|
170
|
+
"sessionRevoked": "Session has been revoked or expired."
|
|
170
171
|
}
|
package/src/language/pt.json
CHANGED
|
@@ -166,5 +166,6 @@
|
|
|
166
166
|
}
|
|
167
167
|
},
|
|
168
168
|
"mail_sent_not_found": "Registro de e-mail enviado não encontrado.",
|
|
169
|
-
"validationSslugMustBeString": "O slug deve ser uma string."
|
|
169
|
+
"validationSslugMustBeString": "O slug deve ser uma string.",
|
|
170
|
+
"sessionRevoked": "Sessão foi revogada ou expirada."
|
|
170
171
|
}
|
|
@@ -111,7 +111,13 @@ export class RoleGuard implements CanActivate {
|
|
|
111
111
|
},
|
|
112
112
|
});
|
|
113
113
|
|
|
114
|
-
|
|
114
|
+
if (route !== 1) {
|
|
115
|
+
throw new UnauthorizedException(
|
|
116
|
+
`Access denied. User does not have permission to access ${httpMethod} ${fullPath}`
|
|
117
|
+
);
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
return true;
|
|
115
121
|
}
|
|
116
122
|
|
|
117
123
|
private extractTokenFromHeader(request: Request): string | undefined {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { Role, User } from '@hed-hog/api';
|
|
1
|
+
import { Role, Session, User } from '@hed-hog/api';
|
|
2
|
+
import { Locale } from '@hed-hog/api-locale';
|
|
2
3
|
import { Pagination, PaginationDTO } from '@hed-hog/api-pagination';
|
|
3
|
-
import { Controller, Delete, Get, Param } from '@nestjs/common';
|
|
4
|
+
import { Controller, Delete, Get, Param, ParseIntPipe } from '@nestjs/common';
|
|
4
5
|
import { SessionService } from './session.service';
|
|
5
6
|
@Role()
|
|
6
7
|
@Controller('sessions')
|
|
@@ -9,17 +10,27 @@ export class SessionController {
|
|
|
9
10
|
private readonly sessionService: SessionService
|
|
10
11
|
) {}
|
|
11
12
|
|
|
13
|
+
@Get('active')
|
|
14
|
+
async getUserSessionsActive(
|
|
15
|
+
@Pagination() paginationParams: PaginationDTO,
|
|
16
|
+
@User() { id },
|
|
17
|
+
@Locale() locale: string
|
|
18
|
+
) {
|
|
19
|
+
return this.sessionService.getUserSessionsActive(paginationParams, id,locale)
|
|
20
|
+
}
|
|
21
|
+
|
|
12
22
|
@Get('user')
|
|
13
23
|
async getUserSessions(
|
|
14
24
|
@Pagination() paginationParams: PaginationDTO,
|
|
15
25
|
@User() { id },
|
|
26
|
+
@Locale() locale: string
|
|
16
27
|
) {
|
|
17
|
-
return this.sessionService.getUserSessions(paginationParams, id)
|
|
28
|
+
return this.sessionService.getUserSessions(paginationParams, id,locale)
|
|
18
29
|
}
|
|
19
30
|
|
|
20
31
|
@Delete('revoke-all-other')
|
|
21
|
-
async revokeAllOtherSessions(@User() { id }){
|
|
22
|
-
return this.sessionService.revokeAllOtherSessions(id)
|
|
32
|
+
async revokeAllOtherSessions(@User() { id }, @Session() sessionId: number){
|
|
33
|
+
return this.sessionService.revokeAllOtherSessions(id, sessionId)
|
|
23
34
|
}
|
|
24
35
|
|
|
25
36
|
@Delete('revoke-all')
|
|
@@ -28,7 +39,11 @@ export class SessionController {
|
|
|
28
39
|
}
|
|
29
40
|
|
|
30
41
|
@Delete(':sessionId/revoke')
|
|
31
|
-
async revokeSession(
|
|
32
|
-
|
|
42
|
+
async revokeSession(
|
|
43
|
+
@User() { id: userId },
|
|
44
|
+
@Param('sessionId', ParseIntPipe) sessionId: number,
|
|
45
|
+
@Locale() locale: string
|
|
46
|
+
){
|
|
47
|
+
return this.sessionService.revokeUserSession(userId, sessionId, locale)
|
|
33
48
|
}
|
|
34
49
|
}
|
|
@@ -115,7 +115,17 @@ export class SessionService {
|
|
|
115
115
|
});
|
|
116
116
|
}
|
|
117
117
|
|
|
118
|
-
async getUserSessions(paginationParams: PaginationDTO, userId: number) {
|
|
118
|
+
async getUserSessions(paginationParams: PaginationDTO, userId: number, locale: string) {
|
|
119
|
+
|
|
120
|
+
const userExists = await this.prisma.user.findUnique({
|
|
121
|
+
where: { id: userId },
|
|
122
|
+
select: { id: true },
|
|
123
|
+
});
|
|
124
|
+
|
|
125
|
+
if (!userExists) {
|
|
126
|
+
throw new BadRequestException(getLocaleText('session.userNotFound', locale, 'User not found.'));
|
|
127
|
+
}
|
|
128
|
+
|
|
119
129
|
try {
|
|
120
130
|
const paginate = await this.paginationService.paginatePrismaModel(this.prisma.user_session, {
|
|
121
131
|
...paginationParams,
|
|
@@ -147,7 +157,59 @@ export class SessionService {
|
|
|
147
157
|
pageSize: paginate.pageSize ?? paginationParams.pageSize ?? 10,
|
|
148
158
|
};
|
|
149
159
|
} catch (err) {
|
|
150
|
-
throw new HttpException(
|
|
160
|
+
throw new HttpException(
|
|
161
|
+
getLocaleText('session.errorFetchingSessions', locale, 'Error fetching user sessions'),
|
|
162
|
+
HttpStatus.SERVICE_UNAVAILABLE
|
|
163
|
+
);
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
async getUserSessionsActive(paginationParams: PaginationDTO, userId: number, locale: string) {
|
|
168
|
+
|
|
169
|
+
const userExists = await this.prisma.user.findUnique({
|
|
170
|
+
where: { id: userId },
|
|
171
|
+
select: { id: true },
|
|
172
|
+
});
|
|
173
|
+
|
|
174
|
+
if (!userExists) {
|
|
175
|
+
throw new BadRequestException(getLocaleText('session.userNotFound', locale, 'User not found.'));
|
|
176
|
+
}
|
|
177
|
+
|
|
178
|
+
try {
|
|
179
|
+
const paginate = await this.paginationService.paginatePrismaModel(this.prisma.user_session, {
|
|
180
|
+
...paginationParams,
|
|
181
|
+
where: { user_id: userId, revoked_at: null, expires_at: { gt: new Date() } },
|
|
182
|
+
});
|
|
183
|
+
|
|
184
|
+
const itemsWithLocation = await Promise.all(
|
|
185
|
+
paginate.data.map(async (s) => {
|
|
186
|
+
const ip = s.ip_address || s.ip || null;
|
|
187
|
+
let location: GeoIpResult | null = null;
|
|
188
|
+
if (ip && ip !== '127.0.0.1' && ip !== '::1') {
|
|
189
|
+
try {
|
|
190
|
+
location = await this.fetchGeoByIp(ip);
|
|
191
|
+
} catch {
|
|
192
|
+
location = { ip, raw: null };
|
|
193
|
+
}
|
|
194
|
+
} else if (ip) {
|
|
195
|
+
location = { ip: '127.0.0.1', country: 'Localhost', region: '', city: '' };
|
|
196
|
+
}
|
|
197
|
+
return { ...s, location };
|
|
198
|
+
})
|
|
199
|
+
);
|
|
200
|
+
|
|
201
|
+
return {
|
|
202
|
+
data: itemsWithLocation,
|
|
203
|
+
total: paginate.total || 0,
|
|
204
|
+
lastPage: Math.ceil((paginate.total || 0) / (paginate.pageSize || 1)),
|
|
205
|
+
page: paginate.page ?? 1,
|
|
206
|
+
pageSize: paginate.pageSize ?? paginationParams.pageSize ?? 10,
|
|
207
|
+
};
|
|
208
|
+
} catch (err) {
|
|
209
|
+
throw new HttpException(
|
|
210
|
+
getLocaleText('session.errorFetchingSessions', locale, 'Error fetching user sessions'),
|
|
211
|
+
HttpStatus.SERVICE_UNAVAILABLE
|
|
212
|
+
);
|
|
151
213
|
}
|
|
152
214
|
}
|
|
153
215
|
|
|
@@ -178,27 +240,44 @@ export class SessionService {
|
|
|
178
240
|
});
|
|
179
241
|
}
|
|
180
242
|
|
|
181
|
-
async revokeAllOtherSessions(userId: number) {
|
|
182
|
-
const latestSession = await this.prisma.user_session.
|
|
183
|
-
where: {
|
|
184
|
-
|
|
243
|
+
async revokeAllOtherSessions(userId: number, sessionId: number) {
|
|
244
|
+
const latestSession = await this.prisma.user_session.findUnique({
|
|
245
|
+
where: {
|
|
246
|
+
id: sessionId
|
|
247
|
+
},
|
|
185
248
|
select: { id: true },
|
|
186
249
|
});
|
|
187
250
|
|
|
188
251
|
if (!latestSession) { return { count: 0 } }
|
|
189
|
-
return this.markRevokedByFilter(userId, {
|
|
252
|
+
return this.markRevokedByFilter(userId, {
|
|
253
|
+
NOT: { id: latestSession.id },
|
|
254
|
+
revoked_at: null
|
|
255
|
+
}, 'revokeAllOtherSessions');
|
|
190
256
|
}
|
|
191
257
|
|
|
192
258
|
async revokeAllSessions(userId: number) {
|
|
193
|
-
return this.markRevokedByFilter(userId, {}, 'revokeAllSessions');
|
|
259
|
+
return this.markRevokedByFilter(userId, { revoked_at: null }, 'revokeAllSessions');
|
|
194
260
|
}
|
|
195
261
|
|
|
196
|
-
async revokeUserSession(userId: number, sessionId: number){
|
|
197
|
-
await this.
|
|
198
|
-
return this.prisma.user_session.update({
|
|
262
|
+
async revokeUserSession(userId: number, sessionId: number, locale: string){
|
|
263
|
+
const session = await this.prisma.user_session.findFirst({
|
|
199
264
|
where: {
|
|
200
265
|
id: sessionId,
|
|
201
266
|
user_id: userId
|
|
267
|
+
}
|
|
268
|
+
});
|
|
269
|
+
|
|
270
|
+
if (!session) {
|
|
271
|
+
throw new BadRequestException(
|
|
272
|
+
getLocaleText('session.notFound', locale, 'Session not found or does not belong to user')
|
|
273
|
+
);
|
|
274
|
+
}
|
|
275
|
+
|
|
276
|
+
await this.user.registerUserActivity(userId, "revokeSession");
|
|
277
|
+
|
|
278
|
+
return this.prisma.user_session.update({
|
|
279
|
+
where: {
|
|
280
|
+
id: sessionId
|
|
202
281
|
},
|
|
203
282
|
data: {
|
|
204
283
|
revoked_at: new Date()
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { PrismaModule } from "@hed-hog/api-prisma";
|
|
1
2
|
import { forwardRef, Module } from "@nestjs/common";
|
|
2
3
|
import { SecurityModule } from "../security/security.module";
|
|
3
4
|
import { SettingModule } from "../setting/setting.module";
|
|
@@ -7,6 +8,7 @@ import { TokenService } from "./token.service";
|
|
|
7
8
|
providers: [TokenService],
|
|
8
9
|
exports: [TokenService],
|
|
9
10
|
imports: [
|
|
11
|
+
forwardRef(() => PrismaModule),
|
|
10
12
|
forwardRef(() => SettingModule),
|
|
11
13
|
forwardRef(() => SecurityModule),
|
|
12
14
|
]
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { getLocaleText } from "@hed-hog/api-locale";
|
|
2
|
+
import { PrismaService } from "@hed-hog/api-prisma";
|
|
2
3
|
import { ForbiddenException, forwardRef, Inject, Injectable, UnauthorizedException } from "@nestjs/common";
|
|
3
4
|
import { JwtService } from "@nestjs/jwt";
|
|
4
5
|
import { SecurityService } from "../security/security.service";
|
|
@@ -8,6 +9,7 @@ import { SettingService } from "../setting/setting.service";
|
|
|
8
9
|
export class TokenService {
|
|
9
10
|
|
|
10
11
|
constructor(
|
|
12
|
+
private readonly prisma: PrismaService,
|
|
11
13
|
@Inject(forwardRef(() => JwtService))
|
|
12
14
|
private readonly jwt: JwtService,
|
|
13
15
|
@Inject(forwardRef(() => SecurityService))
|
|
@@ -18,9 +20,35 @@ export class TokenService {
|
|
|
18
20
|
|
|
19
21
|
async verify(locale: string, token: string) {
|
|
20
22
|
try {
|
|
21
|
-
|
|
23
|
+
|
|
24
|
+
const payload = await this.jwt.verifyAsync(token, {
|
|
22
25
|
secret: this.security.getJwtSecret(),
|
|
23
26
|
});
|
|
27
|
+
|
|
28
|
+
// Verify session is not revoked (only if prisma is available)
|
|
29
|
+
if (payload.sessionId && this.prisma) {
|
|
30
|
+
try {
|
|
31
|
+
const session = await this.prisma.user_session.findUnique({
|
|
32
|
+
where: { id: payload.sessionId },
|
|
33
|
+
select: { revoked_at: true, expires_at: true }
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
if (!session || session.revoked_at !== null || session.expires_at <= new Date()) {
|
|
37
|
+
throw new UnauthorizedException(
|
|
38
|
+
getLocaleText('sessionRevoked', locale, 'Session has been revoked.')
|
|
39
|
+
);
|
|
40
|
+
}
|
|
41
|
+
} catch (sessionError) {
|
|
42
|
+
// If it's an Unauthorized error from revoked session, rethrow it
|
|
43
|
+
if (sessionError instanceof UnauthorizedException) {
|
|
44
|
+
throw sessionError;
|
|
45
|
+
}
|
|
46
|
+
// Otherwise, log the error but allow auth to continue
|
|
47
|
+
console.error('Session validation error:', sessionError);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
return payload;
|
|
24
52
|
} catch (error) {
|
|
25
53
|
|
|
26
54
|
console.log('JWT ERROR', error);
|