@minimaltech/node-infra 0.5.10-1 → 0.5.10-10

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.
Files changed (284) hide show
  1. package/dist/base/applications/base.application.js +26 -39
  2. package/dist/base/applications/base.application.js.map +1 -1
  3. package/dist/base/applications/default.application.js +1 -2
  4. package/dist/base/applications/default.application.js.map +1 -1
  5. package/dist/base/base.component.js +1 -2
  6. package/dist/base/base.component.js.map +1 -1
  7. package/dist/base/base.helper.js +2 -3
  8. package/dist/base/base.helper.js.map +1 -1
  9. package/dist/base/base.provider.js +1 -2
  10. package/dist/base/base.provider.js.map +1 -1
  11. package/dist/base/base.sequence.js +14 -25
  12. package/dist/base/base.sequence.js.map +1 -1
  13. package/dist/base/controllers/common.js +6 -6
  14. package/dist/base/controllers/common.js.map +1 -1
  15. package/dist/base/controllers/crud.controller.d.ts +1 -0
  16. package/dist/base/controllers/crud.controller.d.ts.map +1 -1
  17. package/dist/base/controllers/crud.controller.js +69 -63
  18. package/dist/base/controllers/crud.controller.js.map +1 -1
  19. package/dist/base/controllers/kv.controller.js +5 -16
  20. package/dist/base/controllers/kv.controller.js.map +1 -1
  21. package/dist/base/controllers/relational.controller.js +36 -43
  22. package/dist/base/controllers/relational.controller.js.map +1 -1
  23. package/dist/base/controllers/service-crud.controller.js +42 -35
  24. package/dist/base/controllers/service-crud.controller.js.map +1 -1
  25. package/dist/base/repositories/base.repository.d.ts +8 -0
  26. package/dist/base/repositories/base.repository.d.ts.map +1 -1
  27. package/dist/base/repositories/base.repository.js +10 -15
  28. package/dist/base/repositories/base.repository.js.map +1 -1
  29. package/dist/base/repositories/relations/has-many-polymorphic/decorator.js +11 -2
  30. package/dist/base/repositories/relations/has-many-polymorphic/decorator.js.map +1 -1
  31. package/dist/base/repositories/relations/has-many-polymorphic/factory.js +12 -17
  32. package/dist/base/repositories/relations/has-many-polymorphic/factory.js.map +1 -1
  33. package/dist/base/repositories/searchable-tz-crud.repository.js +131 -150
  34. package/dist/base/repositories/searchable-tz-crud.repository.js.map +1 -1
  35. package/dist/base/repositories/tz-crud.repository.js +23 -40
  36. package/dist/base/repositories/tz-crud.repository.js.map +1 -1
  37. package/dist/base/services/base-crud.service.js +5 -9
  38. package/dist/base/services/base-crud.service.js.map +1 -1
  39. package/dist/base/services/base.service.js +1 -2
  40. package/dist/base/services/base.service.js.map +1 -1
  41. package/dist/common/configurations.d.ts +18 -0
  42. package/dist/common/configurations.d.ts.map +1 -0
  43. package/dist/common/configurations.js +34 -0
  44. package/dist/common/configurations.js.map +1 -0
  45. package/dist/common/constants.d.ts +35 -0
  46. package/dist/common/constants.d.ts.map +1 -0
  47. package/dist/common/constants.js +52 -0
  48. package/dist/common/constants.js.map +1 -0
  49. package/dist/common/environments.js +25 -25
  50. package/dist/common/environments.js.map +1 -1
  51. package/dist/common/formatters.d.ts +13 -0
  52. package/dist/common/formatters.d.ts.map +1 -0
  53. package/dist/common/formatters.js +17 -0
  54. package/dist/common/formatters.js.map +1 -0
  55. package/dist/common/index.d.ts +6 -3
  56. package/dist/common/index.d.ts.map +1 -1
  57. package/dist/common/index.js +6 -3
  58. package/dist/common/index.js.map +1 -1
  59. package/dist/common/keys.js +2 -2
  60. package/dist/common/keys.js.map +1 -1
  61. package/dist/common/result-codes.d.ts +30 -0
  62. package/dist/common/result-codes.d.ts.map +1 -0
  63. package/dist/common/result-codes.js +37 -0
  64. package/dist/common/result-codes.js.map +1 -0
  65. package/dist/common/statuses.js +28 -31
  66. package/dist/common/statuses.js.map +1 -1
  67. package/dist/common/users.js +3 -5
  68. package/dist/common/users.js.map +1 -1
  69. package/dist/components/authenticate/common/constants.js +13 -13
  70. package/dist/components/authenticate/common/constants.js.map +1 -1
  71. package/dist/components/authenticate/common/keys.js +7 -7
  72. package/dist/components/authenticate/common/keys.js.map +1 -1
  73. package/dist/components/authenticate/common/types.d.ts +9 -1
  74. package/dist/components/authenticate/common/types.d.ts.map +1 -1
  75. package/dist/components/authenticate/common/types.js +50 -9
  76. package/dist/components/authenticate/common/types.js.map +1 -1
  77. package/dist/components/authenticate/component.d.ts.map +1 -1
  78. package/dist/components/authenticate/component.js +3 -3
  79. package/dist/components/authenticate/component.js.map +1 -1
  80. package/dist/components/authenticate/controllers/auth.controller.js +10 -7
  81. package/dist/components/authenticate/controllers/auth.controller.js.map +1 -1
  82. package/dist/components/authenticate/controllers/oauth2.controller.d.ts +5 -3
  83. package/dist/components/authenticate/controllers/oauth2.controller.d.ts.map +1 -1
  84. package/dist/components/authenticate/controllers/oauth2.controller.js +57 -25
  85. package/dist/components/authenticate/controllers/oauth2.controller.js.map +1 -1
  86. package/dist/components/authenticate/index.d.ts +1 -0
  87. package/dist/components/authenticate/index.d.ts.map +1 -1
  88. package/dist/components/authenticate/index.js +1 -0
  89. package/dist/components/authenticate/index.js.map +1 -1
  90. package/dist/components/authenticate/middleware.js +23 -35
  91. package/dist/components/authenticate/middleware.js.map +1 -1
  92. package/dist/components/authenticate/oauth2-handlers/authorization-code.handler.js +4 -5
  93. package/dist/components/authenticate/oauth2-handlers/authorization-code.handler.js.map +1 -1
  94. package/dist/components/authenticate/oauth2-handlers/base.js +93 -111
  95. package/dist/components/authenticate/oauth2-handlers/base.js.map +1 -1
  96. package/dist/components/authenticate/oauth2-handlers/client-credential.handler.js +2 -3
  97. package/dist/components/authenticate/oauth2-handlers/client-credential.handler.js.map +1 -1
  98. package/dist/components/authenticate/oauth2-handlers/oauth2.js +2 -2
  99. package/dist/components/authenticate/oauth2-handlers/oauth2.js.map +1 -1
  100. package/dist/components/authenticate/services/basic-token.service.js +18 -29
  101. package/dist/components/authenticate/services/basic-token.service.js.map +1 -1
  102. package/dist/components/authenticate/services/basic.strategy.js +5 -16
  103. package/dist/components/authenticate/services/basic.strategy.js.map +1 -1
  104. package/dist/components/authenticate/services/jwt-token.service.js +22 -34
  105. package/dist/components/authenticate/services/jwt-token.service.js.map +1 -1
  106. package/dist/components/authenticate/services/oauth2.service.d.ts +2 -1
  107. package/dist/components/authenticate/services/oauth2.service.d.ts.map +1 -1
  108. package/dist/components/authenticate/services/oauth2.service.js +100 -105
  109. package/dist/components/authenticate/services/oauth2.service.js.map +1 -1
  110. package/dist/components/authenticate/services/oauth2.strategy.js +23 -37
  111. package/dist/components/authenticate/services/oauth2.strategy.js.map +1 -1
  112. package/dist/components/authorize/adapters/casbin-postgres-adapter.helper.js +40 -52
  113. package/dist/components/authorize/adapters/casbin-postgres-adapter.helper.js.map +1 -1
  114. package/dist/components/authorize/common/constants.js +10 -12
  115. package/dist/components/authorize/common/constants.js.map +1 -1
  116. package/dist/components/authorize/common/keys.js +15 -15
  117. package/dist/components/authorize/common/keys.js.map +1 -1
  118. package/dist/components/authorize/common/types.js +2 -2
  119. package/dist/components/authorize/common/types.js.map +1 -1
  120. package/dist/components/authorize/component.js +28 -39
  121. package/dist/components/authorize/component.js.map +1 -1
  122. package/dist/components/authorize/decorators/index.js +1 -1
  123. package/dist/components/authorize/decorators/index.js.map +1 -1
  124. package/dist/components/authorize/interceptor.js +75 -80
  125. package/dist/components/authorize/interceptor.js.map +1 -1
  126. package/dist/components/authorize/migrations/0000-create-view-policy.js +3 -12
  127. package/dist/components/authorize/migrations/0000-create-view-policy.js.map +1 -1
  128. package/dist/components/authorize/provider.js +80 -93
  129. package/dist/components/authorize/provider.js.map +1 -1
  130. package/dist/components/authorize/services/enforcer.service.js +16 -26
  131. package/dist/components/authorize/services/enforcer.service.js.map +1 -1
  132. package/dist/components/authorize/services/generator.service.js +62 -76
  133. package/dist/components/authorize/services/generator.service.js.map +1 -1
  134. package/dist/components/crash-report/common/keys.js +8 -10
  135. package/dist/components/crash-report/common/keys.js.map +1 -1
  136. package/dist/components/crash-report/component.js +29 -41
  137. package/dist/components/crash-report/component.js.map +1 -1
  138. package/dist/components/crash-report/providers/third-parties/base.js +1 -2
  139. package/dist/components/crash-report/providers/third-parties/base.js.map +1 -1
  140. package/dist/components/crash-report/services/mt-crash-report.service.js +3 -4
  141. package/dist/components/crash-report/services/mt-crash-report.service.js.map +1 -1
  142. package/dist/components/grpc/common/keys.js +4 -4
  143. package/dist/components/grpc/common/keys.js.map +1 -1
  144. package/dist/components/grpc/components/server.component.js +1 -2
  145. package/dist/components/grpc/components/server.component.js.map +1 -1
  146. package/dist/components/grpc/helpers/grpc-client.js +2 -3
  147. package/dist/components/grpc/helpers/grpc-client.js.map +1 -1
  148. package/dist/components/grpc/helpers/grpc-server.js +9 -11
  149. package/dist/components/grpc/helpers/grpc-server.js.map +1 -1
  150. package/dist/components/grpc/persistents/grpc.connector.js +1 -2
  151. package/dist/components/grpc/persistents/grpc.connector.js.map +1 -1
  152. package/dist/components/grpc/persistents/grpc.datasource.js +1 -1
  153. package/dist/components/grpc/persistents/grpc.datasource.js.map +1 -1
  154. package/dist/components/grpc/persistents/grpc.repository.js +1 -2
  155. package/dist/components/grpc/persistents/grpc.repository.js.map +1 -1
  156. package/dist/components/migration/common/keys.js +3 -3
  157. package/dist/components/migration/common/keys.js.map +1 -1
  158. package/dist/components/socket-io/common/constants.js +10 -10
  159. package/dist/components/socket-io/common/constants.js.map +1 -1
  160. package/dist/components/socket-io/common/keys.js +6 -6
  161. package/dist/components/socket-io/common/keys.js.map +1 -1
  162. package/dist/components/socket-io/component.js +1 -1
  163. package/dist/components/socket-io/component.js.map +1 -1
  164. package/dist/components/socket-io/helpers/socket-io-client.helper.js +2 -4
  165. package/dist/components/socket-io/helpers/socket-io-client.helper.js.map +1 -1
  166. package/dist/components/socket-io/helpers/socket-io-server.helper.js +13 -15
  167. package/dist/components/socket-io/helpers/socket-io-server.helper.js.map +1 -1
  168. package/dist/components/static-asset/common/keys.js +4 -4
  169. package/dist/components/static-asset/common/keys.js.map +1 -1
  170. package/dist/components/static-asset/controllers/asset.controller.js +67 -84
  171. package/dist/components/static-asset/controllers/asset.controller.js.map +1 -1
  172. package/dist/components/static-asset/controllers/resource.controller.js +2 -3
  173. package/dist/components/static-asset/controllers/resource.controller.js.map +1 -1
  174. package/dist/datasources/memory/datasource.js +3 -2
  175. package/dist/datasources/memory/datasource.js.map +1 -1
  176. package/dist/datasources/postgres/datasource.js +10 -10
  177. package/dist/datasources/postgres/datasource.js.map +1 -1
  178. package/dist/datasources/redis/connector.js +13 -7
  179. package/dist/datasources/redis/connector.js.map +1 -1
  180. package/dist/datasources/redis/datasource.js +7 -7
  181. package/dist/datasources/redis/datasource.js.map +1 -1
  182. package/dist/helpers/application-environment.helper.js +1 -2
  183. package/dist/helpers/application-environment.helper.js.map +1 -1
  184. package/dist/helpers/cron.helper.js +2 -3
  185. package/dist/helpers/cron.helper.js.map +1 -1
  186. package/dist/helpers/crypto/algorithms/aes.algorithm.js +8 -7
  187. package/dist/helpers/crypto/algorithms/aes.algorithm.js.map +1 -1
  188. package/dist/helpers/crypto/algorithms/base.algorithm.js +2 -4
  189. package/dist/helpers/crypto/algorithms/base.algorithm.js.map +1 -1
  190. package/dist/helpers/crypto/algorithms/rsa.algorithm.js +4 -5
  191. package/dist/helpers/crypto/algorithms/rsa.algorithm.js.map +1 -1
  192. package/dist/helpers/logger/application-logger.js +4 -6
  193. package/dist/helpers/logger/application-logger.js.map +1 -1
  194. package/dist/helpers/logger/common/types.js +20 -22
  195. package/dist/helpers/logger/common/types.js.map +1 -1
  196. package/dist/helpers/logger/default-logger.js +2 -3
  197. package/dist/helpers/logger/default-logger.js.map +1 -1
  198. package/dist/helpers/logger/factory.js +1 -1
  199. package/dist/helpers/logger/factory.js.map +1 -1
  200. package/dist/helpers/logger/transports/dgram.transport.js +10 -25
  201. package/dist/helpers/logger/transports/dgram.transport.js.map +1 -1
  202. package/dist/helpers/network/http-request/base-network-request.helper.js +32 -29
  203. package/dist/helpers/network/http-request/base-network-request.helper.js.map +1 -1
  204. package/dist/helpers/network/http-request/fetcher/axios-fetcher.js +10 -18
  205. package/dist/helpers/network/http-request/fetcher/axios-fetcher.js.map +1 -1
  206. package/dist/helpers/network/http-request/fetcher/base-fetcher.js +10 -21
  207. package/dist/helpers/network/http-request/fetcher/base-fetcher.js.map +1 -1
  208. package/dist/helpers/network/http-request/fetcher/node-fetcher.js +36 -55
  209. package/dist/helpers/network/http-request/fetcher/node-fetcher.js.map +1 -1
  210. package/dist/helpers/network/tcp-socket/base-tcp-client.helper.js +16 -23
  211. package/dist/helpers/network/tcp-socket/base-tcp-client.helper.js.map +1 -1
  212. package/dist/helpers/network/tcp-socket/base-tcp-server.helper.js +9 -16
  213. package/dist/helpers/network/tcp-socket/base-tcp-server.helper.js.map +1 -1
  214. package/dist/helpers/network/tcp-socket/network-tcp-client.helper.js +5 -1
  215. package/dist/helpers/network/tcp-socket/network-tcp-client.helper.js.map +1 -1
  216. package/dist/helpers/network/tcp-socket/network-tcp-server.helper.js +5 -1
  217. package/dist/helpers/network/tcp-socket/network-tcp-server.helper.js.map +1 -1
  218. package/dist/helpers/network/tcp-socket/network-tls-tcp-client.helper.js +5 -1
  219. package/dist/helpers/network/tcp-socket/network-tls-tcp-client.helper.js.map +1 -1
  220. package/dist/helpers/network/tcp-socket/network-tls-tcp-server.helper.js +5 -1
  221. package/dist/helpers/network/tcp-socket/network-tls-tcp-server.helper.js.map +1 -1
  222. package/dist/helpers/network/udp-socket/network-udp-client.helper.js +11 -18
  223. package/dist/helpers/network/udp-socket/network-udp-client.helper.js.map +1 -1
  224. package/dist/helpers/queue/bullmq.helper.js +11 -18
  225. package/dist/helpers/queue/bullmq.helper.js.map +1 -1
  226. package/dist/helpers/queue/mqtt.helper.d.ts +4 -0
  227. package/dist/helpers/queue/mqtt.helper.d.ts.map +1 -1
  228. package/dist/helpers/queue/mqtt.helper.js +25 -14
  229. package/dist/helpers/queue/mqtt.helper.js.map +1 -1
  230. package/dist/helpers/queue/queue.helper.js +63 -85
  231. package/dist/helpers/queue/queue.helper.js.map +1 -1
  232. package/dist/helpers/redis/default.helper.js +115 -134
  233. package/dist/helpers/redis/default.helper.js.map +1 -1
  234. package/dist/helpers/redis/redis-cluster.helper.js +7 -2
  235. package/dist/helpers/redis/redis-cluster.helper.js.map +1 -1
  236. package/dist/helpers/redis/redis.helper.js +7 -2
  237. package/dist/helpers/redis/redis.helper.js.map +1 -1
  238. package/dist/helpers/storage/minio.helper.d.ts +1 -1
  239. package/dist/helpers/storage/minio.helper.js +87 -115
  240. package/dist/helpers/storage/minio.helper.js.map +1 -1
  241. package/dist/helpers/testing/common.js +3 -3
  242. package/dist/helpers/testing/common.js.map +1 -1
  243. package/dist/helpers/testing/describe.js +12 -21
  244. package/dist/helpers/testing/describe.js.map +1 -1
  245. package/dist/helpers/testing/test-handler.js +19 -30
  246. package/dist/helpers/testing/test-handler.js.map +1 -1
  247. package/dist/helpers/testing/test-plan/base.js +4 -6
  248. package/dist/helpers/testing/test-plan/base.js.map +1 -1
  249. package/dist/helpers/worker-thread/base.js +6 -12
  250. package/dist/helpers/worker-thread/base.js.map +1 -1
  251. package/dist/helpers/worker-thread/worker-bus.js +5 -6
  252. package/dist/helpers/worker-thread/worker-bus.js.map +1 -1
  253. package/dist/helpers/worker-thread/worker-pool.js +13 -25
  254. package/dist/helpers/worker-thread/worker-pool.js.map +1 -1
  255. package/dist/interceptors/content-range.interceptor.js +116 -128
  256. package/dist/interceptors/content-range.interceptor.js.map +1 -1
  257. package/dist/middlewares/request-body-parser.middleware.js +4 -16
  258. package/dist/middlewares/request-body-parser.middleware.js.map +1 -1
  259. package/dist/middlewares/request-spy.middleware.js +4 -5
  260. package/dist/middlewares/request-spy.middleware.js.map +1 -1
  261. package/dist/migrations/handler.js +13 -22
  262. package/dist/migrations/handler.js.map +1 -1
  263. package/dist/mixins/tz.mixin.js +7 -8
  264. package/dist/mixins/tz.mixin.js.map +1 -1
  265. package/dist/mixins/user-audit.mixin.js +1 -1
  266. package/dist/mixins/user-audit.mixin.js.map +1 -1
  267. package/dist/mixins/vector.mixin.js +5 -6
  268. package/dist/mixins/vector.mixin.js.map +1 -1
  269. package/dist/tsconfig.base.json +1 -1
  270. package/dist/utilities/date.utility.js +5 -7
  271. package/dist/utilities/date.utility.js.map +1 -1
  272. package/dist/utilities/model.utility.js +2 -4
  273. package/dist/utilities/model.utility.js.map +1 -1
  274. package/dist/utilities/parse.utility.js +6 -8
  275. package/dist/utilities/parse.utility.js.map +1 -1
  276. package/dist/utilities/performance.utility.js +1 -2
  277. package/dist/utilities/performance.utility.js.map +1 -1
  278. package/dist/utilities/promise.utility.js +5 -14
  279. package/dist/utilities/promise.utility.js.map +1 -1
  280. package/dist/utilities/query.utility.js +8 -10
  281. package/dist/utilities/query.utility.js.map +1 -1
  282. package/dist/utilities/request.utility.js +2 -3
  283. package/dist/utilities/request.utility.js.map +1 -1
  284. package/package.json +23 -25
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  var __importDefault = (this && this.__importDefault) || function (mod) {
12
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
4
  };
