@webda/core 1.6.0-beta.1 → 2.0.0-beta.0

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 (232) hide show
  1. package/lib/application.d.ts +317 -195
  2. package/lib/application.js +171 -674
  3. package/lib/application.js.map +1 -1
  4. package/lib/application.spec.js +97 -289
  5. package/lib/application.spec.js.map +1 -1
  6. package/lib/core.d.ts +102 -214
  7. package/lib/core.js +146 -70
  8. package/lib/core.js.map +1 -1
  9. package/lib/core.spec.js +80 -17
  10. package/lib/core.spec.js.map +1 -1
  11. package/lib/index.d.ts +14 -9
  12. package/lib/index.js +19 -10
  13. package/lib/index.js.map +1 -1
  14. package/lib/models/aclmodel.d.ts +29 -8
  15. package/lib/models/aclmodel.js +68 -18
  16. package/lib/models/aclmodel.js.map +1 -1
  17. package/lib/models/aclmodel.spec.js +56 -19
  18. package/lib/models/aclmodel.spec.js.map +1 -1
  19. package/lib/models/coremodel.d.ts +9 -17
  20. package/lib/models/coremodel.js +36 -36
  21. package/lib/models/coremodel.js.map +1 -1
  22. package/lib/models/ident.d.ts +8 -3
  23. package/lib/models/ident.js +8 -1
  24. package/lib/models/ident.js.map +1 -1
  25. package/lib/models/ident.spec.js +3 -0
  26. package/lib/models/ident.spec.js.map +1 -1
  27. package/lib/models/ownermodel.d.ts +8 -4
  28. package/lib/models/ownermodel.js +10 -6
  29. package/lib/models/ownermodel.js.map +1 -1
  30. package/lib/models/rolemodel.js.map +1 -1
  31. package/lib/models/rolemodel.spec.js +4 -1
  32. package/lib/models/rolemodel.spec.js.map +1 -1
  33. package/lib/models/user.d.ts +32 -3
  34. package/lib/models/user.js +31 -0
  35. package/lib/models/user.js.map +1 -1
  36. package/lib/models/user.spec.js +11 -0
  37. package/lib/models/user.spec.js.map +1 -1
  38. package/lib/queues/filequeue.d.ts +2 -7
  39. package/lib/queues/filequeue.js +2 -11
  40. package/lib/queues/filequeue.js.map +1 -1
  41. package/lib/queues/filequeue.spec.js +0 -1
  42. package/lib/queues/filequeue.spec.js.map +1 -1
  43. package/lib/queues/memoryqueue.d.ts +2 -7
  44. package/lib/queues/memoryqueue.js +1 -11
  45. package/lib/queues/memoryqueue.js.map +1 -1
  46. package/lib/queues/memoryqueue.spec.js +0 -1
  47. package/lib/queues/memoryqueue.spec.js.map +1 -1
  48. package/lib/queues/queue.spec.d.ts +1 -1
  49. package/lib/queues/queue.spec.js +11 -9
  50. package/lib/queues/queue.spec.js.map +1 -1
  51. package/lib/queues/queueservice.js +1 -1
  52. package/lib/queues/queueservice.js.map +1 -1
  53. package/lib/router.d.ts +46 -1
  54. package/lib/router.js +89 -51
  55. package/lib/router.js.map +1 -1
  56. package/lib/router.spec.js +19 -2
  57. package/lib/router.spec.js.map +1 -1
  58. package/lib/services/asyncevents.d.ts +1 -0
  59. package/lib/services/asyncevents.js +4 -3
  60. package/lib/services/asyncevents.js.map +1 -1
  61. package/lib/services/authentication.d.ts +47 -5
  62. package/lib/services/authentication.js +99 -40
  63. package/lib/services/authentication.js.map +1 -1
  64. package/lib/services/authentication.spec.js +10 -0
  65. package/lib/services/authentication.spec.js.map +1 -1
  66. package/lib/services/binary.d.ts +126 -64
  67. package/lib/services/binary.js +247 -96
  68. package/lib/services/binary.js.map +1 -1
  69. package/lib/services/binary.spec.d.ts +1 -0
  70. package/lib/services/binary.spec.js +96 -25
  71. package/lib/services/binary.spec.js.map +1 -1
  72. package/lib/services/cloudbinary.d.ts +67 -0
  73. package/lib/services/cloudbinary.js +178 -0
  74. package/lib/services/cloudbinary.js.map +1 -0
  75. package/lib/services/cloudbinary.spec.d.ts +13 -0
  76. package/lib/services/cloudbinary.spec.js +205 -0
  77. package/lib/services/cloudbinary.spec.js.map +1 -0
  78. package/lib/services/configuration.d.ts +7 -2
  79. package/lib/services/configuration.js +4 -3
  80. package/lib/services/configuration.js.map +1 -1
  81. package/lib/services/configuration.spec.js +1 -0
  82. package/lib/services/configuration.spec.js.map +1 -1
  83. package/lib/services/cron.d.ts +5 -6
  84. package/lib/services/cron.js +4 -11
  85. package/lib/services/cron.js.map +1 -1
  86. package/lib/services/cron.spec.js +2 -3
  87. package/lib/services/cron.spec.js.map +1 -1
  88. package/lib/services/debugmailer.d.ts +11 -6
  89. package/lib/services/debugmailer.js +20 -14
  90. package/lib/services/debugmailer.js.map +1 -1
  91. package/lib/services/debugmailer.spec.js +1 -0
  92. package/lib/services/debugmailer.spec.js.map +1 -1
  93. package/lib/services/echo.d.ts +2 -6
  94. package/lib/services/echo.js +1 -11
  95. package/lib/services/echo.js.map +1 -1
  96. package/lib/services/echo.spec.js +1 -0
  97. package/lib/services/echo.spec.js.map +1 -1
  98. package/lib/services/filebinary.d.ts +36 -12
  99. package/lib/services/filebinary.js +123 -38
  100. package/lib/services/filebinary.js.map +1 -1
  101. package/lib/services/filebinary.spec.d.ts +4 -2
  102. package/lib/services/filebinary.spec.js +48 -8
  103. package/lib/services/filebinary.spec.js.map +1 -1
  104. package/lib/services/fileconfiguration.d.ts +1 -5
  105. package/lib/services/fileconfiguration.js +1 -10
  106. package/lib/services/fileconfiguration.js.map +1 -1
  107. package/lib/services/invitationservice.d.ts +198 -0
  108. package/lib/services/invitationservice.js +443 -0
  109. package/lib/services/invitationservice.js.map +1 -0
  110. package/lib/services/invitationservice.spec.d.ts +1 -0
  111. package/lib/services/invitationservice.spec.js +517 -0
  112. package/lib/services/invitationservice.spec.js.map +1 -0
  113. package/lib/services/kubernetesconfiguration.d.ts +3 -5
  114. package/lib/services/kubernetesconfiguration.js +5 -12
  115. package/lib/services/kubernetesconfiguration.js.map +1 -1
  116. package/lib/services/kubernetesconfiguration.spec.js +1 -1
  117. package/lib/services/kubernetesconfiguration.spec.js.map +1 -1
  118. package/lib/services/mailer.d.ts +44 -7
  119. package/lib/services/mailer.js +34 -14
  120. package/lib/services/mailer.js.map +1 -1
  121. package/lib/services/mailer.spec.js +29 -0
  122. package/lib/services/mailer.spec.js.map +1 -1
  123. package/lib/services/notificationservice.d.ts +76 -0
  124. package/lib/services/notificationservice.js +91 -0
  125. package/lib/services/notificationservice.js.map +1 -0
  126. package/lib/services/notificationservice.spec.d.ts +1 -0
  127. package/lib/services/notificationservice.spec.js +104 -0
  128. package/lib/services/notificationservice.spec.js.map +1 -0
  129. package/lib/services/oauth.d.ts +6 -4
  130. package/lib/services/oauth.js +28 -11
  131. package/lib/services/oauth.js.map +1 -1
  132. package/lib/services/oauth.spec.js +7 -10
  133. package/lib/services/oauth.spec.js.map +1 -1
  134. package/lib/services/resource.d.ts +1 -5
  135. package/lib/services/resource.js +22 -17
  136. package/lib/services/resource.js.map +1 -1
  137. package/lib/services/resource.spec.js +0 -1
  138. package/lib/services/resource.spec.js.map +1 -1
  139. package/lib/services/service.d.ts +29 -26
  140. package/lib/services/service.js +16 -22
  141. package/lib/services/service.js.map +1 -1
  142. package/lib/services/service.spec.js +3 -0
  143. package/lib/services/service.spec.js.map +1 -1
  144. package/lib/services/version.d.ts +2 -5
  145. package/lib/services/version.js +1 -10
  146. package/lib/services/version.js.map +1 -1
  147. package/lib/stores/aggregator.d.ts +3 -5
  148. package/lib/stores/aggregator.js +3 -10
  149. package/lib/stores/aggregator.js.map +1 -1
  150. package/lib/stores/file.d.ts +7 -8
  151. package/lib/stores/file.js +18 -18
  152. package/lib/stores/file.js.map +1 -1
  153. package/lib/stores/file.spec.js +8 -6
  154. package/lib/stores/file.spec.js.map +1 -1
  155. package/lib/stores/mapper.d.ts +1 -5
  156. package/lib/stores/mapper.js +56 -39
  157. package/lib/stores/mapper.js.map +1 -1
  158. package/lib/stores/mapper.spec.js +120 -1
  159. package/lib/stores/mapper.spec.js.map +1 -1
  160. package/lib/stores/memory.d.ts +5 -9
  161. package/lib/stores/memory.js +5 -17
  162. package/lib/stores/memory.js.map +1 -1
  163. package/lib/stores/memory.spec.d.ts +1 -0
  164. package/lib/stores/memory.spec.js +32 -0
  165. package/lib/stores/memory.spec.js.map +1 -1
  166. package/lib/stores/store.d.ts +131 -26
  167. package/lib/stores/store.js +399 -80
  168. package/lib/stores/store.js.map +1 -1
  169. package/lib/stores/store.spec.d.ts +29 -2
  170. package/lib/stores/store.spec.js +204 -31
  171. package/lib/stores/store.spec.js.map +1 -1
  172. package/lib/stores/webdaql/WebdaQLLexer.d.ts +53 -0
  173. package/lib/stores/webdaql/WebdaQLLexer.js +290 -0
  174. package/lib/stores/webdaql/WebdaQLLexer.js.map +1 -0
  175. package/lib/stores/webdaql/WebdaQLParserLexer.d.ts +53 -0
  176. package/lib/stores/webdaql/WebdaQLParserLexer.js +290 -0
  177. package/lib/stores/webdaql/WebdaQLParserLexer.js.map +1 -0
  178. package/lib/stores/webdaql/WebdaQLParserListener.d.ts +308 -0
  179. package/lib/stores/webdaql/WebdaQLParserListener.js +4 -0
  180. package/lib/stores/webdaql/WebdaQLParserListener.js.map +1 -0
  181. package/lib/stores/webdaql/WebdaQLParserParser.d.ts +301 -0
  182. package/lib/stores/webdaql/WebdaQLParserParser.js +1781 -0
  183. package/lib/stores/webdaql/WebdaQLParserParser.js.map +1 -0
  184. package/lib/stores/webdaql/WebdaQLParserVisitor.d.ts +198 -0
  185. package/lib/stores/webdaql/WebdaQLParserVisitor.js +4 -0
  186. package/lib/stores/webdaql/WebdaQLParserVisitor.js.map +1 -0
  187. package/lib/stores/webdaql/query.d.ts +300 -0
  188. package/lib/stores/webdaql/query.js +471 -0
  189. package/lib/stores/webdaql/query.js.map +1 -0
  190. package/lib/stores/webdaql/query.spec.d.ts +1 -0
  191. package/lib/stores/webdaql/query.spec.js +136 -0
  192. package/lib/stores/webdaql/query.spec.js.map +1 -0
  193. package/lib/test.d.ts +50 -2
  194. package/lib/test.js +161 -16
  195. package/lib/test.js.map +1 -1
  196. package/lib/unpackedapplication.d.ts +66 -0
  197. package/lib/unpackedapplication.js +202 -0
  198. package/lib/unpackedapplication.js.map +1 -0
  199. package/lib/utils/context.d.ts +14 -12
  200. package/lib/utils/context.js +14 -9
  201. package/lib/utils/context.js.map +1 -1
  202. package/lib/utils/context.spec.js +1 -1
  203. package/lib/utils/context.spec.js.map +1 -1
  204. package/lib/utils/cookie.d.ts +6 -3
  205. package/lib/utils/cookie.js +22 -20
  206. package/lib/utils/cookie.js.map +1 -1
  207. package/lib/utils/cookie.spec.js +0 -1
  208. package/lib/utils/cookie.spec.js.map +1 -1
  209. package/lib/utils/logger.d.ts +16 -3
  210. package/lib/utils/logger.js +16 -3
  211. package/lib/utils/logger.js.map +1 -1
  212. package/lib/utils/logger.spec.js.map +1 -1
  213. package/lib/utils/serializers.js +5 -1
  214. package/lib/utils/serializers.js.map +1 -1
  215. package/lib/utils/waiter.d.ts +1 -1
  216. package/lib/utils/waiter.js.map +1 -1
  217. package/package.json +25 -18
  218. package/test/config-file-no-reload.json +2 -1
  219. package/test/config-file-reload.json +2 -1
  220. package/test/config-invitation.json +63 -0
  221. package/test/config-kube-reload.json +2 -1
  222. package/test/config-reload.json +1 -1
  223. package/test/config.json +6 -10
  224. package/test/config.old.json +1 -1
  225. package/test/moddas/annotatedservice.js +1 -3
  226. package/test/moddas/debugmailer.js +2 -7
  227. package/test/moddas/fakeservice.js +1 -1
  228. package/test/moddas/voidstore.js +2 -4
  229. package/test/models/ident.js +1 -1
  230. package/test/models/task.js +1 -5
  231. package/webda.module.json +1124 -0
  232. package/test/config.old-default.json +0 -151
