@hed-hog/core 0.0.141 → 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.
@@ -1 +1 @@
1
- {"version":3,"file":"auth.guard.d.ts","sourceRoot":"","sources":["../../../src/auth/guards/auth.guard.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,WAAW,EACX,gBAAgB,EAGnB,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;IAoC9D,OAAO,CAAC,sBAAsB;CAK/B"}
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,sCAA6C;AAC7C,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,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,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,IAAI,QAAQ,EAAE,CAAC;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,8BAAqB,CAC7B,IAAA,0BAAa,EAAC,cAAc,EAAE,MAAM,EAAE,gBAAgB,CAAC,CACxD,CAAC;YACJ,CAAC;QACH,CAAC;QACD,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;AA/CY,8BAAS;oBAAT,SAAS;IADrB,IAAA,mBAAU,GAAE;qCAGM,4BAAY;QACR,gBAAS;GAHnB,SAAS,CA+CrB"}
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"}
@@ -3,6 +3,15 @@ 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
17
  }, locale: string): Promise<{
@@ -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":"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;IAK7C,eAAe,CACH,gBAAgB,EAAE,aAAa,EACrC,EAAE,EAAE,EAAE;;KAAA,EACJ,MAAM,EAAE,MAAM;;;;;;;IAOtB,sBAAsB,CAAS,EAAE,EAAE,EAAE;;KAAA;IAMrC,iBAAiB,CAAS,EAAE,EAAE,EAAE;;KAAA;IAMhC,aAAa,CAAS,EAAE,EAAE,EAAE,MAAM,EAAE;;KAAA,EAAsB,SAAS,EAAE,MAAM;;;;;;;;;;;CAGpF"}
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"}
@@ -22,22 +22,33 @@ let SessionController = class SessionController {
22
22
  constructor(sessionService) {
23
23
  this.sessionService = sessionService;
24
24
  }
25
+ async getUserSessionsActive(paginationParams, { id }, locale) {
26
+ return this.sessionService.getUserSessionsActive(paginationParams, id, locale);
27
+ }
25
28
  async getUserSessions(paginationParams, { id }, locale) {
26
29
  return this.sessionService.getUserSessions(paginationParams, id, locale);
27
30
  }
28
- async revokeAllOtherSessions({ id }) {
29
- return this.sessionService.revokeAllOtherSessions(id);
31
+ async revokeAllOtherSessions({ id }, sessionId) {
32
+ return this.sessionService.revokeAllOtherSessions(id, sessionId);
30
33
  }
31
34
  async revokeAllSessions({ id }) {
32
35
  return this.sessionService.revokeAllSessions(id);
33
36
  }
34
- async revokeSession({ id: userId }, sessionId) {
35
- return this.sessionService.revokeUserSession(userId, sessionId);
37
+ async revokeSession({ id: userId }, sessionId, locale) {
38
+ return this.sessionService.revokeUserSession(userId, sessionId, locale);
36
39
  }
37
40
  };
38
41
  exports.SessionController = SessionController;
39
42
  __decorate([
40
- (0, api_1.Role)(),
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);
51
+ __decorate([
41
52
  (0, common_1.Get)('user'),
42
53
  __param(0, (0, api_pagination_1.Pagination)()),
43
54
  __param(1, (0, api_1.User)()),
@@ -47,15 +58,14 @@ __decorate([
47
58
  __metadata("design:returntype", Promise)
48
59
  ], SessionController.prototype, "getUserSessions", null);
49
60
  __decorate([
50
- (0, api_1.Role)(),
51
61
  (0, common_1.Delete)('revoke-all-other'),
52
62
  __param(0, (0, api_1.User)()),
63
+ __param(1, (0, api_1.Session)()),
53
64
  __metadata("design:type", Function),
54
- __metadata("design:paramtypes", [Object]),
65
+ __metadata("design:paramtypes", [Object, Number]),
55
66
  __metadata("design:returntype", Promise)
56
67
  ], SessionController.prototype, "revokeAllOtherSessions", null);
57
68
  __decorate([
58
- (0, api_1.Role)(),
59
69
  (0, common_1.Delete)('revoke-all'),
60
70
  __param(0, (0, api_1.User)()),
61
71
  __metadata("design:type", Function),
@@ -63,12 +73,12 @@ __decorate([
63
73
  __metadata("design:returntype", Promise)
64
74
  ], SessionController.prototype, "revokeAllSessions", null);
65
75
  __decorate([
66
- (0, api_1.Role)(),
67
76
  (0, common_1.Delete)(':sessionId/revoke'),
68
77
  __param(0, (0, api_1.User)()),
69
- __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)()),
70
80
  __metadata("design:type", Function),
71
- __metadata("design:paramtypes", [Object, Number]),
81
+ __metadata("design:paramtypes", [Object, Number, String]),
72
82
  __metadata("design:returntype", Promise)
73
83
  ], SessionController.prototype, "revokeSession", null);
74
84
  exports.SessionController = SessionController = __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"session.controller.js","sourceRoot":"","sources":["../../src/session/session.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sCAA0C;AAC1C,oDAA6C;AAC7C,4DAAoE;AACpE,2CAAgE;AAChE,uDAAmD;AAG5C,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC1B,YACqB,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;IAChD,CAAC;IAIE,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;IAIK,AAAN,KAAK,CAAC,sBAAsB,CAAS,EAAE,EAAE,EAAE;QACvC,OAAO,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAA;IACzD,CAAC;IAIK,AAAN,KAAK,CAAC,iBAAiB,CAAS,EAAE,EAAE,EAAE;QAClC,OAAO,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAA;IACpD,CAAC;IAIK,AAAN,KAAK,CAAC,aAAa,CAAS,EAAE,EAAE,EAAE,MAAM,EAAE,EAAsB,SAAiB;QAC7E,OAAO,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IACnE,CAAC;CACJ,CAAA;AAhCY,8CAAiB;AAOpB;IAFL,IAAA,UAAI,GAAE;IACN,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;AAIK;IAFL,IAAA,UAAI,GAAE;IACN,IAAA,eAAM,EAAC,kBAAkB,CAAC;IACG,WAAA,IAAA,UAAI,GAAE,CAAA;;;;+DAEnC;AAIK;IAFL,IAAA,UAAI,GAAE;IACN,IAAA,eAAM,EAAC,YAAY,CAAC;IACI,WAAA,IAAA,UAAI,GAAE,CAAA;;;;0DAE9B;AAIK;IAFL,IAAA,UAAI,GAAE;IACN,IAAA,eAAM,EAAC,mBAAmB,CAAC;IACP,WAAA,IAAA,UAAI,GAAE,CAAA;IAAkB,WAAA,IAAA,cAAK,EAAC,WAAW,CAAC,CAAA;;;;sDAE9D;4BA/BQ,iBAAiB;IAF7B,IAAA,UAAI,GAAE;IACN,IAAA,mBAAU,EAAC,UAAU,CAAC;qCAGkB,gCAAc;GAF1C,iBAAiB,CAgC7B"}
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"}
@@ -50,11 +50,18 @@ export declare class SessionService {
50
50
  page: number;
51
51
  pageSize: number;
52
52
  }>;
53
+ getUserSessionsActive(paginationParams: PaginationDTO, userId: number, locale: string): Promise<{
54
+ data: any[];
55
+ total: any;
56
+ lastPage: number;
57
+ page: number;
58
+ pageSize: number;
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,EAAE,MAAM,EAAE,MAAM;;;;;;;YA8CvE,YAAY;YAmBZ,mBAAmB;IAQ3B,sBAAsB,CAAC,MAAM,EAAE,MAAM;IAWrC,iBAAiB,CAAC,MAAM,EAAE,MAAM;IAIhC,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;;;;;;;;;;;IAazD;;;;;;OAMG;YACW,mBAAmB;CAsClC"}
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"}
@@ -133,7 +133,46 @@ let SessionService = class SessionService {
133
133
  };
134
134
  }
135
135
  catch (err) {
136
- throw new common_1.HttpException('Erro ao buscar sessões do usuário', common_1.HttpStatus.SERVICE_UNAVAILABLE);
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);
137
176
  }
138
177
  }
139
178
  async fetchGeoByIp(ip) {
@@ -161,26 +200,38 @@ let SessionService = class SessionService {
161
200
  data: { revoked_at: new Date() },
162
201
  });
163
202
  }
164
- async revokeAllOtherSessions(userId) {
165
- const latestSession = await this.prisma.user_session.findFirst({
166
- where: { user_id: userId },
167
- orderBy: { created_at: 'desc' },
203
+ async revokeAllOtherSessions(userId, sessionId) {
204
+ const latestSession = await this.prisma.user_session.findUnique({
205
+ where: {
206
+ id: sessionId
207
+ },
168
208
  select: { id: true },
169
209
  });
170
210
  if (!latestSession) {
171
211
  return { count: 0 };
172
212
  }
173
- return this.markRevokedByFilter(userId, { NOT: { id: latestSession.id } }, 'revokeAllOtherSessions');
213
+ return this.markRevokedByFilter(userId, {
214
+ NOT: { id: latestSession.id },
215
+ revoked_at: null
216
+ }, 'revokeAllOtherSessions');
174
217
  }
175
218
  async revokeAllSessions(userId) {
176
- return this.markRevokedByFilter(userId, {}, 'revokeAllSessions');
219
+ return this.markRevokedByFilter(userId, { revoked_at: null }, 'revokeAllSessions');
177
220
  }
178
- async revokeUserSession(userId, sessionId) {
179
- await this.user.registerUserActivity(userId, "revokeSession");
180
- return this.prisma.user_session.update({
221
+ async revokeUserSession(userId, sessionId, locale) {
222
+ const session = await this.prisma.user_session.findFirst({
181
223
  where: {
182
224
  id: sessionId,
183
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
184
235
  },
185
236
  data: {
186
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":"AAKA,qBAQa,WAAW;CAAG"}
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;AAUxC,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,kCAAW;sBAAX,WAAW;IARvB,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,8BAAa,CAAC;YAC/B,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,gCAAc,CAAC;SACjC;KACJ,CAAC;GACW,WAAW,CAAG"}
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"}
@@ -3,11 +3,11 @@ import { JwtService } from "@nestjs/jwt";
3
3
  import { SecurityService } from "../security/security.service";
4
4
  import { SettingService } from "../setting/setting.service";
5
5
  export declare class TokenService {
6
+ private readonly prisma;
6
7
  private readonly jwt;
7
8
  private readonly security;
8
9
  private readonly setting;
9
- private readonly prisma;
10
- constructor(jwt: JwtService, security: SecurityService, setting: SettingService, prisma: PrismaService);
10
+ constructor(prisma: PrismaService, jwt: JwtService, security: SecurityService, setting: SettingService);
11
11
  verify(locale: string, token: string): Promise<any>;
12
12
  createAccessToken(payload: Record<string, any>): Promise<string>;
13
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":"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;IAIrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAEpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAEzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAExB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBANN,GAAG,EAAE,UAAU,EAEf,QAAQ,EAAE,eAAe,EAEzB,OAAO,EAAE,cAAc,EAEvB,MAAM,EAAE,aAAa;IAGlC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAgCpC,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"}
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"}
@@ -20,25 +20,35 @@ const jwt_1 = require("@nestjs/jwt");
20
20
  const security_service_1 = require("../security/security.service");
21
21
  const setting_service_1 = require("../setting/setting.service");
22
22
  let TokenService = class TokenService {
23
- constructor(jwt, security, setting, prisma) {
23
+ constructor(prisma, jwt, security, setting) {
24
+ this.prisma = prisma;
24
25
  this.jwt = jwt;
25
26
  this.security = security;
26
27
  this.setting = setting;
27
- this.prisma = prisma;
28
28
  }
29
29
  async verify(locale, token) {
30
30
  try {
31
31
  const payload = await this.jwt.verifyAsync(token, {
32
32
  secret: this.security.getJwtSecret(),
33
33
  });
34
- // Verify session is not revoked
35
- if (payload.sessionId) {
36
- const session = await this.prisma.session.findUnique({
37
- where: { id: payload.sessionId },
38
- select: { revoked_at: true }
39
- });
40
- if (!session || session.revoked_at !== null) {
41
- throw new common_1.UnauthorizedException((0, api_locale_1.getLocaleText)('sessionRevoked', locale, 'Session has been revoked.'));
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);
42
52
  }
43
53
  }
44
54
  return payload;
@@ -136,13 +146,12 @@ let TokenService = class TokenService {
136
146
  exports.TokenService = TokenService;
137
147
  exports.TokenService = TokenService = __decorate([
138
148
  (0, common_1.Injectable)(),
139
- __param(0, (0, common_1.Inject)((0, common_1.forwardRef)(() => jwt_1.JwtService))),
140
- __param(1, (0, common_1.Inject)((0, common_1.forwardRef)(() => security_service_1.SecurityService))),
141
- __param(2, (0, common_1.Inject)((0, common_1.forwardRef)(() => setting_service_1.SettingService))),
142
- __param(3, (0, common_1.Inject)((0, common_1.forwardRef)(() => api_prisma_1.PrismaService))),
143
- __metadata("design:paramtypes", [jwt_1.JwtService,
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,
144
154
  security_service_1.SecurityService,
145
- setting_service_1.SettingService,
146
- api_prisma_1.PrismaService])
155
+ setting_service_1.SettingService])
147
156
  ], TokenService);
148
157
  //# sourceMappingURL=token.service.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"token.service.js","sourceRoot":"","sources":["../../src/token/token.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"token.service.js","sourceRoot":"","sources":["../../src/token/token.service.ts"],"names":[],"mappings":"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"}
@@ -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.141",
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-mail": "0.0.7",
35
- "@hed-hog/api-pagination": "0.0.5",
33
+ "@hed-hog/api-locale": "0.0.11",
36
34
  "@hed-hog/types": "0.0.1",
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": {
@@ -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
- CanActivate,
5
- ExecutionContext,
6
- Injectable,
7
- UnauthorizedException,
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
 
@@ -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
  }
@@ -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
  }
@@ -1,7 +1,7 @@
1
- import { Role, User } from '@hed-hog/api';
1
+ import { Role, Session, User } from '@hed-hog/api';
2
2
  import { Locale } from '@hed-hog/api-locale';
3
3
  import { Pagination, PaginationDTO } from '@hed-hog/api-pagination';
4
- import { Controller, Delete, Get, Param } from '@nestjs/common';
4
+ import { Controller, Delete, Get, Param, ParseIntPipe } from '@nestjs/common';
5
5
  import { SessionService } from './session.service';
6
6
  @Role()
7
7
  @Controller('sessions')
@@ -10,7 +10,15 @@ export class SessionController {
10
10
  private readonly sessionService: SessionService
11
11
  ) {}
12
12
 
13
- @Role()
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
+
14
22
  @Get('user')
15
23
  async getUserSessions(
16
24
  @Pagination() paginationParams: PaginationDTO,
@@ -20,21 +28,22 @@ export class SessionController {
20
28
  return this.sessionService.getUserSessions(paginationParams, id,locale)
21
29
  }
22
30
 
23
- @Role()
24
31
  @Delete('revoke-all-other')
25
- async revokeAllOtherSessions(@User() { id }){
26
- return this.sessionService.revokeAllOtherSessions(id)
32
+ async revokeAllOtherSessions(@User() { id }, @Session() sessionId: number){
33
+ return this.sessionService.revokeAllOtherSessions(id, sessionId)
27
34
  }
28
35
 
29
- @Role()
30
36
  @Delete('revoke-all')
31
37
  async revokeAllSessions(@User() { id }){
32
38
  return this.sessionService.revokeAllSessions(id)
33
39
  }
34
40
 
35
- @Role()
36
41
  @Delete(':sessionId/revoke')
37
- async revokeSession(@User() { id: userId }, @Param('sessionId') sessionId: number){
38
- return this.sessionService.revokeUserSession(userId, sessionId)
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)
39
48
  }
40
49
  }
@@ -157,7 +157,59 @@ export class SessionService {
157
157
  pageSize: paginate.pageSize ?? paginationParams.pageSize ?? 10,
158
158
  };
159
159
  } catch (err) {
160
- throw new HttpException('Erro ao buscar sessões do usuário', HttpStatus.SERVICE_UNAVAILABLE);
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
+ );
161
213
  }
162
214
  }
163
215
 
@@ -188,27 +240,44 @@ export class SessionService {
188
240
  });
189
241
  }
190
242
 
191
- async revokeAllOtherSessions(userId: number) {
192
- const latestSession = await this.prisma.user_session.findFirst({
193
- where: { user_id: userId },
194
- orderBy: { created_at: 'desc' },
243
+ async revokeAllOtherSessions(userId: number, sessionId: number) {
244
+ const latestSession = await this.prisma.user_session.findUnique({
245
+ where: {
246
+ id: sessionId
247
+ },
195
248
  select: { id: true },
196
249
  });
197
250
 
198
251
  if (!latestSession) { return { count: 0 } }
199
- return this.markRevokedByFilter(userId, { NOT: { id: latestSession.id } }, 'revokeAllOtherSessions');
252
+ return this.markRevokedByFilter(userId, {
253
+ NOT: { id: latestSession.id },
254
+ revoked_at: null
255
+ }, 'revokeAllOtherSessions');
200
256
  }
201
257
 
202
258
  async revokeAllSessions(userId: number) {
203
- return this.markRevokedByFilter(userId, {}, 'revokeAllSessions');
259
+ return this.markRevokedByFilter(userId, { revoked_at: null }, 'revokeAllSessions');
204
260
  }
205
261
 
206
- async revokeUserSession(userId: number, sessionId: number){
207
- await this.user.registerUserActivity(userId, "revokeSession")
208
- return this.prisma.user_session.update({
262
+ async revokeUserSession(userId: number, sessionId: number, locale: string){
263
+ const session = await this.prisma.user_session.findFirst({
209
264
  where: {
210
265
  id: sessionId,
211
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
212
281
  },
213
282
  data: {
214
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
  ]
@@ -9,33 +9,42 @@ import { SettingService } from "../setting/setting.service";
9
9
  export class TokenService {
10
10
 
11
11
  constructor(
12
+ private readonly prisma: PrismaService,
12
13
  @Inject(forwardRef(() => JwtService))
13
14
  private readonly jwt: JwtService,
14
15
  @Inject(forwardRef(() => SecurityService))
15
16
  private readonly security: SecurityService,
16
17
  @Inject(forwardRef(() => SettingService))
17
18
  private readonly setting: SettingService,
18
- @Inject(forwardRef(() => PrismaService))
19
- private readonly prisma: PrismaService,
20
19
  ) { }
21
20
 
22
21
  async verify(locale: string, token: string) {
23
22
  try {
23
+
24
24
  const payload = await this.jwt.verifyAsync(token, {
25
25
  secret: this.security.getJwtSecret(),
26
26
  });
27
27
 
28
- // Verify session is not revoked
29
- if (payload.sessionId) {
30
- const session = await this.prisma.session.findUnique({
31
- where: { id: payload.sessionId },
32
- select: { revoked_at: true }
33
- });
34
-
35
- if (!session || session.revoked_at !== null) {
36
- throw new UnauthorizedException(
37
- getLocaleText('sessionRevoked', locale, 'Session has been revoked.')
38
- );
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);
39
48
  }
40
49
  }
41
50