@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
@@ -0,0 +1,517 @@
1
+ "use strict";
2
+ var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
5
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
7
+ };
8
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
9
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
10
+ return new (P || (P = Promise))(function (resolve, reject) {
11
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
12
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
13
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
14
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
15
+ });
16
+ };
17
+ Object.defineProperty(exports, "__esModule", { value: true });
18
+ const assert = require("assert");
19
+ const mocha_1 = require("@testdeck/mocha");
20
+ const test_1 = require("../test");
21
+ const aclmodel_1 = require("../models/aclmodel");
22
+ const invitationservice_1 = require("./invitationservice");
23
+ const sinon = require("sinon");
24
+ class MyCompany extends aclmodel_1.AclModel {
25
+ canAct(ctx, action) {
26
+ const _super = Object.create(null, {
27
+ canAct: { get: () => super.canAct }
28
+ });
29
+ return __awaiter(this, void 0, void 0, function* () {
30
+ if (action === "create") {
31
+ return this;
32
+ }
33
+ return _super.canAct.call(this, ctx, action);
34
+ });
35
+ }
36
+ }
37
+ let InvitationTest = class InvitationTest extends test_1.WebdaTest {
38
+ getTestConfiguration() {
39
+ return process.cwd() + "/test/config-invitation.json";
40
+ }
41
+ before() {
42
+ const _super = Object.create(null, {
43
+ before: { get: () => super.before }
44
+ });
45
+ return __awaiter(this, void 0, void 0, function* () {
46
+ yield _super.before.call(this);
47
+ this.service = new invitationservice_1.default(this.webda, "invit", {
48
+ modelStore: "Companies",
49
+ invitationStore: "Invitations",
50
+ attribute: "__acl",
51
+ mapAttribute: "_companies",
52
+ pendingAttribute: "__invitations",
53
+ notificationService: "DebugMailer",
54
+ mapFields: ["name"]
55
+ });
56
+ this.webda.getServices()["invit"] = this.service;
57
+ this.store = this.webda.getService("Companies");
58
+ this.store._model = MyCompany;
59
+ this.invitations = this.webda.getService("Invitations");
60
+ this.authentication = this.webda.getService("Authentication");
61
+ this.mailer = this.webda.getService("DebugMailer");
62
+ this.service.resolve();
63
+ });
64
+ }
65
+ params() {
66
+ let p = new invitationservice_1.InvitationParameters({
67
+ mapFields: "test,test2",
68
+ attribute: "_attr"
69
+ });
70
+ assert.deepStrictEqual(p.mapFields, ["test", "test2"]);
71
+ assert.strictEqual(p.pendingAttribute, "_attrPending");
72
+ assert.strictEqual(p.multiple, true);
73
+ assert.strictEqual(p.authenticationService, "Authentication");
74
+ assert.throws(() => new invitationservice_1.InvitationParameters({
75
+ attribute: "plop"
76
+ }), /needs to start with a _/);
77
+ assert.throws(() => new invitationservice_1.InvitationParameters({
78
+ attribute: "_plop",
79
+ pendingAttribute: "bouzouf"
80
+ }), /needs to start with a _/);
81
+ assert.throws(() => new invitationservice_1.InvitationParameters({
82
+ autoAccept: true,
83
+ multiple: false,
84
+ fields: "test,test2",
85
+ attribute: "_attr"
86
+ }), /You cannot have multiple=false with autoAccept=true/);
87
+ }
88
+ initNoTemplate() {
89
+ return __awaiter(this, void 0, void 0, function* () {
90
+ // @ts-ignore
91
+ let stub = sinon.stub(this.mailer, "hasNotification").callsFake(() => __awaiter(this, void 0, void 0, function* () { return false; }));
92
+ try {
93
+ this.service.getParameters().notification = "plop";
94
+ yield assert.rejects(() => this.service.init(), /Email template should exist/);
95
+ }
96
+ finally {
97
+ stub.restore();
98
+ }
99
+ });
100
+ }
101
+ inviteOnMissing() {
102
+ return __awaiter(this, void 0, void 0, function* () {
103
+ let ctx = yield this.newContext();
104
+ yield assert.rejects(() => this.execute(ctx, "test.webda.io", "POST", `/companies/unknown/invitations`, {}), /404/);
105
+ });
106
+ }
107
+ inviteOnAclWithAutoAccept() {
108
+ return __awaiter(this, void 0, void 0, function* () {
109
+ this.service.getParameters().autoAccept = true;
110
+ this.service.getParameters().notification = "COMPANY_INVITE";
111
+ sinon.stub(this.service.notificationService, "sendNotification").callsFake(() => __awaiter(this, void 0, void 0, function* () { }));
112
+ // New model as owner
113
+ let ctx = yield this.newContext();
114
+ let user = yield this.authentication.getUserStore().save({ displayName: "Webda.io Test" });
115
+ ctx.getSession().userId = user.getUuid();
116
+ let res = yield this.execute(ctx, "test.webda.io", "POST", "/companies", { name: "MyTestCompany" });
117
+ const company = yield this.store.get(res.uuid);
118
+ // Auto register 2 users
119
+ yield this.authentication.createUserWithIdent("email", "test1@webda.io");
120
+ yield this.authentication.createUserWithIdent("email", "test2@webda.io");
121
+ const ident1 = yield this.authentication.getIdentStore().get(`test1@webda.io_email`);
122
+ const ident2 = yield this.authentication.getIdentStore().get(`test2@webda.io_email`);
123
+ // Add four users to the ACL
124
+ // 2 unregistered , 2 registered
125
+ yield this.execute(ctx, "test.webda.io", "POST", `/companies/${company.getUuid()}/invitations`, {
126
+ idents: ["test1@webda.io_email", "test3@webda.io_email", "test4@webda.io_email"],
127
+ users: [ident2.getUser(), "unknown"],
128
+ metadata: "read"
129
+ });
130
+ yield company.refresh();
131
+ assert.deepStrictEqual(company.__acl, {
132
+ [ident1.getUser()]: "read",
133
+ [ident2.getUser()]: "read",
134
+ [user.getUuid()]: "all"
135
+ });
136
+ let getter = yield this.execute(ctx, "test.webda.io", "GET", `/companies/${company.getUuid()}/invitations`);
137
+ // @ts-ignore
138
+ assert.deepStrictEqual(company.__invitations, {
139
+ "ident_test3@webda.io_email": "read",
140
+ "ident_test4@webda.io_email": "read"
141
+ });
142
+ // @ts-ignore
143
+ assert.deepStrictEqual(company.__invitations, getter);
144
+ assert.deepStrictEqual((yield this.invitations.getAll()).map(i => (Object.assign({ uuid: i.getUuid() }, i[this.service.getInvitationAttribute(company.getUuid())]))), [
145
+ {
146
+ uuid: "test3@webda.io_email_invit",
147
+ metadata: "read",
148
+ inviter: {
149
+ uuid: user.getUuid(),
150
+ displayName: "Webda.io Test"
151
+ }
152
+ },
153
+ {
154
+ uuid: "test4@webda.io_email_invit",
155
+ metadata: "read",
156
+ inviter: {
157
+ uuid: user.getUuid(),
158
+ displayName: "Webda.io Test"
159
+ }
160
+ }
161
+ ]);
162
+ // Reinviting should be handled and metadata overwritten
163
+ yield this.execute(ctx, "test.webda.io", "POST", `/companies/${company.getUuid()}/invitations`, {
164
+ idents: ["test2@webda.io_email", "test3@webda.io_email", "test4@webda.io_email"],
165
+ users: [ident1.getUser()],
166
+ metadata: "read,write"
167
+ });
168
+ yield company.refresh();
169
+ assert.deepStrictEqual(company.__acl, {
170
+ [ident1.getUser()]: "read,write",
171
+ [ident2.getUser()]: "read,write",
172
+ [user.getUuid()]: "all"
173
+ });
174
+ let userCheck = yield this.authentication.getUserStore().get(ident1.getUser());
175
+ assert.deepStrictEqual(userCheck["_companies"], [
176
+ {
177
+ inviter: {
178
+ displayName: "Webda.io Test",
179
+ uuid: user.getUuid()
180
+ },
181
+ metadata: {
182
+ name: "MyTestCompany"
183
+ },
184
+ model: company.getUuid(),
185
+ pending: false
186
+ }
187
+ ]);
188
+ // @ts-ignore
189
+ assert.deepStrictEqual(company.__invitations, {
190
+ "ident_test3@webda.io_email": "read,write",
191
+ "ident_test4@webda.io_email": "read,write"
192
+ });
193
+ assert.deepStrictEqual((yield this.invitations.getAll()).map(i => (Object.assign({ uuid: i.getUuid() }, i[this.service.getInvitationAttribute(company.getUuid())]))), [
194
+ {
195
+ uuid: "test3@webda.io_email_invit",
196
+ metadata: "read,write",
197
+ inviter: {
198
+ uuid: user.getUuid(),
199
+ displayName: "Webda.io Test"
200
+ }
201
+ },
202
+ {
203
+ uuid: "test4@webda.io_email_invit",
204
+ metadata: "read,write",
205
+ inviter: {
206
+ uuid: user.getUuid(),
207
+ displayName: "Webda.io Test"
208
+ }
209
+ }
210
+ ]);
211
+ // Remove 1 unregistered and one registered from the ACL
212
+ yield this.execute(ctx, "test.webda.io", "DELETE", `/companies/${company.getUuid()}/invitations`, {
213
+ idents: ["test1@webda.io_email", "test3@webda.io_email"]
214
+ });
215
+ yield company.refresh();
216
+ assert.deepStrictEqual(company.__acl, {
217
+ [ident2.getUser()]: "read,write",
218
+ [user.getUuid()]: "all"
219
+ });
220
+ // @ts-ignore
221
+ assert.deepStrictEqual(company.__invitations, {
222
+ "ident_test4@webda.io_email": "read,write"
223
+ });
224
+ assert.deepStrictEqual((yield this.invitations.getAll()).map(i => (Object.assign({ uuid: i.getUuid() }, i[this.service.getInvitationAttribute(company.getUuid())]))), [
225
+ { uuid: "test3@webda.io_email_invit" },
226
+ {
227
+ uuid: "test4@webda.io_email_invit",
228
+ metadata: "read,write",
229
+ inviter: {
230
+ uuid: user.getUuid(),
231
+ displayName: "Webda.io Test"
232
+ }
233
+ }
234
+ ]);
235
+ // Missing model
236
+ yield this.invitations.setAttribute("test4@webda.io_email_invit", "invit_test", "all");
237
+ // Register user 3 and 4
238
+ yield this.authentication.createUserWithIdent("email", "test3@webda.io");
239
+ yield this.authentication.createUserWithIdent("email", "test4@webda.io");
240
+ const ident3 = yield this.authentication.getIdentStore().get(`test3@webda.io_email`);
241
+ const ident4 = yield this.authentication.getIdentStore().get(`test4@webda.io_email`);
242
+ yield company.refresh();
243
+ assert.deepStrictEqual(company.__acl, {
244
+ [ident2.getUser()]: "read,write",
245
+ [ident4.getUser()]: "read,write",
246
+ [user.getUuid()]: "all"
247
+ });
248
+ // @ts-ignore
249
+ assert.deepStrictEqual(company.__invitations, {});
250
+ assert.deepStrictEqual((yield this.invitations.getAll()).map(i => ({
251
+ uuid: i.getUuid(),
252
+ metadata: i[this.service.getInvitationAttribute(company.getUuid())]
253
+ })), []);
254
+ userCheck = yield this.authentication.getUserStore().get(ident3.getUser());
255
+ assert.deepStrictEqual(userCheck["_companies"] || [], []);
256
+ userCheck = yield this.authentication.getUserStore().get(ident4.getUser());
257
+ assert.deepStrictEqual(userCheck["_companies"], [
258
+ {
259
+ inviter: {
260
+ displayName: "Webda.io Test",
261
+ uuid: user.getUuid()
262
+ },
263
+ metadata: {
264
+ name: "MyTestCompany"
265
+ },
266
+ model: company.getUuid(),
267
+ pending: false
268
+ }
269
+ ]);
270
+ });
271
+ }
272
+ inviteOnAclWithoutAutoAccept() {
273
+ return __awaiter(this, void 0, void 0, function* () {
274
+ this.service.getParameters().autoAccept = false;
275
+ // New model as owner
276
+ let ctx = yield this.newContext();
277
+ let user = yield this.authentication.getUserStore().save({
278
+ displayName: "Webda.io Test"
279
+ });
280
+ ctx.getSession().userId = user.getUuid();
281
+ let res = yield this.execute(ctx, "test.webda.io", "POST", "/companies", { name: "MyTestCompany" });
282
+ const company = yield this.store.get(res.uuid);
283
+ // Auto register 2 users
284
+ yield this.authentication.createUserWithIdent("email", "test1@webda.io");
285
+ yield this.authentication.createUserWithIdent("email", "test2@webda.io");
286
+ const ident1 = yield this.authentication.getIdentStore().get(`test1@webda.io_email`);
287
+ const ident2 = yield this.authentication.getIdentStore().get(`test2@webda.io_email`);
288
+ // Add four users to the ACL
289
+ // 2 unregistered , 2 registered
290
+ yield this.execute(ctx, "test.webda.io", "POST", `/companies/${company.getUuid()}/invitations`, {
291
+ idents: ["test1@webda.io_email", "test3@webda.io_email", "test4@webda.io_email"],
292
+ users: [ident2.getUser()],
293
+ metadata: "read"
294
+ });
295
+ yield company.refresh();
296
+ assert.deepStrictEqual(company.__acl, {
297
+ [user.getUuid()]: "all"
298
+ });
299
+ // @ts-ignore
300
+ assert.deepStrictEqual(company.__invitations, {
301
+ [`user_${ident1.getUser()}`]: "read",
302
+ [`user_${ident2.getUser()}`]: "read",
303
+ "ident_test3@webda.io_email": "read",
304
+ "ident_test4@webda.io_email": "read"
305
+ });
306
+ assert.deepStrictEqual((yield this.invitations.getAll()).map(i => (Object.assign({ uuid: i.getUuid() }, i[this.service.getInvitationAttribute(company.getUuid())]))), [
307
+ {
308
+ uuid: "test3@webda.io_email_invit",
309
+ metadata: "read",
310
+ inviter: {
311
+ uuid: user.getUuid(),
312
+ displayName: "Webda.io Test"
313
+ }
314
+ },
315
+ {
316
+ uuid: "test4@webda.io_email_invit",
317
+ metadata: "read",
318
+ inviter: {
319
+ uuid: user.getUuid(),
320
+ displayName: "Webda.io Test"
321
+ }
322
+ }
323
+ ]);
324
+ let userCheck = yield this.authentication.getUserStore().get(ident1.getUser());
325
+ assert.deepStrictEqual(userCheck["_companies"], [
326
+ {
327
+ inviter: {
328
+ displayName: "Webda.io Test",
329
+ uuid: user.getUuid()
330
+ },
331
+ metadata: {
332
+ name: "MyTestCompany"
333
+ },
334
+ model: company.getUuid(),
335
+ pending: true
336
+ }
337
+ ]);
338
+ yield userCheck.update({
339
+ _companies: [
340
+ {
341
+ model: "Test"
342
+ },
343
+ ...userCheck["_companies"]
344
+ ]
345
+ });
346
+ // Accepting the invite for user1
347
+ let ctx2 = yield this.newContext();
348
+ ctx2.getSession().userId = ident1.getUser();
349
+ yield assert.rejects(() => this.execute(ctx2, "test.webda.io", "PUT", `/companies/${company.getUuid()}/invitations`, {}), /400/);
350
+ yield this.execute(ctx2, "test.webda.io", "PUT", `/companies/${company.getUuid()}/invitations`, {
351
+ accept: true
352
+ });
353
+ yield company.refresh();
354
+ assert.deepStrictEqual(company.__acl, {
355
+ [ident1.getUser()]: "read",
356
+ [user.getUuid()]: "all"
357
+ });
358
+ // Reinviting should be handled and metadata overwritten
359
+ yield this.execute(ctx, "test.webda.io", "POST", `/companies/${company.getUuid()}/invitations`, {
360
+ idents: ["test1@webda.io_email", "test2@webda.io_email", "test3@webda.io_email", "test4@webda.io_email"],
361
+ metadata: "read,write"
362
+ });
363
+ yield company.refresh();
364
+ assert.deepStrictEqual(company.__acl, {
365
+ [ident1.getUser()]: "read",
366
+ [user.getUuid()]: "all"
367
+ });
368
+ // @ts-ignore
369
+ assert.deepStrictEqual(company.__invitations, {
370
+ [`user_${ident2.getUser()}`]: "read,write",
371
+ "ident_test3@webda.io_email": "read,write",
372
+ "ident_test4@webda.io_email": "read,write"
373
+ });
374
+ assert.deepStrictEqual((yield this.invitations.getAll()).map(i => (Object.assign({ uuid: i.getUuid() }, i[this.service.getInvitationAttribute(company.getUuid())]))), [
375
+ {
376
+ uuid: "test3@webda.io_email_invit",
377
+ metadata: "read,write",
378
+ inviter: {
379
+ uuid: user.getUuid(),
380
+ displayName: "Webda.io Test"
381
+ }
382
+ },
383
+ {
384
+ uuid: "test4@webda.io_email_invit",
385
+ metadata: "read,write",
386
+ inviter: {
387
+ uuid: user.getUuid(),
388
+ displayName: "Webda.io Test"
389
+ }
390
+ }
391
+ ]);
392
+ // Remove 1 unregistered and one registered from the ACL
393
+ yield this.execute(ctx, "test.webda.io", "DELETE", `/companies/${company.getUuid()}/invitations`, {
394
+ idents: ["test3@webda.io_email"],
395
+ users: [ident1.getUser(), ident2.getUser()]
396
+ });
397
+ yield company.refresh();
398
+ assert.deepStrictEqual(company.__acl, {
399
+ [user.getUuid()]: "all"
400
+ });
401
+ // @ts-ignore
402
+ assert.deepStrictEqual(company.__invitations, {
403
+ "ident_test4@webda.io_email": "read,write"
404
+ });
405
+ assert.deepStrictEqual((yield this.invitations.getAll()).map(i => (Object.assign({ uuid: i.getUuid() }, i[this.service.getInvitationAttribute(company.getUuid())]))), [
406
+ { uuid: "test3@webda.io_email_invit" },
407
+ {
408
+ uuid: "test4@webda.io_email_invit",
409
+ metadata: "read,write",
410
+ inviter: {
411
+ uuid: user.getUuid(),
412
+ displayName: "Webda.io Test"
413
+ }
414
+ }
415
+ ]);
416
+ userCheck = yield this.authentication.getUserStore().get(ident1.getUser());
417
+ assert.deepStrictEqual(userCheck["_companies"], [
418
+ {
419
+ model: "Test"
420
+ }
421
+ ]);
422
+ userCheck = yield this.authentication.getUserStore().get(ident2.getUser());
423
+ assert.deepStrictEqual(userCheck["_companies"], []);
424
+ // Missing model
425
+ yield this.invitations.setAttribute("test4@webda.io_email_invit", "invit_test", "all");
426
+ // Register user 3 and 4
427
+ yield this.authentication.createUserWithIdent("email", "test3@webda.io");
428
+ yield this.authentication.createUserWithIdent("email", "test4@webda.io");
429
+ yield this.authentication.getIdentStore().get(`test3@webda.io_email`);
430
+ const ident4 = yield this.authentication.getIdentStore().get(`test4@webda.io_email`);
431
+ yield company.refresh();
432
+ assert.deepStrictEqual(company.__acl, {
433
+ [user.getUuid()]: "all"
434
+ });
435
+ // @ts-ignore
436
+ assert.deepStrictEqual(company.__invitations, {
437
+ "ident_test4@webda.io_email": "read,write"
438
+ });
439
+ assert.deepStrictEqual((yield this.invitations.getAll()).map(i => (Object.assign({ uuid: i.getUuid() }, i[this.service.getInvitationAttribute(company.getUuid())]))), []);
440
+ ctx2.getSession().userId = ident4.getUser();
441
+ // Force refresh of user as we changed user manually
442
+ yield ctx2.getCurrentUser(true);
443
+ yield this.execute(ctx2, "test.webda.io", "PUT", `/companies/${company.getUuid()}/invitations`, {
444
+ accept: true
445
+ });
446
+ yield company.refresh();
447
+ assert.deepStrictEqual(company.__acl, {
448
+ [user.getUuid()]: "all",
449
+ [ident4.getUser()]: "read,write"
450
+ });
451
+ // @ts-ignore
452
+ assert.deepStrictEqual(company.__invitations, {});
453
+ });
454
+ }
455
+ invitationDeletedModel() {
456
+ return __awaiter(this, void 0, void 0, function* () {
457
+ this.service.getParameters().autoAccept = false;
458
+ // New model as owner
459
+ let ctx = yield this.newContext();
460
+ let user = yield this.authentication.getUserStore().save({
461
+ displayName: "Webda.io Test"
462
+ });
463
+ ctx.getSession().userId = user.getUuid();
464
+ let res = yield this.execute(ctx, "test.webda.io", "POST", "/companies", { name: "MyTestCompany" });
465
+ const company = yield this.store.get(res.uuid);
466
+ // Auto register 2 users
467
+ yield this.authentication.createUserWithIdent("email", "test1@webda.io");
468
+ const ident1 = yield this.authentication.getIdentStore().get(`test1@webda.io_email`);
469
+ // Add two users to the ACL
470
+ // 1 unregistered , 1 registered
471
+ yield this.execute(ctx, "test.webda.io", "POST", `/companies/${company.getUuid()}/invitations`, {
472
+ idents: ["test2@webda.io_email"],
473
+ users: [ident1.getUser()],
474
+ metadata: "read"
475
+ });
476
+ yield company.delete();
477
+ let checkUser = yield this.authentication.getUserStore().get(ident1.getUser());
478
+ assert.strictEqual(checkUser["_companies"].length, 1);
479
+ // Accepting the invite for user1
480
+ let ctx2 = yield this.newContext();
481
+ ctx2.getSession().userId = ident1.getUser();
482
+ // It should be removed and get a 410 error code
483
+ yield assert.rejects(() => this.execute(ctx2, "test.webda.io", "PUT", `/companies/${company.getUuid()}/invitations`, {
484
+ accept: true
485
+ }), /410/);
486
+ yield checkUser.refresh();
487
+ assert.strictEqual(checkUser["_companies"].length, 0);
488
+ // Register pending one
489
+ yield this.authentication.createUserWithIdent("email", "test2@webda.io");
490
+ const ident2 = yield this.authentication.getIdentStore().get(`test2@webda.io_email`);
491
+ checkUser = yield this.authentication.getUserStore().get(ident2.getUser());
492
+ assert.strictEqual(checkUser["_companies"].length, 0);
493
+ });
494
+ }
495
+ };
496
+ __decorate([
497
+ mocha_1.test
498
+ ], InvitationTest.prototype, "params", null);
499
+ __decorate([
500
+ mocha_1.test
501
+ ], InvitationTest.prototype, "initNoTemplate", null);
502
+ __decorate([
503
+ mocha_1.test
504
+ ], InvitationTest.prototype, "inviteOnMissing", null);
505
+ __decorate([
506
+ mocha_1.test
507
+ ], InvitationTest.prototype, "inviteOnAclWithAutoAccept", null);
508
+ __decorate([
509
+ mocha_1.test
510
+ ], InvitationTest.prototype, "inviteOnAclWithoutAutoAccept", null);
511
+ __decorate([
512
+ mocha_1.test
513
+ ], InvitationTest.prototype, "invitationDeletedModel", null);
514
+ InvitationTest = __decorate([
515
+ mocha_1.suite
516
+ ], InvitationTest);
517
+ //# sourceMappingURL=invitationservice.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"invitationservice.spec.js","sourceRoot":"","sources":["../../src/services/invitationservice.spec.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,9 @@
1
1
  import { ConfigurationService, ConfigurationServiceParameters } from "./configuration";