@@ -1,13 +1,14 @@
1
1
  import { OwnerModel } from "./ownermodel";
2
- declare class IdentTokens {
2
+ export declare class IdentTokens {
3
3
  refresh: string;
4
4
  access: string;
5
5
  }
6
6
  /**
7
7
  * First basic model for Ident
8
8
  * @class
9
+ * @WebdaModel
9
10
  */
10
- declare class Ident extends OwnerModel {
11
+ export declare class Ident extends OwnerModel {
11
12
  _type: string;
12
13
  uid: string;
13
14
  __profile: any;
@@ -24,10 +25,14 @@ declare class Ident extends OwnerModel {
24
25
  * When the ident was validated
25
26
  */
26
27
  _validation?: Date;
28
+ /**
29
+ * Email for this ident if it exist
30
+ */
31
+ email?: string;
27
32
  static init(type: string, uid: string, accessToken?: string, refreshToken?: string, profile?: object): Ident;
28
33
  getUser(): string;
34
+ getEmail(): string;
29
35
  setUser(user: any): void;
30
36
  getType(): string;
31
37
  setType(type: any): void;
32
38
  }
33
- export { Ident, IdentTokens };
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.IdentTokens = exports.Ident = void 0;
3
+ exports.Ident = exports.IdentTokens = void 0;
4
4
  const ownermodel_1 = require("./ownermodel");
5
5
  class IdentTokens {
6
6
  }
@@ -8,12 +8,16 @@ exports.IdentTokens = IdentTokens;
8
8
  /**
9
9
  * First basic model for Ident
10
10
  * @class
11
+ * @WebdaModel
11
12
  */
12
13
  class Ident extends ownermodel_1.OwnerModel {
13
14
  static init(type, uid, accessToken = "", refreshToken = "", profile = {}) {
14
15
  var obj = new Ident();
15
16
  obj._type = type.toLowerCase();
16
17
  obj.uid = uid.toLowerCase();
18
+ if (obj._type === "email") {
19
+ obj.email = obj.uid;
20
+ }
17
21
  obj.uuid = obj.uid + "_" + obj._type;
18
22
  obj.__profile = profile;
19
23
  obj.__tokens = new IdentTokens();
@@ -24,6 +28,9 @@ class Ident extends ownermodel_1.OwnerModel {
24
28
  getUser() {
25
29
  return this._user;
26
30
  }
31
+ getEmail() {
32
+ return this.email;
33
+ }
27
34
  setUser(user) {
28
35
  this._user = user;
29
36
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ident.js","sourceRoot":"","sources":["../../src/models/ident.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;AACb,6CAA0C;AAE1C,MAAM,WAAW;CAGhB;AA0De,kCAAW;AAzD3B;;;GAGG;AACH,MAAM,KAAM,SAAQ,uBAAU;IAkB5B,MAAM,CAAC,IAAI,CACT,IAAY,EACZ,GAAW,EACX,cAAsB,EAAE,EACxB,eAAuB,EAAE,EACzB,UAAkB,EAAE;QAEpB,IAAI,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC;QACtB,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAC/B,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAC5B,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC;QACrC,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC;QACxB,GAAG,CAAC,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC;QACjC,GAAG,CAAC,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC;QACpC,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,WAAW,CAAC;QAClC,OAAO,GAAG,CAAC;IACb,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,OAAO,CAAC,IAAI;QACV,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,OAAO,CAAC,IAAI;QACV,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;CACF;AAEQ,sBAAK"}
1
+ {"version":3,"file":"ident.js","sourceRoot":"","sources":["../../src/models/ident.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAE1C,MAAa,WAAW;CAGvB;AAHD,kCAGC;AACD;;;;GAIG;AACH,MAAa,KAAM,SAAQ,uBAAU;IAsBnC,MAAM,CAAC,IAAI,CACT,IAAY,EACZ,GAAW,EACX,cAAsB,EAAE,EACxB,eAAuB,EAAE,EACzB,UAAkB,EAAE;QAEpB,IAAI,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC;QACtB,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAC/B,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAC5B,IAAI,GAAG,CAAC,KAAK,KAAK,OAAO,EAAE;YACzB,GAAG,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC;SACrB;QACD,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC;QACrC,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC;QACxB,GAAG,CAAC,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC;QACjC,GAAG,CAAC,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC;QACpC,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,WAAW,CAAC;QAClC,OAAO,GAAG,CAAC;IACb,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,OAAO,CAAC,IAAI;QACV,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,OAAO,CAAC,IAAI;QACV,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;CACF;AA9DD,sBA8DC"}
@@ -28,6 +28,9 @@ let IdentTest = class IdentTest {
28
28
  assert.deepStrictEqual(ident.__profile, {});
29
29
  assert.strictEqual(ident.__tokens.access, "");
30
30
  assert.strictEqual(ident.__tokens.refresh, "");
31
+ assert.strictEqual(ident.getEmail(), undefined);
32
+ ident.email = "test@test.com";
33
+ assert.strictEqual(ident.getEmail(), "test@test.com");
31
34
  }
32
35
  };
33
36
  __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"ident.spec.js","sourceRoot":"","sources":["../../src/models/ident.spec.ts"],"names":[],"mappings":";;;;;;;;AAAA,iCAAiC;AACjC,2CAA8C;AAC9C,mCAAgC;AAGhC,IAAM,SAAS,GAAf,MAAM,SAAS;IACP,OAAO;QACX,eAAe;QACf,IAAI,IAAI,GAAU,IAAI,aAAK,EAAE,CAAC;QAC9B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACrB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;IAC7C,CAAC;IAEK,IAAI;QACR,IAAI,KAAK,GAAG,aAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACjE,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACxC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC1C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC/C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAChD,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACjD,KAAK,GAAG,aAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACjC,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAC5C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC9C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACjD,CAAC;CACF,CAAA;AApBO;IAAL,YAAI;wCAKJ;AAEK;IAAL,YAAI;qCAYJ;AApBG,SAAS;IADd,aAAK;GACA,SAAS,CAqBd"}
1
+ {"version":3,"file":"ident.spec.js","sourceRoot":"","sources":["../../src/models/ident.spec.ts"],"names":[],"mappings":";;;;;;;;AAAA,iCAAiC;AACjC,2CAA8C;AAC9C,mCAAgC;AAGhC,IAAM,SAAS,GAAf,MAAM,SAAS;IACP,OAAO;QACX,eAAe;QACf,IAAI,IAAI,GAAU,IAAI,aAAK,EAAE,CAAC;QAC9B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACrB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;IAC7C,CAAC;IAEK,IAAI;QACR,IAAI,KAAK,GAAG,aAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACjE,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACxC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC1C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC/C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAChD,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACjD,KAAK,GAAG,aAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACjC,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAC5C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC9C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC/C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAC;QAChD,KAAK,CAAC,KAAK,GAAG,eAAe,CAAC;QAC9B,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,eAAe,CAAC,CAAC;IACxD,CAAC;CACF,CAAA;AAvBO;IAAL,YAAI;wCAKJ;AAEK;IAAL,YAAI;qCAeJ;AAvBG,SAAS;IADd,aAAK;GACA,SAAS,CAwBd"}
@@ -1,5 +1,9 @@
1
- import { CoreModel, Context } from "../";
2
- export default class OwnerModel extends CoreModel {
1
+ import { CoreModel } from "./coremodel";
2
+ import { Context } from "../utils/context";
3
+ /**
4
+ * @WebdaModel
5
+ */
6
+ export declare class OwnerModel extends CoreModel {
3
7
  /**
4
8
  * Default owner of the object
5
9
  */
@@ -11,6 +15,7 @@ export default class OwnerModel extends CoreModel {
11
15
  public?: boolean;
12
16
  /**
13
17
  * UUID of the object
18
+ * @readonly
14
19
  */
15
20
  uuid: string;
16
21
  /**
@@ -29,7 +34,7 @@ export default class OwnerModel extends CoreModel {
29
34
  * @returns
30
35
  */
31
36
  getOwner(): string;
32
- canAct(ctx: Context, action: "create" | "update" | "get" | "delete" | "get_binary" | "detach_binary" | "attach_binary" | string): Promise<this>;
37
+ canAct(ctx: Context, action: "create" | "update" | "get" | "delete" | "get_binary" | "detach_binary" | "attach_binary" | "update_binary_metadata" | string): Promise<this>;
33
38
  /**
34
39
  * Return false if can't update
35
40
  */
@@ -43,4 +48,3 @@ export default class OwnerModel extends CoreModel {
43
48
  */
44
49
  canDelete(ctx: Context): Promise<this>;
45
50
  }
46
- export { OwnerModel };
@@ -10,8 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.OwnerModel = void 0;
13
- const __1 = require("../");
14
- class OwnerModel extends __1.CoreModel {
13
+ const coremodel_1 = require("./coremodel");
14
+ /**
15
+ * @WebdaModel
16
+ */
17
+ class OwnerModel extends coremodel_1.CoreModel {
15
18
  /**
16
19
  * Return false if can't create
17
20
  */
@@ -46,7 +49,10 @@ class OwnerModel extends __1.CoreModel {
46
49
  if (action === "create") {
47
50
  return this.canCreate(ctx);
48
51
  }
49
- else if (action === "update" || action === "attach_binary" || action === "detach_binary") {
52
+ else if (action === "update" ||
53
+ action === "attach_binary" ||
54
+ action === "detach_binary" ||
55
+ action === "update_binary_metadata") {
50
56
  return this.canUpdate(ctx);
51
57
  }
52
58
  else if (action === "get" || action === "get_binary") {
@@ -64,8 +70,7 @@ class OwnerModel extends __1.CoreModel {
64
70
  canUpdate(ctx) {
65
71
  return __awaiter(this, void 0, void 0, function* () {
66
72
  // Allow to modify itself by default
67
- if ((!this.getOwner() || ctx.getSession().getUserId() !== this.getOwner()) &&
68
- ctx.getSession().getUserId() !== this.uuid) {
73
+ if ((!this.getOwner() || ctx.getCurrentUserId() !== this.getOwner()) && ctx.getCurrentUserId() !== this.uuid) {
69
74
  throw 403;
70
75
  }
71
76
  return this;
@@ -91,6 +96,5 @@ class OwnerModel extends __1.CoreModel {
91
96
  });
92
97
  }
93
98
  }
94
- exports.default = OwnerModel;
95
99
  exports.OwnerModel = OwnerModel;
96
100
  //# sourceMappingURL=ownermodel.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ownermodel.js","sourceRoot":"","sources":["../../src/models/ownermodel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2BAAyC;AAEzC,MAAqB,UAAW,SAAQ,aAAS;IAe/C;;OAEG;IACG,SAAS,CAAC,GAAY;;YAC1B,MAAM,MAAM,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC,SAAS,EAAE,CAAC;YAC5C,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,GAAG,CAAC;aACX;YACD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAEtB,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED;;;OAGG;IACH,QAAQ,CAAC,IAAY;QACnB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAED;;;;;OAKG;IACH,QAAQ;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEK,MAAM,CACV,GAAY,EACZ,MAA0G;;YAE1G,IAAI,MAAM,KAAK,QAAQ,EAAE;gBACvB,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;aAC5B;iBAAM,IAAI,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,eAAe,IAAI,MAAM,KAAK,eAAe,EAAE;gBAC1F,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;aAC5B;iBAAM,IAAI,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,YAAY,EAAE;gBACtD,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;aACzB;iBAAM,IAAI,MAAM,KAAK,QAAQ,EAAE;gBAC9B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;aAC5B;YACD,MAAM,GAAG,CAAC;QACZ,CAAC;KAAA;IAED;;OAEG;IACG,SAAS,CAAC,GAAY;;YAC1B,oCAAoC;YACpC,IACE,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC,SAAS,EAAE,KAAK,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACtE,GAAG,CAAC,UAAU,EAAE,CAAC,SAAS,EAAE,KAAK,IAAI,CAAC,IAAI,EAC1C;gBACA,MAAM,GAAG,CAAC;aACX;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED;;OAEG;IACG,MAAM,CAAC,GAAY;;YACvB,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,OAAO,IAAI,CAAC;aACb;YACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;KAAA;IAED;;OAEG;IACG,SAAS,CAAC,GAAY;;YAC1B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;KAAA;CACF;AA5FD,6BA4FC;AAEQ,gCAAU"}
1
+ {"version":3,"file":"ownermodel.js","sourceRoot":"","sources":["../../src/models/ownermodel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAwC;AAGxC;;GAEG;AACH,MAAa,UAAW,SAAQ,qBAAS;IAgBvC;;OAEG;IACG,SAAS,CAAC,GAAY;;YAC1B,MAAM,MAAM,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC,SAAS,EAAE,CAAC;YAC5C,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,GAAG,CAAC;aACX;YACD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAEtB,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED;;;OAGG;IACH,QAAQ,CAAC,IAAY;QACnB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAED;;;;;OAKG;IACH,QAAQ;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEK,MAAM,CACV,GAAY,EACZ,MASU;;YAEV,IAAI,MAAM,KAAK,QAAQ,EAAE;gBACvB,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;aAC5B;iBAAM,IACL,MAAM,KAAK,QAAQ;gBACnB,MAAM,KAAK,eAAe;gBAC1B,MAAM,KAAK,eAAe;gBAC1B,MAAM,KAAK,wBAAwB,EACnC;gBACA,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;aAC5B;iBAAM,IAAI,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,YAAY,EAAE;gBACtD,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;aACzB;iBAAM,IAAI,MAAM,KAAK,QAAQ,EAAE;gBAC9B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;aAC5B;YACD,MAAM,GAAG,CAAC;QACZ,CAAC;KAAA;IAED;;OAEG;IACG,SAAS,CAAC,GAAY;;YAC1B,oCAAoC;YACpC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,GAAG,CAAC,gBAAgB,EAAE,KAAK,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,GAAG,CAAC,gBAAgB,EAAE,KAAK,IAAI,CAAC,IAAI,EAAE;gBAC5G,MAAM,GAAG,CAAC;aACX;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED;;OAEG;IACG,MAAM,CAAC,GAAY;;YACvB,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,OAAO,IAAI,CAAC;aACb;YACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;KAAA;IAED;;OAEG;IACG,SAAS,CAAC,GAAY;;YAC1B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;KAAA;CACF;AAxGD,gCAwGC"}
@@ -1 +1 @@
1
- {"version":3,"file":"rolemodel.js","sourceRoot":"","sources":["../../src/models/rolemodel.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;AACb,oCAA8C;AAC9C,MAAe,SAAU,SAAQ,iBAAS;IAGxC,YAAY;QACV,OAAO,KAAK,CAAC;IACf,CAAC;IAEK,QAAQ,CAAC,GAAY;;YACzB,IAAI,CAAC,GAAG,CAAC,gBAAgB,EAAE,EAAE;gBAC3B,MAAM,GAAG,CAAC;aACX;YACD,iCAAiC;YACjC,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE;gBAC1B,OAAO,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC;aAC/B;YACD,IAAI,IAAI,GAAG,MAAM,GAAG,CAAC,cAAc,EAAE,CAAC;YACtC,yBAAyB;YACzB,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YACzC,OAAO,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC;QAChC,CAAC;KAAA;IAEK,MAAM,CAAC,GAAY,EAAE,MAAc;;YACvC,sCAAsC;YACtC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,EAAE;gBAC/B,IAAI,IAAI,CAAC,YAAY,EAAE,EAAE;oBACvB,OAAO,IAAI,CAAC;iBACb;gBACD,MAAM,GAAG,CAAC;aACX;YACD,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YACrC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE;gBAClD,OAAO,IAAI,CAAC;aACb;YACD,MAAM,GAAG,CAAC;QACZ,CAAC;KAAA;CACF;AAEQ,8BAAS"}
1
+ {"version":3,"file":"rolemodel.js","sourceRoot":"","sources":["../../src/models/rolemodel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAA8C;AAC9C,MAAe,SAAU,SAAQ,iBAAS;IAGxC,YAAY;QACV,OAAO,KAAK,CAAC;IACf,CAAC;IAEK,QAAQ,CAAC,GAAY;;YACzB,IAAI,CAAC,GAAG,CAAC,gBAAgB,EAAE,EAAE;gBAC3B,MAAM,GAAG,CAAC;aACX;YACD,iCAAiC;YACjC,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE;gBAC1B,OAAO,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC;aAC/B;YACD,IAAI,IAAI,GAAG,MAAM,GAAG,CAAC,cAAc,EAAE,CAAC;YACtC,yBAAyB;YACzB,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YACzC,OAAO,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC;QAChC,CAAC;KAAA;IAEK,MAAM,CAAC,GAAY,EAAE,MAAc;;YACvC,sCAAsC;YACtC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,EAAE;gBAC/B,IAAI,IAAI,CAAC,YAAY,EAAE,EAAE;oBACvB,OAAO,IAAI,CAAC;iBACb;gBACD,MAAM,GAAG,CAAC;aACX;YACD,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YACrC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE;gBAClD,OAAO,IAAI,CAAC;aACb;YACD,MAAM,GAAG,CAAC;QACZ,CAAC;KAAA;CACF;AAEQ,8BAAS"}
@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
18
18
  const assert = require("assert");
19
19
  const mocha_1 = require("@testdeck/mocha");
20
20
  const index_1 = require("../index");
21
+ const test_1 = require("../test");
21
22
  class RolePolicyModel extends index_1.RoleModel {
22
23
  getRolesMap() {
23
24
  return {
@@ -41,7 +42,9 @@ class RolePolicyModelPermissive extends index_1.RoleModel {
41
42
  let RolePolicyTest = class RolePolicyTest {
42
43
  before() {
43
44
  return __awaiter(this, void 0, void 0, function* () {
44
- this._webda = new index_1.Core(new index_1.Application(__dirname + "/../../test/config.json"));
45
+ let app = new test_1.TestApplication(__dirname + "/../../test/config.json");
46
+ yield app.load();
47
+ this._webda = new index_1.Core(app);
45
48
  this._ctx = yield this._webda.newContext(new index_1.HttpContext("test.webda.io", "GET", "/"));
46
49
  this._session = this._ctx.newSession();
47
50
  this._session.login("none", "none");
@@ -1 +1 @@
1
- {"version":3,"file":"rolemodel.spec.js","sourceRoot":"","sources":["../../src/models/rolemodel.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rolemodel.spec.js","sourceRoot":"","sources":["../../src/models/rolemodel.spec.ts"],"names":[],"mappings":"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"}
@@ -1,14 +1,21 @@
1
+ import { PartialModel } from "../services/service";
1
2
  import { Ident } from "./ident";
2
3
  import { OwnerModel } from "./ownermodel";
3
4
  /**
4
5
  * First basic model for User
5
6
  * @class
7
+ * @WebdaModel
6
8
  */
7
- declare class User extends OwnerModel {
9
+ export declare class User extends OwnerModel {
8
10
  /**
9
11
  * Password of the user if defined
10
12
  */
11
13
  private __password?;
14
+ /**
15
+ * Display name for this user
16
+ * @optional
17
+ */
18
+ protected displayName: string;
12
19
  /**
13
20
  * Last time the password was recovered
14
21
  */
@@ -25,9 +32,32 @@ declare class User extends OwnerModel {
25
32
  * Idents used by the user
26
33
  */
27
34
  private _idents;
35
+ /**
36
+ * Define the user avatar if exists
37
+ */
38
+ private _avatar?;
39
+ /**
40
+ * Contains the locale of the user if known
41
+ */
42
+ locale?: string;
43
+ /**
44
+ * Contain main user email if exists
45
+ */
46
+ email?: string;
47
+ /**
48
+ * Return user email if known or guessable
49
+ * @returns
50
+ */
51
+ getEmail(): string | null;
52
+ /**
53
+ * Return displayable public entry
54
+ * @returns
55
+ */
56
+ toPublicEntry(): any;
28
57
  getGroups(): string[];
29
58
  getRoles(): string[];
30
- getIdents(): Ident[];
59
+ getDisplayName(): string;
60
+ getIdents(): PartialModel<Ident>[];
31
61
  addRole(role: string): void;
32
62
  hasRole(role: string): boolean;
33
63
  removeRole(role: string): void;
@@ -38,4 +68,3 @@ declare class User extends OwnerModel {
38
68
  getPassword(): string;
39
69
  setPassword(password: string): void;
40
70
  }
41
- export { User };
@@ -5,6 +5,7 @@ const ownermodel_1 = require("./ownermodel");
5
5
  /**
6
6
  * First basic model for User
7
7
  * @class
8
+ * @WebdaModel
8
9
  */
9
10
  class User extends ownermodel_1.OwnerModel {
10
11
  constructor() {
@@ -26,12 +27,42 @@ class User extends ownermodel_1.OwnerModel {
26
27
  */
27
28
  this._idents = [];
28
29
  }
30
+ /**
31
+ * Return user email if known or guessable
32
+ * @returns
33
+ */
34
+ getEmail() {
35
+ var _a;
36
+ if (this.email === undefined) {
37
+ (this._idents || []).some(i => {
38
+ if (i.email) {
39
+ this.email = i.email;
40
+ }
41
+ });
42
+ (_a = this.email) !== null && _a !== void 0 ? _a : (this.email = null);
43
+ }
44
+ return this.email;
45
+ }
46
+ /**
47
+ * Return displayable public entry
48
+ * @returns
49
+ */
50
+ toPublicEntry() {
51
+ return {
52
+ displayName: this.displayName,
53
+ uuid: this.getUuid(),
54
+ avatar: this._avatar
55
+ };
56
+ }
29
57
  getGroups() {
30
58
  return this._groups;
31
59
  }
32
60
  getRoles() {
33
61
  return this._roles;
34
62
  }
63
+ getDisplayName() {
64
+ return this.displayName;
65
+ }
35
66
  getIdents() {
36
67
  return this._idents;
37
68
  }
@@ -1 +1 @@
1
- {"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/models/user.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;AAEb,6CAA0C;AAE1C;;;GAGG;AACH,MAAM,IAAK,SAAQ,uBAAU;IAA7B;;QAKE;;WAEG;QACK,0BAAqB,GAAY,CAAC,CAAC;QAC3C;;WAEG;QACK,WAAM,GAAa,EAAE,CAAC;QAC9B;;WAEG;QACK,YAAO,GAAa,EAAE,CAAC;QAC/B;;WAEG;QACK,YAAO,GAAY,EAAE,CAAC;IAkEhC,CAAC;IAhEC,SAAS;QACP,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,OAAO,CAAC,IAAY;QAClB,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACtB,OAAO;SACR;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED,OAAO,CAAC,IAAY;QAClB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,UAAU,CAAC,IAAY;QACrB,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACpC,IAAI,GAAG,GAAG,CAAC,EAAE;YACX,OAAO;SACR;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAC7B,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACvB,OAAO;SACR;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;IAED,OAAO,CAAC,KAAa;QACnB,IAAI,KAAK,KAAK,KAAK,IAAI,KAAK,KAAK,IAAI,CAAC,IAAI,EAAE;YAC1C,OAAO,IAAI,CAAC;SACb;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;IAED,WAAW,CAAC,KAAa;QACvB,IAAI,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,GAAG,GAAG,CAAC,EAAE;YACX,OAAO;SACR;QACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED,0BAA0B,CAAC,SAAiB;QAC1C,OAAO,IAAI,CAAC,qBAAqB,GAAG,SAAS,CAAC;IAChD,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,WAAW,CAAC,QAAgB;QAC1B,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC;IAC7B,CAAC;CACF;AAEQ,oBAAI"}
1
+ {"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/models/user.ts"],"names":[],"mappings":"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"}
@@ -39,6 +39,14 @@ let UserTest = class UserTest {
39
39
  let user = new user_1.User();
40
40
  assert.deepStrictEqual(user.getIdents(), []);
41
41
  }
42
+ emailGetter() {
43
+ let user = new user_1.User();
44
+ user.load({ _idents: [{}, { email: "testIdent@test.com" }] }, true);
45
+ assert.strictEqual(user.getEmail(), "testIdent@test.com");
46
+ user.load({ email: "test@test.com", displayName: "Top" });
47
+ assert.strictEqual(user.getEmail(), "test@test.com");
48
+ assert.strictEqual(user.getDisplayName(), "Top");
49
+ }
42
50
  };
43
51
  __decorate([
44
52
  (0, mocha_1.test)("Verify groups in user")
@@ -52,6 +60,9 @@ __decorate([
52
60
  __decorate([
53
61
  mocha_1.test
54
62
  ], UserTest.prototype, "idents", null);
63
+ __decorate([
64
+ mocha_1.test
65
+ ], UserTest.prototype, "emailGetter", null);
55
66
  UserTest = __decorate([
56
67
  mocha_1.suite
57
68
  ], UserTest);
@@ -1 +1 @@
1
- {"version":3,"file":"user.spec.js","sourceRoot":"","sources":["../../src/models/user.spec.ts"],"names":[],"mappings":";;;;;;;;AAAA,iCAAiC;AACjC,2CAA8C;AAC9C,iCAA8B;AAG9B,IAAM,QAAQ,GAAd,MAAM,QAAQ;IACmB,eAAe;QAC5C,IAAI,IAAI,GAAS,IAAI,WAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACtB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACtB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACzB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC;QAChD,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IAE6B,cAAc;QAC1C,IAAI,IAAI,GAAS,IAAI,WAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACrB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACrB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACxB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC;QAChD,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAC7B,CAAC;IAGD,QAAQ;QACN,IAAI,IAAI,GAAS,IAAI,WAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IAGD,MAAM;QACJ,IAAI,IAAI,GAAS,IAAI,WAAI,EAAE,CAAC;QAC5B,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;IAC/C,CAAC;CACF,CAAA;AAlCgC;IAA9B,IAAA,YAAI,EAAC,uBAAuB,CAAC;+CAU7B;AAE6B;IAA7B,IAAA,YAAI,EAAC,sBAAsB,CAAC;8CAS5B;AAGD;IADC,YAAI;wCAIJ;AAGD;IADC,YAAI;sCAIJ;AAlCG,QAAQ;IADb,aAAK;GACA,QAAQ,CAmCb"}
1
+ {"version":3,"file":"user.spec.js","sourceRoot":"","sources":["../../src/models/user.spec.ts"],"names":[],"mappings":";;;;;;;;AAAA,iCAAiC;AACjC,2CAA8C;AAC9C,iCAA8B;AAG9B,IAAM,QAAQ,GAAd,MAAM,QAAQ;IACmB,eAAe;QAC5C,IAAI,IAAI,GAAS,IAAI,WAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACtB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACtB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACzB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC;QAChD,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IAE6B,cAAc;QAC1C,IAAI,IAAI,GAAS,IAAI,WAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACrB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACrB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACxB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC;QAChD,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAC7B,CAAC;IAGD,QAAQ;QACN,IAAI,IAAI,GAAS,IAAI,WAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IAGD,MAAM;QACJ,IAAI,IAAI,GAAS,IAAI,WAAI,EAAE,CAAC;QAC5B,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;IAC/C,CAAC;IAGD,WAAW;QACT,IAAI,IAAI,GAAS,IAAI,WAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,oBAAoB,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACpE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,oBAAoB,CAAC,CAAC;QAC1D,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1D,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,eAAe,CAAC,CAAC;QACrD,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,KAAK,CAAC,CAAC;IACnD,CAAC;CACF,CAAA;AA5CgC;IAA9B,IAAA,YAAI,EAAC,uBAAuB,CAAC;+CAU7B;AAE6B;IAA7B,IAAA,YAAI,EAAC,sBAAsB,CAAC;8CAS5B;AAGD;IADC,YAAI;wCAIJ;AAGD;IADC,YAAI;sCAIJ;AAGD;IADC,YAAI;2CAQJ;AA5CG,QAAQ;IADb,aAAK;GACA,QAAQ,CA6Cb"}
@@ -1,4 +1,3 @@
1
- import { ModdaDefinition } from "../core";
2
1
  import { ServiceParameters } from "../services/service";
3
2
  import { MessageReceipt, Queue, QueueParameters } from "./queueservice";
4
3
  export declare class FileQueueParameters extends QueueParameters {
@@ -17,8 +16,9 @@ export declare class FileQueueParameters extends QueueParameters {
17
16
  /**
18
17
  * FIFO Queue on filesystem
19
18
  * @category CoreServices
19
+ * @WebdaModda
20
20
  */
21
- declare class FileQueue<T = any, K extends FileQueueParameters = FileQueueParameters> extends Queue<T, K> {
21
+ export declare class FileQueue<T = any, K extends FileQueueParameters = FileQueueParameters> extends Queue<T, K> {
22
22
  /**
23
23
  * @inheritdoc
24
24
  */
@@ -55,9 +55,4 @@ declare class FileQueue<T = any, K extends FileQueueParameters = FileQueueParame
55
55
  * @inheritdoc
56
56
  */
57
57
  __clean(): Promise<void>;
58
- /**
59
- * @inheritdoc
60
- */
61
- static getModda(): ModdaDefinition;
62
58
  }
63
- export { FileQueue };
@@ -27,6 +27,7 @@ exports.FileQueueParameters = FileQueueParameters;
27
27
  /**
28
28
  * FIFO Queue on filesystem
29
29
  * @category CoreServices
30
+ * @WebdaModda
30
31
  */
31
32
  class FileQueue extends queueservice_1.Queue {
32
33
  /**
@@ -85,7 +86,7 @@ class FileQueue extends queueservice_1.Queue {
85
86
  .filter(f => f.endsWith(".json"))
86
87
  .map(f => {
87
88
  const lockFile = (0, path_1.join)(this.parameters.folder, f + ".lock");
88
- let res = Object.assign(Object.assign({}, fs.lstatSync((0, path_1.join)(this.parameters.folder, f))), { path: (0, path_1.join)(this.parameters.folder, f), hasLock: fs.existsSync(lockFile), uid: f.substr(0, f.length - 5) });
89
+ let res = Object.assign(Object.assign({}, fs.lstatSync((0, path_1.join)(this.parameters.folder, f))), { path: (0, path_1.join)(this.parameters.folder, f), hasLock: fs.existsSync(lockFile), uid: f.substring(0, f.length - 5) });
89
90
  if (res.hasLock) {
90
91
  const lock = fs.lstatSync(lockFile);
91
92
  if (lock.ctimeMs < Date.now() - this.parameters.expire) {
@@ -146,16 +147,6 @@ class FileQueue extends queueservice_1.Queue {
146
147
  require("fs-extra").emptyDirSync(this.parameters.folder);
147
148
  });
148
149
  }
149
- /**
150
- * @inheritdoc
151
- */
152
- static getModda() {
153
- return {
154
- uuid: "Webda/FileQueue",
155
- label: "FileQueue",
156
- description: "Implements a simple queue on filesystem"
157
- };
158
- }
159
150
  }
160
151
  exports.FileQueue = FileQueue;
161
152
  //# sourceMappingURL=filequeue.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"filequeue.js","sourceRoot":"","sources":["../../src/queues/filequeue.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"filequeue.js","sourceRoot":"","sources":["../../src/queues/filequeue.ts"],"names":[],"mappings":"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"}
@@ -71,7 +71,6 @@ let FileQueueTest = class FileQueueTest extends queue_spec_1.QueueTest {
71
71
  queue.computeParameters();
72
72
  assert.ok(fs.existsSync(queue.getParameters().folder));
73
73
  queue.computeParameters();
74
- filequeue_1.FileQueue.getModda();
75
74
  });
76
75
  }
77
76
  };
@@ -1 +1 @@
1
- {"version":3,"file":"filequeue.spec.js","sourceRoot":"","sources":["../../src/queues/filequeue.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAA8C;AAC9C,iCAAiC;AACjC,2BAAgC;AAChC,2CAAwC;AACxC,6CAAyC;AACzC,yBAAyB;AACzB,uCAAwC;AAGxC,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,sBAAS;IAE7B,KAAK;;YACT,IAAI,KAAK,GAAyB,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YAC/D,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;YACtB,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;KAAA;IAGK,IAAI;;YACR,IAAI,KAAK,GAAyB,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YAC/D,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;YACtB,MAAM,KAAK,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;YAC1C,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;YACvC,IAAI,IAAI,GAAG,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;YACxC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YAClC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YACnC,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACvB,MAAM,KAAK,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;YAC3C,IAAI,GAAG,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;YACpC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YACnC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACxC,IAAA,eAAU,EAAC,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,YAAY,CAAC,CAAC;YAChF,MAAM,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;YAChD,IAAI,GAAG,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;YACpC,IAAA,eAAU,EAAC,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,OAAO,CAAC,CAAC;YAC5E,MAAM,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;YACjD,KAAK,GAAG,IAAI,qBAAS,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YAC3C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC1D,CAAC;KAAA;IAGK,WAAW;;YACf,IAAI,KAAK,GAAyB,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YAC/D,IAAI,SAAS,GAAG,IAAI,CAAC;YACrB,KAAK,CAAC,OAAO,GAAG,CAAC,GAAW,EAAE,EAAE;gBAC9B,IAAI,SAAS,EAAE;oBACb,EAAE,CAAC,aAAa,CAAC,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,CAAC,CAAC;oBACtE,SAAS,GAAG,KAAK,CAAC;iBACnB;gBACD,OAAO,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,IAAI,GAAG,OAAO,CAAC;YACvD,CAAC,CAAC;YACF,MAAM,KAAK,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;YAC1C,IAAA,uBAAY,EAAC,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC;YAC3C,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC;YAC3C,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;YACxD,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC1B,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;YACvD,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC1B,qBAAS,CAAC,QAAQ,EAAE,CAAC;QACvB,CAAC;KAAA;CACF,CAAA;AAjDC;IADC,YAAI;0CAKJ;AAGD;IADC,YAAI;yCAqBJ;AAGD;IADC,YAAI;gDAmBJ;AAlDG,aAAa;IADlB,aAAK;GACA,aAAa,CAmDlB"}
1
+ {"version":3,"file":"filequeue.spec.js","sourceRoot":"","sources":["../../src/queues/filequeue.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAA8C;AAC9C,iCAAiC;AACjC,2BAAgC;AAChC,2CAAwC;AACxC,6CAAyC;AACzC,yBAAyB;AACzB,uCAAwC;AAGxC,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,sBAAS;IAE7B,KAAK;;YACT,IAAI,KAAK,GAAyB,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YAC/D,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;YACtB,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;KAAA;IAGK,IAAI;;YACR,IAAI,KAAK,GAAyB,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YAC/D,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;YACtB,MAAM,KAAK,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;YAC1C,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;YACvC,IAAI,IAAI,GAAG,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;YACxC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YAClC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YACnC,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACvB,MAAM,KAAK,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;YAC3C,IAAI,GAAG,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;YACpC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YACnC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACxC,IAAA,eAAU,EAAC,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,YAAY,CAAC,CAAC;YAChF,MAAM,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;YAChD,IAAI,GAAG,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;YACpC,IAAA,eAAU,EAAC,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,OAAO,CAAC,CAAC;YAC5E,MAAM,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;YACjD,KAAK,GAAG,IAAI,qBAAS,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YAC3C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC1D,CAAC;KAAA;IAGK,WAAW;;YACf,IAAI,KAAK,GAAyB,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YAC/D,IAAI,SAAS,GAAG,IAAI,CAAC;YACrB,KAAK,CAAC,OAAO,GAAG,CAAC,GAAW,EAAE,EAAE;gBAC9B,IAAI,SAAS,EAAE;oBACb,EAAE,CAAC,aAAa,CAAC,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,CAAC,CAAC;oBACtE,SAAS,GAAG,KAAK,CAAC;iBACnB;gBACD,OAAO,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,IAAI,GAAG,OAAO,CAAC;YACvD,CAAC,CAAC;YACF,MAAM,KAAK,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;YAC1C,IAAA,uBAAY,EAAC,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC;YAC3C,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC;YAC3C,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;YACxD,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC1B,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;YACvD,KAAK,CAAC,iBAAiB,EAAE,CAAC;QAC5B,CAAC;KAAA;CACF,CAAA;AAhDC;IADC,YAAI;0CAKJ;AAGD;IADC,YAAI;yCAqBJ;AAGD;IADC,YAAI;gDAkBJ;AAjDG,aAAa;IADlB,aAAK;GACA,aAAa,CAkDlB"}
@@ -1,4 +1,3 @@
1
- import { ModdaDefinition } from "../core";
2
1
  import { ServiceParameters } from "../services/service";
3
2
  import { MessageReceipt, Queue, QueueParameters } from "./queueservice";
4
3
  export declare class MemoryQueueParameters extends QueueParameters {
@@ -13,8 +12,9 @@ export declare class MemoryQueueParameters extends QueueParameters {
13
12
  /**
14
13
  * FIFO Queue in Memory
15
14
  * @category CoreServices
15
+ * @WebdaModda
16
16
  */
17
- declare class MemoryQueue<T = any, K extends MemoryQueueParameters = MemoryQueueParameters> extends Queue<T, K> {
17
+ export declare class MemoryQueue<T = any, K extends MemoryQueueParameters = MemoryQueueParameters> extends Queue<T, K> {
18
18
  private _queue;
19
19
  /**
20
20
  * Load parameters
@@ -42,9 +42,4 @@ declare class MemoryQueue<T = any, K extends MemoryQueueParameters = MemoryQueue
42
42
  * @inheritdoc
43
43
  */
44
44
  __clean(): Promise<void>;
45
- /**
46
- * @inheritdoc
47
- */
48
- static getModda(): ModdaDefinition;
49
45
  }
50
- export { MemoryQueue };
@@ -25,6 +25,7 @@ exports.MemoryQueueParameters = MemoryQueueParameters;
25
25
  /**
26
26
  * FIFO Queue in Memory
27
27
  * @category CoreServices
28
+ * @WebdaModda
28
29
  */
29
30
  class MemoryQueue extends queueservice_1.Queue {
30
31
  constructor() {
@@ -99,17 +100,6 @@ class MemoryQueue extends queueservice_1.Queue {
99
100
  this._queue = {};
100
101
  });
101
102
  }
102
- /**
103
- * @inheritdoc
104
- */
105
- static getModda() {
106
- return {
107
- uuid: "Webda/MemoryQueue",
108
- label: "MemoryQueue",
109
- description: "Implements a simple in memory queue",
110
- logo: "images/icons/memoryqueue.png"
111
- };
112
- }
113
103
  }
114
104
  exports.MemoryQueue = MemoryQueue;
115
105
  //# sourceMappingURL=memoryqueue.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"memoryqueue.js","sourceRoot":"","sources":["../../src/queues/memoryqueue.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;AACb,6BAA6B;AAG7B,sDAAiD;AACjD,iDAAwE;AAMxE,MAAa,qBAAsB,SAAQ,8BAAe;IAQxD,YAAY,MAAW;;QACrB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,MAAM,GAAG,MAAA,IAAI,CAAC,MAAM,mCAAI,EAAE,CAAC;QAChC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC;IACtB,CAAC;CACF;AAbD,sDAaC;AAED;;;GAGG;AACH,MAAM,WAA8E,SAAQ,oBAAW;IAAvG;;QACU,WAAM,GAAa,EAAE,CAAC;IA6EhC,CAAC;IA3EC;;;;;OAKG;IACH,cAAc,CAAC,MAAW;QACxB,OAAO,IAAI,qBAAqB,CAAC,MAAM,CAAC,CAAC;IAC3C,CAAC;IAED;;OAEG;IACG,IAAI;;YACR,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;QACzC,CAAC;KAAA;IAEK,WAAW,CAAC,MAAM;;YACtB,IAAI,GAAG,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;YACpB,oBAAoB;YACpB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;gBACvB,GAAG,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;aACjB;YACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG;gBACjB,IAAI,EAAE,uBAAS,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;gBAC/C,OAAO,EAAE,CAAC;gBACV,aAAa,EAAE,GAAG;aACnB,CAAC;QACJ,CAAC;KAAA;IAED;;OAEG;IACG,cAAc,CAAI,KAAqB;;YAC3C,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;gBACzB,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;oBAC1E,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;oBAC9C,OAAO;wBACL;4BACE,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa;4BAC3C,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC;yBACtD;qBACF,CAAC;iBACH;aACF;YACD,OAAO,EAAE,CAAC;QACZ,CAAC;KAAA;IAED;;OAEG;IACG,aAAa,CAAC,OAAO;;YACzB,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;gBACxB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;aAC7B;QACH,CAAC;KAAA;IAED;;OAEG;IACG,OAAO;;YACX,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACnB,CAAC;KAAA;IAED;;OAEG;IACH,MAAM,CAAC,QAAQ;QACb,OAAO;YACL,IAAI,EAAE,mBAAmB;YACzB,KAAK,EAAE,aAAa;YACpB,WAAW,EAAE,qCAAqC;YAClD,IAAI,EAAE,8BAA8B;SACrC,CAAC;IACJ,CAAC;CACF;AACQ,kCAAW"}
1
+ {"version":3,"file":"memoryqueue.js","sourceRoot":"","sources":["../../src/queues/memoryqueue.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;AACb,6BAA6B;AAE7B,sDAAiD;AACjD,iDAAwE;AAMxE,MAAa,qBAAsB,SAAQ,8BAAe;IAQxD,YAAY,MAAW;;QACrB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,MAAM,GAAG,MAAA,IAAI,CAAC,MAAM,mCAAI,EAAE,CAAC;QAChC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC;IACtB,CAAC;CACF;AAbD,sDAaC;AAED;;;;GAIG;AACH,MAAa,WAA8E,SAAQ,oBAAW;IAA9G;;QACU,WAAM,GAAa,EAAE,CAAC;IAiEhC,CAAC;IA/DC;;;;;OAKG;IACH,cAAc,CAAC,MAAW;QACxB,OAAO,IAAI,qBAAqB,CAAC,MAAM,CAAC,CAAC;IAC3C,CAAC;IAED;;OAEG;IACG,IAAI;;YACR,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;QACzC,CAAC;KAAA;IAEK,WAAW,CAAC,MAAM;;YACtB,IAAI,GAAG,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;YACpB,oBAAoB;YACpB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;gBACvB,GAAG,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;aACjB;YACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG;gBACjB,IAAI,EAAE,uBAAS,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;gBAC/C,OAAO,EAAE,CAAC;gBACV,aAAa,EAAE,GAAG;aACnB,CAAC;QACJ,CAAC;KAAA;IAED;;OAEG;IACG,cAAc,CAAI,KAAqB;;YAC3C,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;gBACzB,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;oBAC1E,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;oBAC9C,OAAO;wBACL;4BACE,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa;4BAC3C,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC;yBACtD;qBACF,CAAC;iBACH;aACF;YACD,OAAO,EAAE,CAAC;QACZ,CAAC;KAAA;IAED;;OAEG;IACG,aAAa,CAAC,OAAO;;YACzB,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;gBACxB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;aAC7B;QACH,CAAC;KAAA;IAED;;OAEG;IACG,OAAO;;YACX,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACnB,CAAC;KAAA;CACF;AAlED,kCAkEC"}
@@ -28,7 +28,6 @@ class Title {
28
28
  let MemoryQueueTest = MemoryQueueTest_1 = class MemoryQueueTest extends queue_spec_1.QueueTest {
29
29
  receiveMessage(proto) {
30
30
  return __awaiter(this, void 0, void 0, function* () {
31
- console.log("receiveMessage", MemoryQueueTest_1.seq);
32
31
  MemoryQueueTest_1.seq++;
33
32
  switch (MemoryQueueTest_1.seq) {
34
33
  case 1:
@@ -1 +1 @@
1
- {"version":3,"file":"memoryqueue.spec.js","sourceRoot":"","sources":["../../src/queues/memoryqueue.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"memoryqueue.spec.js","sourceRoot":"","sources":["../../src/queues/memoryqueue.spec.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { WebdaTest } from "../test";
2
2
  declare class QueueTest extends WebdaTest {
3
- simple(queue: any, inconsistentSize?: boolean): Promise<void>;
3
+ simple(queue: any, inconsistentSize?: boolean, ackDelayMs?: number): Promise<void>;
4
4
  }
5
5
  export { QueueTest };