@@ -21,9 +12,8 @@ const get_1 = __importDefault(require("lodash/get"));
21
12
  const common_2 = require("../common");
22
13
  class AbstractOAuth2AuthenticationHandler {
23
14
  constructor(opts) {
24
- var _a;
25
15
  this.logger = helpers_1.LoggerFactory.getLogger([
26
- (_a = opts === null || opts === void 0 ? void 0 : opts.scope) !== null && _a !== void 0 ? _a : AbstractOAuth2AuthenticationHandler.name,
16
+ opts?.scope ?? AbstractOAuth2AuthenticationHandler.name,
27
17
  ]);
28
18
  this.injectionGetter = opts.injectionGetter;
29
19
  this.authServiceKey = opts.authServiceKey;
@@ -48,7 +38,6 @@ class AbstractOAuth2AuthenticationHandler {
48
38
  ],
49
39
  })
50
40
  .then(oauth2Client => {
51
- var _a, _b, _c, _d;
52
41
  if (!oauth2Client) {
53
42
  reject((0, utilities_1.getError)({
54
43
  message: `[getClient] OAuth2 client NOT FOUND | clientId: ${clientId}`,
@@ -64,37 +53,34 @@ class AbstractOAuth2AuthenticationHandler {
64
53
  description: oauth2Client.description,
65
54
  grants: oauth2Client.grants,
66
55
  userId: oauth2Client.userId,
67
- redirectUris: (_b = (_a = oauth2Client === null || oauth2Client === void 0 ? void 0 : oauth2Client.endpoints) === null || _a === void 0 ? void 0 : _a.redirectUrls) !== null && _b !== void 0 ? _b : [],
68
- callbackUrls: (_d = (_c = oauth2Client === null || oauth2Client === void 0 ? void 0 : oauth2Client.endpoints) === null || _c === void 0 ? void 0 : _c.callbackUrls) !== null && _d !== void 0 ? _d : [],
56
+ redirectUris: oauth2Client?.endpoints?.redirectUrls ?? [],
57
+ callbackUrls: oauth2Client?.endpoints?.callbackUrls ?? [],
69
58
  });
70
59
  })
71
60
  .catch(reject);
72
61
  });
73
62
  }
