mongodb-dynamic-api 2.4.0 → 2.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  Changelog
2
2
 
3
+ ## [2.4.2](https://github.com/MikeDev75015/mongodb-dynamic-api/compare/v2.4.1...v2.4.2) (2024-08-11)
4
+
5
+ ## [2.4.1](https://github.com/MikeDev75015/mongodb-dynamic-api/compare/v2.4.0...v2.4.1) (2024-08-11)
6
+
3
7
  ## [2.4.0](https://github.com/MikeDev75015/mongodb-dynamic-api/compare/v2.3.17...v2.4.0) (2024-08-11)
4
8
 
5
9
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mongodb-dynamic-api",
3
- "version": "2.4.0",
3
+ "version": "2.4.2",
4
4
  "description": "Auto generated CRUD API for MongoDB using NestJS",
5
5
  "readmeFilename": "README.md",
6
6
  "main": "index.js",
@@ -1,5 +1,8 @@
1
1
  import { CanActivate, ExecutionContext } from '@nestjs/common';
2
+ import { ExtendedSocket } from '../../../../interfaces';
2
3
  export declare class JwtSocketAuthGuard implements CanActivate {
3
4
  private readonly logger;
4
5
  canActivate(context: ExecutionContext): Promise<boolean>;
6
+ protected getAccessTokenFromSocketQuery(socket: ExtendedSocket): string;
7
+ protected extractUserFromToken(accessToken: string): Promise<unknown>;
5
8
  }
@@ -19,35 +19,41 @@ let JwtSocketAuthGuard = JwtSocketAuthGuard_1 = class JwtSocketAuthGuard {
19
19
  }