2
- import { ModdaDefinition } from "../core";
3
2
  /**
4
3
  * Allow for dynamic configuration from ConfigMap or Secrets
4
+ *
5
+ * Read a ConfigMap from Kubernetes and auto-update
6
+ * @WebdaModda
5
7
  */
6
8
  export declare class KubernetesConfigurationService<T extends ConfigurationServiceParameters> extends ConfigurationService<T> {
7
9
  /**
@@ -21,8 +23,4 @@ export declare class KubernetesConfigurationService<T extends ConfigurationServi
21
23
  loadConfiguration(): Promise<{
22
24
  [key: string]: any;
23
25
  }>;
24
- /**
25
- * @inheritdoc
26
- */
27
- static getModda(): ModdaDefinition;
28
26
  }
@@ -17,6 +17,9 @@ const path = require("path");
17
17
  const serializers_1 = require("../utils/serializers");
18
18
  /**
19
19
  * Allow for dynamic configuration from ConfigMap or Secrets
20
+ *
21
+ * Read a ConfigMap from Kubernetes and auto-update
22
+ * @WebdaModda
20
23
  */
21
24
  class KubernetesConfigurationService extends configuration_1.ConfigurationService {
22
25
  /**
@@ -60,8 +63,8 @@ class KubernetesConfigurationService extends configuration_1.ConfigurationServic
60
63
  found++;
61
64
  let filePath = path.join(this.parameters.source, f);
62
65
  // Auto parse JSON and YAML
63
- if (f.match(/\.(json|ya?ml)$/i)) {
64
- result[f.replace(/\.(json|ya?ml)$/i, "")] = serializers_1.JSONUtils.loadFile(filePath);
66
+ if (f.match(/\.(jsonc?|ya?ml)$/i)) {
67
+ result[f.replace(/\.(jsonc?|ya?ml)$/i, "")] = serializers_1.JSONUtils.loadFile(filePath);
65
68
  }
66
69
  else {
67
70
  result[f] = fs.readFileSync(filePath, "utf-8");
@@ -74,16 +77,6 @@ class KubernetesConfigurationService extends configuration_1.ConfigurationServic
74
77
  return result;
75
78
  });
76
79
  }
77
- /**
78
- * @inheritdoc
79
- */
80
- static getModda() {
81
- return {
82
- uuid: "Webda/KubernetesConfiguration",
83
- label: "Kubernetes Configuration",
84
- description: "Read a ConfigMap from Kubernetes and auto-update"
85
- };
86
- }
87
80
  }