74
- generateAccessToken(client, user, scopes) {
75
- return __awaiter(this, void 0, void 0, function* () {
76
- var _a, _b, _c;
77
- const service = this.injectionGetter('services.JWTTokenService');
78
- const userId = (0, get_1.default)(user, 'id');
79
- if (!userId) {
80
- throw (0, utilities_1.getError)({
81
- message: '[generateAccessToken] Invalid userId | Please verify getUserInformation response!',
82
- });
83
- }
84
- const authService = this.injectionGetter(this.authServiceKey);
85
- const userInformation = yield ((_a = authService === null || authService === void 0 ? void 0 : authService.getUserInformation) === null || _a === void 0 ? void 0 : _a.call(authService, { userId }));
86
- const tokenValue = service.generate({
87
- payload: {
88
- [security_1.securityId]: userId.toString(),
89
- userId: (_b = userInformation === null || userInformation === void 0 ? void 0 : userInformation.userId) !== null && _b !== void 0 ? _b : userId.toString(),
90
- roles: (_c = userInformation === null || userInformation === void 0 ? void 0 : userInformation.roles) !== null && _c !== void 0 ? _c : [],
91
- provider: client.provider,
92
- clientId: client.id,
93
- scopes,
94
- },
63
+ async generateAccessToken(client, user, scopes) {
64
+ const service = this.injectionGetter('services.JWTTokenService');
65
+ const userId = (0, get_1.default)(user, 'id');
66
+ if (!userId) {
67
+ throw (0, utilities_1.getError)({
68
+ message: '[generateAccessToken] Invalid userId | Please verify getUserInformation response!',
95
69
  });
96
- return Promise.resolve(tokenValue);
70
+ }
71
+ const authService = this.injectionGetter(this.authServiceKey);
72
+ const userInformation = await authService?.getUserInformation?.({ userId });
73
+ const tokenValue = service.generate({
74
+ payload: {
75
+ [security_1.securityId]: userId.toString(),
76
+ userId: userInformation?.userId ?? userId.toString(),
77
+ roles: userInformation?.roles ?? [],
78
+ provider: client.provider,
79
+ clientId: client.id,
80
+ scopes,
81
+ },
97
82
  });
83
+ return Promise.resolve(tokenValue);
98
84
  }
99
85
  _saveToken(opts) {
100
86
  const { type, token, client, user, details } = opts;
@@ -118,92 +104,88 @@ class AbstractOAuth2AuthenticationHandler {
118
104
  details: token,
119
105
  })
120
106
  .then(() => {
121
- resolve(Object.assign(Object.assign({}, token), { client, user }));
107
+ resolve({ ...token, client, user });
122
108
  })
123
109
  .catch(reject);
124
110
  });
125
111
  }
126
- _getToken(opts) {
127
- return __awaiter(this, void 0, void 0, function* () {
128
- const { type, token } = opts;
129
- const oauth2TokenRepository = this.injectionGetter('repositories.OAuth2TokenRepository');
130
- const oauth2Token = yield oauth2TokenRepository.findOne({
131
- where: { type, token },
112
+ async _getToken(opts) {
113
+ const { type, token } = opts;
114
+ const oauth2TokenRepository = this.injectionGetter('repositories.OAuth2TokenRepository');
115
+ const oauth2Token = await oauth2TokenRepository.findOne({
116
+ where: { type, token },
117
+ });
118
+ if (!oauth2Token) {
119
+ this.logger.error('[_getToken] Not found OAuth2Token | type: %s | token: %s', type, token);
120
+ throw (0, utilities_1.getError)({
121
+ message: `[_getToken] Not found any OAuth2Token with type: ${type} | token: ${token}`,
132
122
  });
133
- if (!oauth2Token) {
134
- this.logger.error('[_getToken] Not found OAuth2Token | type: %s | token: %s', type, token);
135
- throw (0, utilities_1.getError)({
136
- message: `[_getToken] Not found any OAuth2Token with type: ${type} | token: ${token}`,
137
- });
138
- }
139
- if (oauth2Token.status !== common_1.OAuth2TokenStatuses.ACTIVATED) {
140
- this.logger.error('[_getToken] Invalid OAuth2Token status | token: %j', oauth2Token);
141
- throw (0, utilities_1.getError)({
142
- message: `[_getToken] Invalid OAuth2Token status: ${oauth2Token.status}`,
143
- });
144
- }
145
- const userRepository = this.injectionGetter('repositories.UserRepository');
146
- const user = yield userRepository.findOne({
147
- where: { id: (0, utilities_1.int)(oauth2Token.userId) },
148
- fields: ['id'],
123
+ }
124
+ if (oauth2Token.status !== common_1.OAuth2TokenStatuses.ACTIVATED) {
125
+ this.logger.error('[_getToken] Invalid OAuth2Token status | token: %j', oauth2Token);
126
+ throw (0, utilities_1.getError)({
127
+ message: `[_getToken] Invalid OAuth2Token status: ${oauth2Token.status}`,
149
128
  });
150
- if (!user) {
151
- this.logger.error('[_getToken] Not found User | type: %s | token: %s | oauth2Token: %j', type, token, oauth2Token);
152
- throw (0, utilities_1.getError)({
153
- message: `[_getToken] Not found any User with type: ${type} | token: ${token}`,
154
- });
155
- }
156
- const oauth2ClientRepository = this.injectionGetter('repositories.OAuth2ClientRepository');
157
- const oauth2Client = yield oauth2ClientRepository.findOne({
158
- where: { id: (0, utilities_1.int)(oauth2Token.clientId) },
159
- fields: ['id', 'provider', 'identifier', 'clientId', 'name', 'description', 'userId'],
129
+ }
130
+ const userRepository = this.injectionGetter('repositories.UserRepository');
131
+ const user = await userRepository.findOne({
132
+ where: { id: (0, utilities_1.int)(oauth2Token.userId) },
133
+ fields: ['id'],
134
+ });
135
+ if (!user) {
136
+ this.logger.error('[_getToken] Not found User | type: %s | token: %s | oauth2Token: %j', type, token, oauth2Token);
137
+ throw (0, utilities_1.getError)({
138
+ message: `[_getToken] Not found any User with type: ${type} | token: ${token}`,
160
139
  });
161
- if (!oauth2Client) {
162
- this.logger.error('[_getToken] Not found OAuth2Client | type: %s | token: %s | oauth2Token: %j', type, token, oauth2Token);
163
- throw (0, utilities_1.getError)({
164
- message: `[_getToken] Not found any OAuth2Client with type: ${type} | token: ${token}`,
165
- });
166
- }
167
- return {
168
- token: oauth2Token,
169
- client: oauth2Client,
170
- user,
171
- };
140
+ }
141
+ const oauth2ClientRepository = this.injectionGetter('repositories.OAuth2ClientRepository');
142
+ const oauth2Client = await oauth2ClientRepository.findOne({
143
+ where: { id: (0, utilities_1.int)(oauth2Token.clientId) },
144
+ fields: ['id', 'provider', 'identifier', 'clientId', 'name', 'description', 'userId'],
172
145
  });
173
- }
174
- getAccessToken(accessToken) {
175
- return __awaiter(this, void 0, void 0, function* () {
176
- const service = this.injectionGetter('services.JWTTokenService');
177
- const tokenPayload = service.verify({
178
- type: common_2.Authentication.TYPE_BEARER,
179
- token: accessToken,
146
+ if (!oauth2Client) {
147
+ this.logger.error('[_getToken] Not found OAuth2Client | type: %s | token: %s | oauth2Token: %j', type, token, oauth2Token);
148
+ throw (0, utilities_1.getError)({
149
+ message: `[_getToken] Not found any OAuth2Client with type: ${type} | token: ${token}`,
180
150
  });
181
- const clientId = tokenPayload['clientId'];
182
- if (!clientId || clientId === 'NA') {
183
- this.logger.error('[getAccessToken] Invalid clientId in tokenPayload | tokenPayload: %j', tokenPayload);
184
- throw (0, utilities_1.getError)({
185
- message: '[getAccessToken] Invalid clientId in token payload!',
186
- });
187
- }
188
- const oauth2ClientRepository = this.injectionGetter('repositories.OAuth2ClientRepository');
189
- const oauth2Client = yield oauth2ClientRepository.findOne({
190
- where: { clientId },
191
- fields: ['id', 'provider', 'identifier', 'clientId', 'name', 'description', 'userId'],
151
+ }
152
+ return {
153
+ token: oauth2Token,
154
+ client: oauth2Client,
155
+ user,
156
+ };
157
+ }
158
+ async getAccessToken(accessToken) {
159
+ const service = this.injectionGetter('services.JWTTokenService');
160
+ const tokenPayload = service.verify({
161
+ type: common_2.Authentication.TYPE_BEARER,
162
+ token: accessToken,
163
+ });
164
+ const clientId = tokenPayload['clientId'];
165
+ if (!clientId || clientId === 'NA') {
166
+ this.logger.error('[getAccessToken] Invalid clientId in tokenPayload | tokenPayload: %j', tokenPayload);
167
+ throw (0, utilities_1.getError)({
168
+ message: '[getAccessToken] Invalid clientId in token payload!',
192
169
  });
193
- if (!oauth2Client) {
194
- throw (0, utilities_1.getError)({
195
- message: `[getAccessToken] Not found any OAuth2Client with id: ${clientId}`,
196
- });
197
- }
198
- return {
199
- accessToken,
200
- accessTokenExpiresAt: new Date((0, utilities_1.int)(tokenPayload['exp']) * 1000),
201
- client: Object.assign({}, oauth2Client.toObject(), {
202
- id: oauth2Client.id.toString(),
203
- }),
204
- user: { id: tokenPayload.userId },
205
- };
170
+ }
171
+ const oauth2ClientRepository = this.injectionGetter('repositories.OAuth2ClientRepository');
172
+ const oauth2Client = await oauth2ClientRepository.findOne({
173
+ where: { clientId },
174
+ fields: ['id', 'provider', 'identifier', 'clientId', 'name', 'description', 'userId'],
206
175
  });
176
+ if (!oauth2Client) {
177
+ throw (0, utilities_1.getError)({
178
+ message: `[getAccessToken] Not found any OAuth2Client with id: ${clientId}`,
179
+ });
180
+ }
181
+ return {
182
+ accessToken,
183
+ accessTokenExpiresAt: new Date((0, utilities_1.int)(tokenPayload['exp']) * 1000),
184
+ client: Object.assign({}, oauth2Client.toObject(), {
185
+ id: oauth2Client.id.toString(),
186
+ }),
187
+ user: { id: tokenPayload.userId },
188
+ };
207
189
  }
208
190
  verifyScope(token, scopes) {
209
191
  return new Promise(resolve => {
@@ -1 +1 @@
1
- {"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/components/authenticate/oauth2-handlers/base.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/components/authenticate/oauth2-handlers/base.ts"],"names":[],"mappings":"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"}
@@ -12,15 +12,14 @@ class OAuth2ClientCredentialHandler extends base_1.AbstractOAuth2AuthenticationH
12
12
  });
13
13
  }
14
14
  getUserFromClient(client) {
15
- var _a;
16
15
  this.logger.debug('[getUserFromClient] Client: %j', client);
17
16
  const service = this.injectionGetter(this.authServiceKey);
18
- if (!(service === null || service === void 0 ? void 0 : service.getUserInformation)) {
17
+ if (!service?.getUserInformation) {
19
18
  throw (0, utilities_1.getError)({
20
19
  message: `${this.authServiceKey} has no 'getUserInformation' method!`,
21
20
  });
22
21
  }
23
- const userInformation = (_a = service === null || service === void 0 ? void 0 : service.getUserInformation) === null || _a === void 0 ? void 0 : _a.call(service, client);
22
+ const userInformation = service?.getUserInformation?.(client);
24
23
  return Promise.resolve(userInformation);
25
24
  }
26
25
  }
@@ -1 +1 @@
1
- {"version":3,"file":"client-credential.handler.js","sourceRoot":"","sources":["../../../../src/components/authenticate/oauth2-handlers/client-credential.handler.ts"],"names":[],"mappings":";;;AACA,2CAAuC;AAGvC,iCAA6D;AAE7D,MAAa,6BACX,SAAQ,0CAAmC;IAG3C,YAAY,IAKX;QACC,KAAK,CAAC;YACJ,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,eAAe,EAAE,IAAI,CAAC,eAAe;SACtC,CAAC,CAAC;IACL,CAAC;IAED,iBAAiB,CAAC,MAAc;;QAC9B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,EAAE,MAAM,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAe,IAAI,CAAC,cAAc,CAAC,CAAC;QAExE,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,kBAAkB,CAAA,EAAE,CAAC;YACjC,MAAM,IAAA,oBAAQ,EAAC;gBACb,OAAO,EAAE,GAAG,IAAI,CAAC,cAAc,sCAAsC;aACtE,CAAC,CAAC;QACL,CAAC;QAED,MAAM,eAAe,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,kBAAkB,wDAAG,MAAM,CAAC,CAAC;QAC9D,OAAO,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IAC1C,CAAC;CACF;AA9BD,sEA8BC"}
1
+ {"version":3,"file":"client-credential.handler.js","sourceRoot":"","sources":["../../../../src/components/authenticate/oauth2-handlers/client-credential.handler.ts"],"names":[],"mappings":";;;AACA,2CAAuC;AAGvC,iCAA6D;AAE7D,MAAa,6BACX,SAAQ,0CAAmC;IAG3C,YAAY,IAKX;QACC,KAAK,CAAC;YACJ,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,eAAe,EAAE,IAAI,CAAC,eAAe;SACtC,CAAC,CAAC;IACL,CAAC;IAED,iBAAiB,CAAC,MAAc;QAC9B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,EAAE,MAAM,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAe,IAAI,CAAC,cAAc,CAAC,CAAC;QAExE,IAAI,CAAC,OAAO,EAAE,kBAAkB,EAAE,CAAC;YACjC,MAAM,IAAA,oBAAQ,EAAC;gBACb,OAAO,EAAE,GAAG,IAAI,CAAC,cAAc,sCAAsC;aACtE,CAAC,CAAC;QACL,CAAC;QAED,MAAM,eAAe,GAAG,OAAO,EAAE,kBAAkB,EAAE,CAAC,MAAM,CAAC,CAAC;QAC9D,OAAO,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IAC1C,CAAC;CACF;AA9BD,sEA8BC"}
@@ -28,8 +28,8 @@ class OAuth2Handler extends oauth2_server_1.default {
28
28
  if (!authHandler) {
29
29
  throw (0, utilities_1.getError)({ message: '[defineOAuth2] Invalid OAuth2 model handler!' });
30
30
  }
31
- super(Object.assign(Object.assign({}, serverOptions), { model: authHandler }));
32
- this.logger = helpers_1.LoggerFactory.getLogger([scope !== null && scope !== void 0 ? scope : OAuth2Handler.name]);
31
+ super({ ...serverOptions, model: authHandler });
32
+ this.logger = helpers_1.LoggerFactory.getLogger([scope ?? OAuth2Handler.name]);
33
33
  }
34
34
  }
35
35
  exports.OAuth2Handler = OAuth2Handler;
@@ -1 +1 @@
1
- {"version":3,"file":"oauth2.js","sourceRoot":"","sources":["../../../../src/components/authenticate/oauth2-handlers/oauth2.ts"],"names":[],"mappings":";;;;;;AAAA,uCAA6D;AAC7D,8EAAwE;AAGxE,2CAAuC;AACvC,6EAA8E;AAG9E,MAAa,aAAc,SAAQ,uBAAY;IAG7C,YAAY,IAQX;QACC,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;QAEtD,IAAI,WAAW,GAAwC,IAAI,CAAC;QAC5D,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,cAAc,CAAC;QAE1D,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,oBAAoB,CAAC,CAAC,CAAC;gBAC1B,WAAW,GAAG,IAAI,2DAA8B,CAAC;oBAC/C,cAAc;oBACd,eAAe,EAAE,cAAc,CAAC,eAAe;iBAChD,CAAC,CAAC;gBACH,MAAM;YACR,CAAC;YACD,OAAO,CAAC,CAAC,CAAC;gBACR,MAAM;YACR,CAAC;QACH,CAAC;QAED,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAA,oBAAQ,EAAC,EAAE,OAAO,EAAE,8CAA8C,EAAE,CAAC,CAAC;QAC9E,CAAC;QAED,KAAK,iCAAM,aAAa,KAAE,KAAK,EAAE,WAAW,IAAG,CAAC;QAChD,IAAI,CAAC,MAAM,GAAG,uBAAa,CAAC,SAAS,CAAC,CAAC,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;IACvE,CAAC;CACF;AArCD,sCAqCC"}
1
+ {"version":3,"file":"oauth2.js","sourceRoot":"","sources":["../../../../src/components/authenticate/oauth2-handlers/oauth2.ts"],"names":[],"mappings":";;;;;;AAAA,uCAA6D;AAC7D,8EAAwE;AAGxE,2CAAuC;AACvC,6EAA8E;AAG9E,MAAa,aAAc,SAAQ,uBAAY;IAG7C,YAAY,IAQX;QACC,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;QAEtD,IAAI,WAAW,GAAwC,IAAI,CAAC;QAC5D,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,cAAc,CAAC;QAE1D,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,oBAAoB,CAAC,CAAC,CAAC;gBAC1B,WAAW,GAAG,IAAI,2DAA8B,CAAC;oBAC/C,cAAc;oBACd,eAAe,EAAE,cAAc,CAAC,eAAe;iBAChD,CAAC,CAAC;gBACH,MAAM;YACR,CAAC;YACD,OAAO,CAAC,CAAC,CAAC;gBACR,MAAM;YACR,CAAC;QACH,CAAC;QAED,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAA,oBAAQ,EAAC,EAAE,OAAO,EAAE,8CAA8C,EAAE,CAAC,CAAC;QAC9E,CAAC;QAED,KAAK,CAAC,EAAE,GAAG,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;QAChD,IAAI,CAAC,MAAM,GAAG,uBAAa,CAAC,SAAS,CAAC,CAAC,KAAK,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;IACvE,CAAC;CACF;AArCD,sCAqCC"}
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.BasicTokenService = void 0;
13
4
  const services_1 = require("../../../base/services");
@@ -16,26 +7,24 @@ class BasicTokenService extends services_1.BaseService {
16
7
  constructor() {
17
8
  super({ scope: BasicTokenService.name });
18
9
  }
19
- verify(credential) {
20
- return __awaiter(this, void 0, void 0, function* () {
21
- if (!credential) {
22
- this.logger.error('verify', 'Missing basic credential for validating request!');
23
- throw new rest_1.HttpErrors.Unauthorized('Invalid basic request credential!');
24
- }
25
- let tokenPayload;
26
- try {
27
- const { username, password } = credential;
28
- const basicCredential = {
29
- identifier: { scheme: 'username', value: username },
30
- credential: { scheme: 'basic', value: password },
31
- };
32
- tokenPayload = basicCredential;
33
- }
34
- catch (error) {
35
- throw new rest_1.HttpErrors.Unauthorized(`Error verifying token : ${error.message}`);
36
- }
37
- return tokenPayload;
38
- });
10
+ async verify(credential) {
11
+ if (!credential) {
12
+ this.logger.error('verify', 'Missing basic credential for validating request!');
13
+ throw new rest_1.HttpErrors.Unauthorized('Invalid basic request credential!');
14
+ }
15
+ let tokenPayload;
16
+ try {
17
+ const { username, password } = credential;
18
+ const basicCredential = {
19
+ identifier: { scheme: 'username', value: username },
20
+ credential: { scheme: 'basic', value: password },
21
+ };
22
+ tokenPayload = basicCredential;
23
+ }
24
+ catch (error) {
25
+ throw new rest_1.HttpErrors.Unauthorized(`Error verifying token : ${error.message}`);
26
+ }
27
+ return tokenPayload;
39
28
  }
40
29
  }
41
30
  exports.BasicTokenService = BasicTokenService;
@@ -1 +1 @@
1
- {"version":3,"file":"basic-token.service.js","sourceRoot":"","sources":["../../../../src/components/authenticate/services/basic-token.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAA8C;AAC9C,yCAA4C;AAE5C,MAAa,iBAAkB,SAAQ,sBAAW;IAChD;QACE,KAAK,CAAC,EAAE,KAAK,EAAE,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3C,CAAC;IAEK,MAAM,CAAC,UAAkD;;YAC7D,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,kDAAkD,CAAC,CAAC;gBAChF,MAAM,IAAI,iBAAU,CAAC,YAAY,CAAC,mCAAmC,CAAC,CAAC;YACzE,CAAC;YAED,IAAI,YAAY,CAAC;YACjB,IAAI,CAAC;gBACH,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC;gBAC1C,MAAM,eAAe,GAAG;oBACtB,UAAU,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE;oBACnD,UAAU,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE;iBACjD,CAAC;gBAEF,YAAY,GAAG,eAAe,CAAC;YACjC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,IAAI,iBAAU,CAAC,YAAY,CAAC,2BAA2B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAChF,CAAC;YAED,OAAO,YAAY,CAAC;QACtB,CAAC;KAAA;CACF;AA1BD,8CA0BC"}
1
+ {"version":3,"file":"basic-token.service.js","sourceRoot":"","sources":["../../../../src/components/authenticate/services/basic-token.service.ts"],"names":[],"mappings":";;;AAAA,8CAA8C;AAC9C,yCAA4C;AAE5C,MAAa,iBAAkB,SAAQ,sBAAW;IAChD;QACE,KAAK,CAAC,EAAE,KAAK,EAAE,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,UAAkD;QAC7D,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,kDAAkD,CAAC,CAAC;YAChF,MAAM,IAAI,iBAAU,CAAC,YAAY,CAAC,mCAAmC,CAAC,CAAC;QACzE,CAAC;QAED,IAAI,YAAY,CAAC;QACjB,IAAI,CAAC;YACH,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC;YAC1C,MAAM,eAAe,GAAG;gBACtB,UAAU,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE;gBACnD,UAAU,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE;aACjD,CAAC;YAEF,YAAY,GAAG,eAAe,CAAC;QACjC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,iBAAU,CAAC,YAAY,CAAC,2BAA2B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAChF,CAAC;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;CACF;AA1BD,8CA0BC"}
@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
11
11
  var __param = (this && this.__param) || function (paramIndex, decorator) {
12
12
  return function (target, key) { decorator(target, key, paramIndex); }
13
13
  };
14
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
15
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
16
- return new (P || (P = Promise))(function (resolve, reject) {
17
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
18
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
19
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
20
- step((generator = generator.apply(thisArg, _arguments || [])).next());
21
- });
22
- };
23
14
  Object.defineProperty(exports, "__esModule", { value: true });
24
15
  exports.BasicAuthenticationStrategy = void 0;
25
16
  const core_1 = require("@loopback/core");
@@ -45,15 +36,13 @@ let BasicAuthenticationStrategy = class BasicAuthenticationStrategy {
45
36
  }
46
37
  const token = parts[1];
47
38
  const credential = Buffer.from(token, 'base64').toString();
48
- const [username, password] = (credential === null || credential === void 0 ? void 0 : credential.split(':')) || [];
39
+ const [username, password] = credential?.split(':') || [];
49
40
  return { username, password };
50
41
  }
51
- authenticate(request) {
52
- return __awaiter(this, void 0, void 0, function* () {
53
- const credential = this.extractCredentials(request);
54
- const rs = yield this.service.verify(credential);
55
- return rs;
56
- });
42
+ async authenticate(request) {
43
+ const credential = this.extractCredentials(request);
44
+ const rs = await this.service.verify(credential);
45
+ return rs;
57
46
  }
58
47
  };
59
48
  exports.BasicAuthenticationStrategy = BasicAuthenticationStrategy;
@@ -1 +1 @@
1
- {"version":3,"file":"basic.strategy.js","sourceRoot":"","sources":["../../../../src/components/authenticate/services/basic.strategy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AACA,yCAAwC;AACxC,yCAAqD;AACrD,sCAA2C;AAC3C,+DAA0D;AAE1D,IAAa,2BAA2B,GAAxC,MAAa,2BAA2B;IAGtC,YAAkD,OAAkC;QAA1B,YAAO,GAAP,OAAO,CAAmB;QAFpF,SAAI,GAAG,uBAAc,CAAC,cAAc,CAAC;IAEkD,CAAC;IAExF,kBAAkB,CAAC,OAAgB;QACjC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YACnC,MAAM,IAAI,iBAAU,CAAC,YAAY,CAAC,iCAAiC,CAAC,CAAC;QACvE,CAAC;QAED,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC;QAEtD,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,iBAAU,CAAC,YAAY,CAAC,8CAA8C,CAAC,CAAC;QACpF,CAAC;QAED,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,iBAAU,CAAC,YAAY,CAAC,qCAAqC,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACvB,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC3D,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,CAAC,GAAG,CAAC,KAAI,EAAE,CAAC;QAC1D,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;IAChC,CAAC;IAEK,YAAY,CAAC,OAAgB;;YACjC,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;YACpD,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YACjD,OAAO,EAAE,CAAC;QACZ,CAAC;KAAA;CACF,CAAA;AAhCY,kEAA2B;sCAA3B,2BAA2B;IAGzB,WAAA,IAAA,aAAM,EAAC,4BAA4B,CAAC,CAAA;qCAAkB,uCAAiB;GAHzE,2BAA2B,CAgCvC"}
1
+ {"version":3,"file":"basic.strategy.js","sourceRoot":"","sources":["../../../../src/components/authenticate/services/basic.strategy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,yCAAwC;AACxC,yCAAqD;AACrD,sCAA2C;AAC3C,+DAA0D;AAE1D,IAAa,2BAA2B,GAAxC,MAAa,2BAA2B;IAGtC,YAAkD,OAAkC;QAA1B,YAAO,GAAP,OAAO,CAAmB;QAFpF,SAAI,GAAG,uBAAc,CAAC,cAAc,CAAC;IAEkD,CAAC;IAExF,kBAAkB,CAAC,OAAgB;QACjC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YACnC,MAAM,IAAI,iBAAU,CAAC,YAAY,CAAC,iCAAiC,CAAC,CAAC;QACvE,CAAC;QAED,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC;QAEtD,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,iBAAU,CAAC,YAAY,CAAC,8CAA8C,CAAC,CAAC;QACpF,CAAC;QAED,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,iBAAU,CAAC,YAAY,CAAC,qCAAqC,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACvB,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC3D,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,UAAU,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QAC1D,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,OAAgB;QACjC,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACpD,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACjD,OAAO,EAAE,CAAC;IACZ,CAAC;CACF,CAAA;AAhCY,kEAA2B;sCAA3B,2BAA2B;IAGzB,WAAA,IAAA,aAAM,EAAC,4BAA4B,CAAC,CAAA;qCAAkB,uCAAiB;GAHzE,2BAA2B,CAgCvC"}
@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
11
11
  var __param = (this && this.__param) || function (paramIndex, decorator) {
12
12
  return function (target, key) { decorator(target, key, paramIndex); }
13
13
  };
14
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
15
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
16
- return new (P || (P = Promise))(function (resolve, reject) {
17
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
18
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
19
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
20
- step((generator = generator.apply(thisArg, _arguments || [])).next());
21
- });
22
- };
23
14
  var __importDefault = (this && this.__importDefault) || function (mod) {
24
15
  return (mod && mod.__esModule) ? mod : { "default": mod };
25
16
  };
@@ -146,31 +137,28 @@ let JWTTokenService = JWTTokenService_1 = class JWTTokenService extends services
146
137
  }
147
138
  }
148
139
  // --------------------------------------------------------------------------------------
149
- generate(opts) {
150
- return __awaiter(this, void 0, void 0, function* () {
151
- var _a, _b;
152
- const { payload, getTokenExpiresFn = () => {
153
- return Number(this.jwtExpiresIn);
154
- }, } = opts;
155
- if (!payload) {
156
- throw (0, utilities_1.getError)({
157
- statusCode: common_1.ResultCodes.RS_4.Unauthorized,
158
- message: 'Error generating token : userProfile is null',
159
- });
160
- }
161
- let token;
162
- const expiresIn = (_b = (yield ((_a = this.getTokenExpiresFn) === null || _a === void 0 ? void 0 : _a.call(this)))) !== null && _b !== void 0 ? _b : (yield getTokenExpiresFn());
163
- try {
164
- token = jsonwebtoken_1.default.sign(this.encryptPayload(payload), this.jwtSecret, { expiresIn });
165
- }
166
- catch (error) {
167
- throw (0, utilities_1.getError)({
168
- statusCode: common_1.ResultCodes.RS_4.Unauthorized,
169
- message: `Error encoding token : ${error}`,
170
- });
171
- }
172
- return token;
173
- });
140
+ async generate(opts) {
141
+ const { payload, getTokenExpiresFn = () => {
142
+ return Number(this.jwtExpiresIn);
143
+ }, } = opts;
144
+ if (!payload) {
145
+ throw (0, utilities_1.getError)({
146
+ statusCode: common_1.ResultCodes.RS_4.Unauthorized,
147
+ message: 'Error generating token : userProfile is null',
148
+ });
149
+ }
150
+ let token;
151
+ const expiresIn = (await this.getTokenExpiresFn?.()) ?? (await getTokenExpiresFn());
152
+ try {
153
+ token = jsonwebtoken_1.default.sign(this.encryptPayload(payload), this.jwtSecret, { expiresIn });
154
+ }
155
+ catch (error) {
156
+ throw (0, utilities_1.getError)({
157
+ statusCode: common_1.ResultCodes.RS_4.Unauthorized,
158
+ message: `Error encoding token : ${error}`,
159
+ });
160
+ }
161
+ return token;
174
162
  }
175
163
  };
176
164
  exports.JWTTokenService = JWTTokenService;
@@ -1 +1 @@
1
- {"version":3,"file":"jwt-token.service.js","sourceRoot":"","sources":["../../../../src/components/authenticate/services/jwt-token.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"jwt-token.service.js","sourceRoot":"","sources":["../../../../src/components/authenticate/services/jwt-token.service.ts"],"names":[],"mappings":"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"}
@@ -46,8 +46,9 @@ export declare class OAuth2Service extends BaseService {
46
46
  oauth2TokenRs: Token;
47
47
  }>;
48
48
  doClientCallback(opts: {
49
- c: string;
49
+ clientToken: string;
50
50
  oauth2Token: Token;
51
+ useImplicitGrant: boolean;
51
52
  }): Promise<void>;
52
53
  }
53
54
  //# sourceMappingURL=oauth2.service.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"oauth2.service.d.ts","sourceRoot":"","sources":["../../../../src/components/authenticate/services/oauth2.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAKtD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAkC,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAEzD,qBAAa,aAAc,SAAQ,WAAW;IAK1C,OAAO,CAAC,WAAW;IACsB,OAAO,CAAC,OAAO;IAExD,OAAO,CAAC,sBAAsB;IAPhC,OAAO,CAAC,GAAG,CAAoC;gBAIrC,WAAW,EAAE,eAAe,EACa,OAAO,EAAE,aAAa,EAE/D,sBAAsB,EAAE,sBAAsB;IAMxD,kBAAkB,CAAC,IAAI,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE;IASnE,kBAAkB,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE;;;;IAmB1C,oBAAoB,CAAC,IAAI,EAAE;QACzB,QAAQ,EAAE,MAAM,CAAC;QACjB,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,EAAE,MAAM,CAAC;KACrB,GAAG,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;IAoDpC,aAAa,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,QAAQ,CAAA;KAAE;IAc5D,SAAS,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,QAAQ,CAAA;KAAE;IAclD,QAAQ,CAAC,IAAI,EAAE;QACnB,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,UAAU,CAAC,CAAC;QACtD,cAAc,EAAE,MAAM,CAAC;QACvB,aAAa,EAAE,aAAa,CAAC;QAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB;;;;IA0DK,gBAAgB,CAAC,IAAI,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,KAAK,CAAA;KAAE;CAkD/D"}
1
+ {"version":3,"file":"oauth2.service.d.ts","sourceRoot":"","sources":["../../../../src/components/authenticate/services/oauth2.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAKtD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAkC,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAEzD,qBAAa,aAAc,SAAQ,WAAW;IAK1C,OAAO,CAAC,WAAW;IACsB,OAAO,CAAC,OAAO;IAExD,OAAO,CAAC,sBAAsB;IAPhC,OAAO,CAAC,GAAG,CAAoC;gBAIrC,WAAW,EAAE,eAAe,EACa,OAAO,EAAE,aAAa,EAE/D,sBAAsB,EAAE,sBAAsB;IAMxD,kBAAkB,CAAC,IAAI,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE;IASnE,kBAAkB,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE;;;;IAmB1C,oBAAoB,CAAC,IAAI,EAAE;QACzB,QAAQ,EAAE,MAAM,CAAC;QACjB,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,EAAE,MAAM,CAAC;KACrB,GAAG,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;IAoDpC,aAAa,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,QAAQ,CAAA;KAAE;IAc5D,SAAS,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,QAAQ,CAAA;KAAE;IAclD,QAAQ,CAAC,IAAI,EAAE;QACnB,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,UAAU,CAAC,CAAC;QACtD,cAAc,EAAE,MAAM,CAAC;QACvB,aAAa,EAAE,aAAa,CAAC;QAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB;;;;IA0DK,gBAAgB,CAAC,IAAI,EAAE;QAC3B,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,KAAK,CAAC;QACnB,gBAAgB,EAAE,OAAO,CAAC;KAC3B;CAoDF"}