20
20
  async canActivate(context) {
21
21
  const [socket] = context.getArgs();
22
+ const accessToken = this.getAccessTokenFromSocketQuery(socket);
23
+ const user = await this.extractUserFromToken(accessToken);
24
+ if ((0, lodash_1.isEmpty)(user)) {
25
+ this.logger.warn('No user data');
26
+ throw new websockets_1.WsException('Unauthorized');
27
+ }
28
+ socket.user = user;
29
+ return true;
30
+ }
31
+ getAccessTokenFromSocketQuery(socket) {
22
32
  const accessToken = socket.handshake.query.accessToken;
23
33
  if (!accessToken) {
24
34
  throw new websockets_1.WsException('Unauthorized');
25
35
  }
36
+ return accessToken;
37
+ }
38
+ async extractUserFromToken(accessToken) {
26
39
  const jwtService = new jwt_1.JwtService({
27
40
  secret: dynamic_api_module_1.DynamicApiModule.state.get('jwtSecret'),
28
41
  signOptions: {
29
42
  expiresIn: dynamic_api_module_1.DynamicApiModule.state.get('jwtExpirationTime'),
30
43
  },
31
44
  });
32
- let verified;
33
45
  try {
34
- verified = await jwtService.verifyAsync(accessToken, {
46
+ const { iat, exp, ...user } = await jwtService.verifyAsync(accessToken, {
35
47
  secret: dynamic_api_module_1.DynamicApiModule.state.get('jwtSecret'),
36
48
  ignoreExpiration: false,
37
49
  });
50
+ return user;
38
51
  }
39
52
  catch (e) {
40
- this.logger.warn('jwtService.verify error');
53
+ this.logger.warn('extractUserFromToken jwtService.verify error');
41
54
  this.logger.warn(e.message);
42
- throw new common_1.UnauthorizedException('Unauthorized');
43
- }
44
- const { iat, exp, ...user } = verified;
45
- if ((0, lodash_1.isEmpty)(user)) {
46
- this.logger.warn('No user data');
47
55
  throw new websockets_1.WsException('Unauthorized');
48
56
  }
49
- socket.user = user;
50
- return true;
51
57
  }
52
58
  };
53
59
  exports.JwtSocketAuthGuard = JwtSocketAuthGuard;
@@ -1 +1 @@
1
- {"version":3,"file":"jwt-socket-auth.guard.js","sourceRoot":"","sources":["../../../../../../libs/dynamic-api/src/modules/auth/guards/jwt-socket-auth/jwt-socket-auth.guard.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAA0G;AAC1G,qCAAyC;AACzC,mDAAiD;AACjD,mCAAiC;AACjC,uEAAkE;AAG3D,IAAM,kBAAkB,0BAAxB,MAAM,kBAAkB;IAAxB;QACY,WAAM,GAAG,IAAI,eAAM,CAAC,oBAAkB,CAAC,IAAI,CAAC,CAAC;IA2ChE,CAAC;IAzCQ,KAAK,CAAC,WAAW,CAAC,OAAyB;QAChD,MAAM,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QAEnC,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,WAAqB,CAAC;QAEjE,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,wBAAW,CAAC,cAAc,CAAC,CAAC;QACxC,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,gBAAU,CAAC;YAChC,MAAM,EAAE,qCAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC;YAC/C,WAAW,EAAE;gBACX,SAAS,EAAE,qCAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,mBAAmB,CAAC;aAC3D;SACF,CAAC,CAAC;QAEH,IAAI,QAAsC,CAAC;QAE3C,IAAI,CAAC;YACH,QAAQ,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,WAAW,EAAE;gBACnD,MAAM,EAAE,qCAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC;gBAC/C,gBAAgB,EAAE,KAAK;aACxB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;YAC5C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAE5B,MAAM,IAAI,8BAAqB,CAAC,cAAc,CAAC,CAAC;QAClD,CAAC;QAGD,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,QAAQ,CAAC;QAEvC,IAAI,IAAA,gBAAO,EAAC,IAAI,CAAC,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACjC,MAAM,IAAI,wBAAW,CAAC,cAAc,CAAC,CAAC;QACxC,CAAC;QAED,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AA5CY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;GACA,kBAAkB,CA4C9B"}
1
+ {"version":3,"file":"jwt-socket-auth.guard.js","sourceRoot":"","sources":["../../../../../../libs/dynamic-api/src/modules/auth/guards/jwt-socket-auth/jwt-socket-auth.guard.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAAmF;AACnF,qCAAyC;AACzC,mDAAiD;AACjD,mCAAiC;AACjC,uEAAkE;AAI3D,IAAM,kBAAkB,0BAAxB,MAAM,kBAAkB;IAAxB;QACY,WAAM,GAAG,IAAI,eAAM,CAAC,oBAAkB,CAAC,IAAI,CAAC,CAAC;IAkDhE,CAAC;IAhDQ,KAAK,CAAC,WAAW,CAAC,OAAyB;QAChD,MAAM,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QAEnC,MAAM,WAAW,GAAG,IAAI,CAAC,6BAA6B,CAAC,MAAM,CAAC,CAAC;QAE/D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;QAE1D,IAAI,IAAA,gBAAO,EAAC,IAAI,CAAC,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACjC,MAAM,IAAI,wBAAW,CAAC,cAAc,CAAC,CAAC;QACxC,CAAC;QAED,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAES,6BAA6B,CAAC,MAAsB;QAC5D,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,WAAqB,CAAC;QAEjE,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,wBAAW,CAAC,cAAc,CAAC,CAAC;QACxC,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAES,KAAK,CAAC,oBAAoB,CAAC,WAAmB;QACtD,MAAM,UAAU,GAAG,IAAI,gBAAU,CAAC;YAChC,MAAM,EAAE,qCAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC;YAC/C,WAAW,EAAE;gBACX,SAAS,EAAE,qCAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,mBAAmB,CAAC;aAC3D;SACF,CAAC,CAAC;QAEH,IAAI,CAAC;YACH,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,WAAW,EAAE;gBACtE,MAAM,EAAE,qCAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC;gBAC/C,gBAAgB,EAAE,KAAK;aACxB,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAC;YACjE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAE5B,MAAM,IAAI,wBAAW,CAAC,cAAc,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;CACF,CAAA;AAnDY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;GACA,kBAAkB,CAmD9B"}
@@ -108,9 +108,6 @@ function AuthGatewayMixin(userEntity, { loginField, passwordField, abilityPredic
108
108
  }
109
109
  async register(socket, data) {
110
110
  this.addUserToSocket(socket, !registerProtected && !registerAbilityPredicate);
111
- if (registerAbilityPredicate && !registerAbilityPredicate(socket.user)) {
112
- throw new websockets_1.WsException('Access denied');
113
- }
114
111
  return {
115
112
  event: registerEvent,
116
113
  data: await this.service.register(data),
@@ -1 +1 @@
1
- {"version":3,"file":"auth-gateway.mixin.js","sourceRoot":"","sources":["../../../../../libs/dynamic-api/src/modules/auth/mixins/auth-gateway.mixin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAiD;AAEjD,6CAAuF;AACvF,mDAAiG;AACjG,mCAAiC;AACjC,gDAAgD;AAChD,8CAAoD;AAEpD,4CAAkD;AAElD,qEAAgE;AAChE,mEAA8D;AAC9D,sCAAmE;AASnE,2EAA2E;AAE3E,SAAS,gBAAgB,CACvB,UAAwB,EACxB,EACE,UAAU,EACV,aAAa,EACb,gBAAgB,EAAE,qBAAqB,GACR,EACjC,EACE,gBAAgB,EAAE,8BAA8B,EAChD,SAAS,EAAE,iBAAiB,EAC5B,gBAAgB,EAAE,wBAAwB,MACL,EAAE,EACzC,uBAA+D,EAAE,EACjE,uBAA+D,EAAE;;IAGjE,MAAM,8BAA+B,SAAQ,IAAA,kBAAQ,EAAC,UAAU,EAAE,CAAC,aAAa,CAAC,CAAC;KAIjF;SADE,aAAa;IAAd;QAFC,IAAA,qBAAW,GAAE;;4DAEU;IAI1B,MAAM,kBAAmB,SAAQ,IAAA,0BAAgB,EAC/C,IAAA,kBAAQ,EAAC,UAAU,EAAE,CAAC,UAAU,CAAC,CAAC,EAClC,8BAA8B,CAC/B;KAAG;IAEJ,MAAM,+BAA+B,GAAqB,EAAE,CAAC;IAC7D,MAAM,8BAA8B,GAAqB,EAAE,CAAC;IAE5D,IAAI,CAAC,8BAA8B,EAAE,CAAC;QACpC,8BAA8B,GAAG,EAAE,CAAC;IACtC,CAAC;IAED,8BAA8B,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAC/C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,8BAA8B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC3C,OAAO;QACT,CAAC;QAED,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,KAAmD,CAAC;QAE/E,IAAI,QAAQ,EAAE,CAAC;YACb,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7C,CAAC;aAAM,CAAC;YACN,8BAA8B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC,CAAC,CAAC;IAGH,MAAM,qBAAsB,SAAQ,IAAA,0BAAgB,EAClD,IAAA,kBAAQ,EAAC,UAAU,EAAE,CAAC,UAAU,EAAE,GAAG,+BAA+B,CAAC,CAAC,EACtE,8BAA8B,EAAE,MAAM;QACpC,CAAC,CAAC,IAAA,0BAAgB,EAChB,8BAA8B,EAC9B,IAAA,qBAAW,EAAC,IAAA,kBAAQ,EAAC,UAAU,EAAE,8BAA8B,CAAC,CAAC,CAClE;QACD,CAAC,CAAC,8BAA8B,CACnC;KAAG;IAEJ,MAAM,oBAAqB,SAAQ,IAAA,wBAAe,EAChD,UAAU,EACV,IAAI,EACJ;QACE,UAAU;QACV,aAAa;QACb,GAAG,oBAAoB,CAAC,yBAAyB,IAAI,EAAE;KACxD,CACF;KAAG;IAEJ,MAAM,yBAA0B,SAAQ,IAAA,wDAA4B,EAAC,UAAU,EAAE,wBAAwB,CAAC;KAAG;IAE7G,MAAM,8BAA+B,SAAQ,IAAA,wDAA4B,EACvE,UAAU,EACV,oBAAoB,CAAC,gBAAgB,CACtC;KAAG;IAEJ,MAAM,eAAe,GAAG,kBAAkB,CAAC;IAC3C,MAAM,kBAAkB,GAAG,qBAAqB,CAAC;IACjD,MAAM,UAAU,GAAG,YAAY,CAAC;IAChC,MAAM,aAAa,GAAG,eAAe,CAAC;IACtC,MAAM,kBAAkB,GAAG,qBAAqB,CAAC;IACjD,MAAM,mBAAmB,GAAG,sBAAsB,CAAC;IAEnD,MAAM,eAAgB,SAAQ,sBAAmB;QAC/C,YACqB,OAA4B,EAC5B,UAAsB;YAEzC,KAAK,CAAC,UAAU,CAAC,CAAC;YAHC,YAAO,GAAP,OAAO,CAAqB;YAC5B,eAAU,GAAV,UAAU,CAAY;QAG3C,CAAC;QAIK,AAAN,KAAK,CAAC,UAAU,CAAoB,MAA8B;YAChE,OAAO;gBACL,KAAK,EAAE,eAAe;gBACtB,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;aAC3E,CAAC;QACJ,CAAC;QAIK,AAAN,KAAK,CAAC,aAAa,CACE,MAA8B,EAClC,IAA0B;YAEzC,OAAO;gBACL,KAAK,EAAE,kBAAkB;gBACzB,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;aACpF,CAAC;QACJ,CAAC;QAGK,AAAN,KAAK,CAAC,KAAK,CACU,MAA8B,EAClC,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAsB;YAErF,IAAI,KAAK,IAAI,QAAQ,EAAE,CAAC;gBACtB,MAAM,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,KAAe,EAAE,QAAkB,CAAC,CAAC;YACrF,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;gBACjB,MAAM,IAAI,wBAAW,CAAC,cAAc,CAAC,CAAC;YACxC,CAAC;YAED,IAAI,qBAAqB,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;gBACjE,MAAM,IAAI,wBAAW,CAAC,eAAe,CAAC,CAAC;YACzC,CAAC;YAED,OAAO;gBACL,KAAK,EAAE,UAAU;gBACjB,IAAI,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC;aAC5C,CAAC;QACJ,CAAC;QAIK,AAAN,KAAK,CAAC,QAAQ,CACO,MAA8B,EAClC,IAA2B;YAE1C,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,iBAAiB,IAAI,CAAC,wBAAwB,CAAC,CAAC;YAE9E,IAAI,wBAAwB,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;gBACvE,MAAM,IAAI,wBAAW,CAAC,eAAe,CAAC,CAAC;YACzC,CAAC;YAED,OAAO;gBACL,KAAK,EAAE,aAAa;gBACpB,IAAI,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;aACxC,CAAC;QACJ,CAAC;QAIK,AAAN,KAAK,CAAC,aAAa,CAAgB,EAAE,KAAK,EAAoB;YAC5D,IAAI,IAAA,gBAAO,EAAC,oBAAoB,CAAC,EAAE,CAAC;gBAClC,MAAM,IAAI,wBAAW,CAAC,6BAA6B,CAAC,CAAC;YACvD,CAAC;YAED,OAAO;gBACL,KAAK,EAAE,kBAAkB;gBACzB,IAAI,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC;aAC9C,CAAC;QACJ,CAAC;QAIK,AAAN,KAAK,CAAC,cAAc,CAAgB,EAAE,kBAAkB,EAAE,WAAW,EAAqB;YACxF,IAAI,IAAA,gBAAO,EAAC,oBAAoB,CAAC,EAAE,CAAC;gBAClC,MAAM,IAAI,wBAAW,CAAC,6BAA6B,CAAC,CAAC;YACvD,CAAC;YAED,OAAO;gBACL,KAAK,EAAE,mBAAmB;gBAC1B,IAAI,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,kBAAkB,EAAE,WAAW,CAAC;aACzE,CAAC;QACJ,CAAC;KACF;IArFO;QAFL,IAAA,kBAAS,EAAC,IAAI,2BAAkB,EAAE,CAAC;QACnC,IAAA,6BAAgB,EAAC,eAAe,CAAC;QAChB,WAAA,IAAA,4BAAe,GAAE,CAAA;;;;qDAKlC;IAIK;QAFL,IAAA,kBAAS,EAAC,IAAI,2BAAkB,EAAE,EAAE,IAAI,8BAA8B,EAAE,CAAC;QACzE,IAAA,6BAAgB,EAAC,kBAAkB,CAAC;QAElC,WAAA,IAAA,4BAAe,GAAE,CAAA;QACjB,WAAA,IAAA,wBAAW,GAAE,CAAA;;iDAAO,oBAAoB;;wDAM1C;IAGK;QADL,IAAA,6BAAgB,EAAC,UAAU,CAAC;QAE1B,WAAA,IAAA,4BAAe,GAAE,CAAA;QACjB,WAAA,IAAA,wBAAW,GAAE,CAAA;;iDAAqD,kBAAkB;;gDAkBtF;IAIK;QAFL,IAAA,kBAAS,EAAC,IAAI,yBAAyB,EAAE,CAAC;QAC1C,IAAA,6BAAgB,EAAC,aAAa,CAAC;QAE7B,WAAA,IAAA,4BAAe,GAAE,CAAA;QACjB,WAAA,IAAA,wBAAW,GAAE,CAAA;;iDAAO,qBAAqB;;mDAY3C;IAIK;QAFL,IAAA,kBAAS,EAAC,IAAI,2BAAkB,CAAC,IAAA,0BAAgB,EAAC,oBAAoB,CAAC,CAAC,CAAC;QACzE,IAAA,6BAAgB,EAAC,kBAAkB,CAAC;QAChB,WAAA,IAAA,wBAAW,GAAE,CAAA;;yCAAY,qCAAgB;;wDAS7D;IAIK;QAFL,IAAA,kBAAS,EAAC,IAAI,2BAAkB,CAAC,IAAA,0BAAgB,EAAC,oBAAoB,CAAC,CAAC,CAAC;QACzE,IAAA,6BAAgB,EAAC,mBAAmB,CAAC;QAChB,WAAA,IAAA,wBAAW,GAAE,CAAA;;yCAAsC,uCAAiB;;yDASzF;IAGH,OAAO,eAAe,CAAC;AACzB,CAAC;AAEQ,4CAAgB"}
1
+ {"version":3,"file":"auth-gateway.mixin.js","sourceRoot":"","sources":["../../../../../libs/dynamic-api/src/modules/auth/mixins/auth-gateway.mixin.ts"],"names":[],"mappings":"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"}
@@ -9,6 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
9
9
  exports.AuthSocketPoliciesGuardMixin = exports.AuthPoliciesGuardMixin = void 0;
10
10
  const common_1 = require("@nestjs/common");
11
11
  const websockets_1 = require("@nestjs/websockets");
12
+ const guards_1 = require("../guards");
12
13
  function AuthPoliciesGuardMixin(entity, abilityPredicate) {
13
14
  let BaseAuthPoliciesGuard = class BaseAuthPoliciesGuard {
14
15
  constructor() {
@@ -30,15 +31,20 @@ function AuthPoliciesGuardMixin(entity, abilityPredicate) {
30
31
  }
31
32
  exports.AuthPoliciesGuardMixin = AuthPoliciesGuardMixin;
32
33
  function AuthSocketPoliciesGuardMixin(entity, abilityPredicate) {
33
- let BaseAuthSocketPoliciesGuard = class BaseAuthSocketPoliciesGuard {
34
+ let BaseAuthSocketPoliciesGuard = class BaseAuthSocketPoliciesGuard extends guards_1.JwtSocketAuthGuard {
34
35
  constructor() {
36
+ super(...arguments);
35
37
  this.entity = entity;
36
38
  this.abilityPredicate = abilityPredicate;
37
39
  }
38
- canActivate(context) {
40
+ async canActivate(context) {
39
41
  const [socket] = context.getArgs();
40
- if (this.abilityPredicate && (!socket.user || !this.abilityPredicate(socket.user))) {
41
- throw new websockets_1.WsException('Access denied');
42
+ if (this.abilityPredicate) {
43
+ const accessToken = this.getAccessTokenFromSocketQuery(socket);
44
+ socket.user = await this.extractUserFromToken(accessToken);
45
+ if (!socket.user || !this.abilityPredicate(socket.user)) {
46
+ throw new websockets_1.WsException('Access denied');
47
+ }
42
48
  }
43
49
  return true;
44
50
  }
@@ -1 +1 @@
1
- {"version":3,"file":"auth-policies-guard.mixin.js","sourceRoot":"","sources":["../../../../../libs/dynamic-api/src/modules/auth/mixins/auth-policies-guard.mixin.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwF;AACxF,mDAAiD;AAIjD,SAAS,sBAAsB,CAC7B,MAAoB,EACpB,gBAAkD;IAGlD,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;QAA3B;YACY,WAAM,GAAG,MAAM,CAAC;YAChB,qBAAgB,GAAG,gBAAgB,CAAC;QAahD,CAAC;QAXC,WAAW,CAAC,OAAyB;YACnC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;YAErD,IAAI,IAAI,CAAC,gBAAgB,IAAI,CAC3B,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CACtC,EAAE,CAAC;gBACF,MAAM,IAAI,2BAAkB,CAAC,eAAe,CAAC,CAAC;YAChD,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAA;IAfK,qBAAqB;QAD1B,IAAA,mBAAU,GAAE;OACP,qBAAqB,CAe1B;IAED,OAAO,qBAAqB,CAAC;AAC/B,CAAC;AA2BQ,wDAAsB;AAzB/B,SAAS,4BAA4B,CACnC,MAAoB,EACpB,gBAAkD;IAGlD,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;QAAjC;YACY,WAAM,GAAG,MAAM,CAAC;YAChB,qBAAgB,GAAG,gBAAgB,CAAC;QAahD,CAAC;QAXC,WAAW,CAAC,OAAyB;YACnC,MAAM,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;YAEnC,IAAI,IAAI,CAAC,gBAAgB,IAAI,CAC3B,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,CACpD,EAAE,CAAC;gBACF,MAAM,IAAI,wBAAW,CAAC,eAAe,CAAC,CAAC;YACzC,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAA;IAfK,2BAA2B;QADhC,IAAA,mBAAU,GAAE;OACP,2BAA2B,CAehC;IAED,OAAO,2BAA2B,CAAC;AACrC,CAAC;AAEgC,oEAA4B"}
1
+ {"version":3,"file":"auth-policies-guard.mixin.js","sourceRoot":"","sources":["../../../../../libs/dynamic-api/src/modules/auth/mixins/auth-policies-guard.mixin.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwF;AACxF,mDAAiD;AAGjD,sCAA+C;AAE/C,SAAS,sBAAsB,CAC7B,MAAoB,EACpB,gBAAkD;IAGlD,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;QAA3B;YACY,WAAM,GAAG,MAAM,CAAC;YAChB,qBAAgB,GAAG,gBAAgB,CAAC;QAahD,CAAC;QAXC,WAAW,CAAC,OAAyB;YACnC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;YAErD,IAAI,IAAI,CAAC,gBAAgB,IAAI,CAC3B,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CACtC,EAAE,CAAC;gBACF,MAAM,IAAI,2BAAkB,CAAC,eAAe,CAAC,CAAC;YAChD,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAA;IAfK,qBAAqB;QAD1B,IAAA,mBAAU,GAAE;OACP,qBAAqB,CAe1B;IAED,OAAO,qBAAqB,CAAC;AAC/B,CAAC;AA+BQ,wDAAsB;AA7B/B,SAAS,4BAA4B,CACnC,MAAoB,EACpB,gBAAkD;IAGlD,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,2BAAkB;QAA5D;;YACY,WAAM,GAAG,MAAM,CAAC;YAChB,qBAAgB,GAAG,gBAAgB,CAAC;QAiBhD,CAAC;QAfU,KAAK,CAAC,WAAW,CAAC,OAAyB;YAClD,MAAM,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;YAEnC,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAC1B,MAAM,WAAW,GAAG,IAAI,CAAC,6BAA6B,CAAC,MAAM,CAAC,CAAC;gBAE/D,MAAM,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;gBAE3D,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;oBACxD,MAAM,IAAI,wBAAW,CAAC,eAAe,CAAC,CAAC;gBACzC,CAAC;YACH,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAA;IAnBK,2BAA2B;QADhC,IAAA,mBAAU,GAAE;OACP,2BAA2B,CAmBhC;IAED,OAAO,2BAA2B,CAAC;AACrC,CAAC;AAEgC,oEAA4B"}
package/src/version.json CHANGED
@@ -1,3 +1,3 @@
1
1
  {
2
- "version": "2.4.0"
2
+ "version": "2.4.2"
3
3
  }