88
81
  exports.KubernetesConfigurationService = KubernetesConfigurationService;
89
82
  //# sourceMappingURL=kubernetesconfiguration.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"kubernetesconfiguration.js","sourceRoot":"","sources":["../../src/services/kubernetesconfiguration.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAuF;AACvF,kCAAsD;AACtD,yBAAyB;AACzB,6BAA6B;AAC7B,sDAAiD;AAEjD;;GAEG;AACH,MAAa,8BAAyE,SAAQ,oCAAuB;IACnH;;OAEG;IACG,IAAI;;YACR,mCAAmC;YACnC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC3B,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,kDAAkD,CAAC,CAAC;aAC/G;YACD,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACxE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBAC1C,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,kDAAkD,CAAC,CAAC;aAC/G;YAED,iBAAiB;YACjB,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAErE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACvF,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC3B,CAAC;KAAA;IAED;;OAEG;IACG,iBAAiB;;YACrB,OAAO,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAC1C,CAAC;KAAA;IAED;;;OAGG;IACG,iBAAiB;;YACrB,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;iBACnC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;iBAC/B,OAAO,CAAC,CAAC,CAAC,EAAE;gBACX,KAAK,EAAE,CAAC;gBACR,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBACpD,2BAA2B;gBAC3B,IAAI,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE;oBAC/B,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC,GAAG,uBAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;iBAC1E;qBAAM;oBACL,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;iBAChD;YACH,CAAC,CAAC,CAAC;YACL,IAAI,KAAK,KAAK,CAAC,EAAE;gBACf,OAAO,SAAS,CAAC;aAClB;YACD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,EAAE,MAAM,CAAC,CAAC;YAC/C,OAAO,MAAM,CAAC;QAChB,CAAC;KAAA;IAED;;OAEG;IACH,MAAM,CAAC,QAAQ;QACb,OAAO;YACL,IAAI,EAAE,+BAA+B;YACrC,KAAK,EAAE,0BAA0B;YACjC,WAAW,EAAE,kDAAkD;SAChE,CAAC;IACJ,CAAC;CACF;AAhED,wEAgEC"}
1
+ {"version":3,"file":"kubernetesconfiguration.js","sourceRoot":"","sources":["../../src/services/kubernetesconfiguration.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAuF;AACvF,kCAAqC;AACrC,yBAAyB;AACzB,6BAA6B;AAC7B,sDAAiD;AAEjD;;;;;GAKG;AACH,MAAa,8BAAyE,SAAQ,oCAAuB;IACnH;;OAEG;IACG,IAAI;;YACR,mCAAmC;YACnC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC3B,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,kDAAkD,CAAC,CAAC;aAC/G;YACD,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACxE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBAC1C,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,kDAAkD,CAAC,CAAC;aAC/G;YAED,iBAAiB;YACjB,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAErE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACvF,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC3B,CAAC;KAAA;IAED;;OAEG;IACG,iBAAiB;;YACrB,OAAO,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAC1C,CAAC;KAAA;IAED;;;OAGG;IACG,iBAAiB;;YACrB,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;iBACnC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;iBAC/B,OAAO,CAAC,CAAC,CAAC,EAAE;gBACX,KAAK,EAAE,CAAC;gBACR,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBACpD,2BAA2B;gBAC3B,IAAI,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE;oBACjC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC,GAAG,uBAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;iBAC5E;qBAAM;oBACL,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;iBAChD;YACH,CAAC,CAAC,CAAC;YACL,IAAI,KAAK,KAAK,CAAC,EAAE;gBACf,OAAO,SAAS,CAAC;aAClB;YACD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,EAAE,MAAM,CAAC,CAAC;YAC/C,OAAO,MAAM,CAAC;QAChB,CAAC;KAAA;CACF;AArDD,wEAqDC"}
@@ -99,7 +99,7 @@ let KubernetesConfigurationServiceTest = class KubernetesConfigurationServiceTes
99
99
  assert.rejects(() => serv.init(), /Need a source for KubernetesConfigurationService/);
100
100
  serv.getParameters().source = "/notexisting";
101
101
  assert.rejects(() => serv.init(), /Need a source for KubernetesConfigurationService/);
102
- let mock = (0, sinon_1.stub)(serv, "loadAndStoreConfiguration").callsFake(() => { });
102
+ let mock = (0, sinon_1.stub)(serv, "loadAndStoreConfiguration").resolves();
103
103
  yield serv.initConfiguration();
104
104
  assert.strictEqual(mock.callCount, 1);
105
105
  });