@webex/webex-core 3.12.0-next.32 → 3.12.0-next.34
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/config.js +9 -0
- package/dist/config.js.map +1 -1
- package/dist/lib/batcher.js +1 -1
- package/dist/lib/credentials/credentials.js +1 -1
- package/dist/lib/credentials/token.js +1 -1
- package/dist/lib/services/services.js +196 -28
- package/dist/lib/services/services.js.map +1 -1
- package/dist/lib/services-v2/services-v2.js +195 -26
- package/dist/lib/services-v2/services-v2.js.map +1 -1
- package/dist/plugins/logger.js +1 -1
- package/dist/webex-core.js +2 -2
- package/package.json +3 -3
- package/src/config.js +10 -0
- package/src/lib/services/services.js +170 -17
- package/src/lib/services-v2/services-v2.ts +169 -16
- package/test/fixtures/activation-email.ts +22 -0
- package/test/integration/spec/services/services.js +44 -8
- package/test/integration/spec/services-v2/services-v2.js +44 -8
- package/test/unit/spec/services/services.js +307 -2
- package/test/unit/spec/services-v2/services-v2.ts +295 -0
|
@@ -46,6 +46,7 @@ describe('webex-core', () => {
|
|
|
46
46
|
services.initialize();
|
|
47
47
|
|
|
48
48
|
// call the onReady callback
|
|
49
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
49
50
|
services.listenToOnce.getCall(1).args[2]();
|
|
50
51
|
await waitForAsync();
|
|
51
52
|
|
|
@@ -59,6 +60,7 @@ describe('webex-core', () => {
|
|
|
59
60
|
services.initialize();
|
|
60
61
|
|
|
61
62
|
// call the onReady callback
|
|
63
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
62
64
|
services.listenToOnce.getCall(1).args[2]();
|
|
63
65
|
await waitForAsync();
|
|
64
66
|
|
|
@@ -81,6 +83,7 @@ describe('webex-core', () => {
|
|
|
81
83
|
services.initialize();
|
|
82
84
|
|
|
83
85
|
// call the onReady callback
|
|
86
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
84
87
|
services.listenToOnce.getCall(1).args[2]();
|
|
85
88
|
|
|
86
89
|
await waitForAsync();
|
|
@@ -114,6 +117,7 @@ describe('webex-core', () => {
|
|
|
114
117
|
services.initialize();
|
|
115
118
|
|
|
116
119
|
// call the onReady callback
|
|
120
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
117
121
|
services.listenToOnce.getCall(1).args[2]();
|
|
118
122
|
|
|
119
123
|
await waitForAsync();
|
|
@@ -125,6 +129,297 @@ describe('webex-core', () => {
|
|
|
125
129
|
);
|
|
126
130
|
}
|
|
127
131
|
);
|
|
132
|
+
|
|
133
|
+
it('sets services.ready to true when waitForCatalogInit is disabled (default)', () => {
|
|
134
|
+
services.listenToOnce = sinon.stub();
|
|
135
|
+
services.initialize();
|
|
136
|
+
|
|
137
|
+
// Fire the change:config handler which decides gated-vs-ungated and, in
|
|
138
|
+
// ungated mode, flips services.ready to true.
|
|
139
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
140
|
+
|
|
141
|
+
assert.isTrue(services.ready, 'services.ready should be true so it does not block webex.ready');
|
|
142
|
+
});
|
|
143
|
+
|
|
144
|
+
it('listens on the "ready" event when waitForCatalogInit is disabled (default)', () => {
|
|
145
|
+
services.listenToOnce = sinon.stub();
|
|
146
|
+
services.initialize();
|
|
147
|
+
|
|
148
|
+
// Fire change:config to trigger the mode-specific listener registration.
|
|
149
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
150
|
+
|
|
151
|
+
const [, event] = services.listenToOnce.getCall(1).args;
|
|
152
|
+
assert.equal(event, 'ready', 'default path listens on webex ready');
|
|
153
|
+
});
|
|
154
|
+
});
|
|
155
|
+
|
|
156
|
+
describe('#initialize (waitForCatalogInit=true)', () => {
|
|
157
|
+
beforeEach(() => {
|
|
158
|
+
services.webex.config = {
|
|
159
|
+
...(services.webex.config || {}),
|
|
160
|
+
services: {waitForCatalogInit: true, catalogInitTimeout: 15000},
|
|
161
|
+
};
|
|
162
|
+
// Reset ready flag: the outer beforeEach constructs services which
|
|
163
|
+
// runs initialize() once with no config (ungated path, flips ready to
|
|
164
|
+
// true). We reset here so tests that call initialize() a second time
|
|
165
|
+
// with the flag enabled observe the gated behavior from a clean state.
|
|
166
|
+
services.ready = false;
|
|
167
|
+
});
|
|
168
|
+
|
|
169
|
+
it('leaves services.ready=false after initialize (does not flip until finalize)', () => {
|
|
170
|
+
services.listenToOnce = sinon.stub();
|
|
171
|
+
services.initialize();
|
|
172
|
+
|
|
173
|
+
assert.isFalse(services.ready, 'services.ready should block webex.ready until finalize');
|
|
174
|
+
});
|
|
175
|
+
|
|
176
|
+
it('listens on the "loaded" event (not "ready") to avoid deadlock', () => {
|
|
177
|
+
services.listenToOnce = sinon.stub();
|
|
178
|
+
services.initialize();
|
|
179
|
+
|
|
180
|
+
// Fire change:config to trigger the mode-specific listener registration.
|
|
181
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
182
|
+
|
|
183
|
+
const [, event] = services.listenToOnce.getCall(1).args;
|
|
184
|
+
assert.equal(event, 'loaded', 'gated path must listen on loaded to avoid deadlock');
|
|
185
|
+
});
|
|
186
|
+
|
|
187
|
+
it('flips services.ready=true after init succeeds with credentials', async () => {
|
|
188
|
+
services.listenToOnce = sinon.stub();
|
|
189
|
+
services.initServiceCatalogs = sinon.stub().returns(Promise.resolve());
|
|
190
|
+
services.webex.credentials = {
|
|
191
|
+
supertoken: {access_token: 'token'},
|
|
192
|
+
};
|
|
193
|
+
|
|
194
|
+
services.initialize();
|
|
195
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
196
|
+
services.listenToOnce.getCall(1).args[2]();
|
|
197
|
+
await waitForAsync();
|
|
198
|
+
|
|
199
|
+
assert.isTrue(services.ready);
|
|
200
|
+
});
|
|
201
|
+
|
|
202
|
+
it('flips services.ready=true after init succeeds without credentials (preauth path)', async () => {
|
|
203
|
+
services.listenToOnce = sinon.stub();
|
|
204
|
+
services.collectPreauthCatalog = sinon.stub().returns(Promise.resolve());
|
|
205
|
+
|
|
206
|
+
services.initialize();
|
|
207
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
208
|
+
services.listenToOnce.getCall(1).args[2]();
|
|
209
|
+
await waitForAsync();
|
|
210
|
+
|
|
211
|
+
assert.isTrue(services.ready);
|
|
212
|
+
});
|
|
213
|
+
|
|
214
|
+
it('flips services.ready=true even when initServiceCatalogs errors, so webex.ready can fire', async () => {
|
|
215
|
+
services.listenToOnce = sinon.stub();
|
|
216
|
+
services.initServiceCatalogs = sinon.stub().returns(Promise.reject(new Error('boom')));
|
|
217
|
+
services.webex.credentials = {
|
|
218
|
+
supertoken: {access_token: 'token'},
|
|
219
|
+
};
|
|
220
|
+
services.logger.error = sinon.stub();
|
|
221
|
+
|
|
222
|
+
services.initialize();
|
|
223
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
224
|
+
services.listenToOnce.getCall(1).args[2]();
|
|
225
|
+
await waitForAsync();
|
|
226
|
+
|
|
227
|
+
assert.isTrue(services.initFailed);
|
|
228
|
+
assert.isTrue(services.ready);
|
|
229
|
+
});
|
|
230
|
+
|
|
231
|
+
it('flips services.ready=true even when collectPreauthCatalog errors', async () => {
|
|
232
|
+
services.listenToOnce = sinon.stub();
|
|
233
|
+
services.collectPreauthCatalog = sinon.stub().returns(Promise.reject(new Error('boom')));
|
|
234
|
+
services.logger.error = sinon.stub();
|
|
235
|
+
|
|
236
|
+
services.initialize();
|
|
237
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
238
|
+
services.listenToOnce.getCall(1).args[2]();
|
|
239
|
+
await waitForAsync();
|
|
240
|
+
|
|
241
|
+
assert.isTrue(services.initFailed);
|
|
242
|
+
assert.isTrue(services.ready);
|
|
243
|
+
});
|
|
244
|
+
|
|
245
|
+
it('flips services.ready=true when init times out', async () => {
|
|
246
|
+
const clock = sinon.useFakeTimers();
|
|
247
|
+
services.listenToOnce = sinon.stub();
|
|
248
|
+
services.initServiceCatalogs = sinon.stub().returns(new Promise(() => {}));
|
|
249
|
+
services.webex.credentials = {
|
|
250
|
+
supertoken: {access_token: 'token'},
|
|
251
|
+
};
|
|
252
|
+
services.logger.error = sinon.stub();
|
|
253
|
+
|
|
254
|
+
services.initialize();
|
|
255
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
256
|
+
services.listenToOnce.getCall(1).args[2]();
|
|
257
|
+
|
|
258
|
+
await clock.tickAsync(15_001);
|
|
259
|
+
clock.restore();
|
|
260
|
+
|
|
261
|
+
assert.isTrue(services.initFailed);
|
|
262
|
+
assert.isTrue(services.ready);
|
|
263
|
+
sinon.assert.calledWithMatch(
|
|
264
|
+
services.logger.error,
|
|
265
|
+
/services: init timed out after 15000ms/
|
|
266
|
+
);
|
|
267
|
+
});
|
|
268
|
+
|
|
269
|
+
it('awaits an in-flight credentials refresh before flipping services.ready=true', async () => {
|
|
270
|
+
services.listenToOnce = sinon.stub();
|
|
271
|
+
services.initServiceCatalogs = sinon.stub().returns(Promise.resolve());
|
|
272
|
+
|
|
273
|
+
let onChangeIsRefreshing: (() => void) | undefined;
|
|
274
|
+
services.webex.credentials = {
|
|
275
|
+
supertoken: {access_token: 'token'},
|
|
276
|
+
isRefreshing: true,
|
|
277
|
+
once: sinon.stub().callsFake((event: string, cb: () => void) => {
|
|
278
|
+
if (event === 'change:isRefreshing') onChangeIsRefreshing = cb;
|
|
279
|
+
}),
|
|
280
|
+
};
|
|
281
|
+
|
|
282
|
+
services.initialize();
|
|
283
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
284
|
+
services.listenToOnce.getCall(1).args[2]();
|
|
285
|
+
await waitForAsync();
|
|
286
|
+
|
|
287
|
+
assert.isFalse(services.ready, 'must not flip ready while refresh is in flight');
|
|
288
|
+
assert.isFunction(onChangeIsRefreshing, 'must subscribe to change:isRefreshing');
|
|
289
|
+
sinon.assert.calledWith(services.webex.credentials.once, 'change:isRefreshing');
|
|
290
|
+
|
|
291
|
+
onChangeIsRefreshing!();
|
|
292
|
+
await waitForAsync();
|
|
293
|
+
|
|
294
|
+
assert.isTrue(services.ready);
|
|
295
|
+
});
|
|
296
|
+
|
|
297
|
+
it('registers a change:canAuthorize listener when there is no supertoken (fresh-login path)', async () => {
|
|
298
|
+
services.listenToOnce = sinon.stub();
|
|
299
|
+
services.collectPreauthCatalog = sinon.stub().returns(Promise.resolve());
|
|
300
|
+
services.initServiceCatalogs = sinon.stub().returns(Promise.resolve());
|
|
301
|
+
|
|
302
|
+
services.initialize();
|
|
303
|
+
// initialize() creates a new catalog and replaces the WeakMap entry.
|
|
304
|
+
const currentCatalog = services._getCatalog();
|
|
305
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
306
|
+
services.listenToOnce.getCall(1).args[2]();
|
|
307
|
+
await waitForAsync();
|
|
308
|
+
|
|
309
|
+
const freshLoginCall = services.listenToOnce
|
|
310
|
+
.getCalls()
|
|
311
|
+
.find((call: any) => call.args[1] === 'change:canAuthorize');
|
|
312
|
+
assert.isDefined(freshLoginCall, 'expected change:canAuthorize listener to be registered');
|
|
313
|
+
|
|
314
|
+
services.webex.canAuthorize = true;
|
|
315
|
+
currentCatalog.status.postauth.ready = false;
|
|
316
|
+
freshLoginCall!.args[2]();
|
|
317
|
+
|
|
318
|
+
assert.isTrue(
|
|
319
|
+
services.initServiceCatalogs.called,
|
|
320
|
+
'expected postauth catalog init after canAuthorize flips'
|
|
321
|
+
);
|
|
322
|
+
|
|
323
|
+
// `catalog.isReady` is now set inside initServiceCatalogs (after the
|
|
324
|
+
// postauth updateServices) rather than by this listener, so it is not
|
|
325
|
+
// asserted here where initServiceCatalogs is stubbed.
|
|
326
|
+
await waitForAsync();
|
|
327
|
+
});
|
|
328
|
+
|
|
329
|
+
it('does not re-init postauth catalog when canAuthorize fires but catalog is already ready', async () => {
|
|
330
|
+
services.listenToOnce = sinon.stub();
|
|
331
|
+
services.collectPreauthCatalog = sinon.stub().returns(Promise.resolve());
|
|
332
|
+
services.initServiceCatalogs = sinon.stub().returns(Promise.resolve());
|
|
333
|
+
|
|
334
|
+
services.initialize();
|
|
335
|
+
// initialize() creates a new catalog; grab the current one.
|
|
336
|
+
const currentCatalog = services._getCatalog();
|
|
337
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
338
|
+
services.listenToOnce.getCall(1).args[2]();
|
|
339
|
+
await waitForAsync();
|
|
340
|
+
|
|
341
|
+
const freshLoginCall = services.listenToOnce
|
|
342
|
+
.getCalls()
|
|
343
|
+
.find((call: any) => call.args[1] === 'change:canAuthorize');
|
|
344
|
+
|
|
345
|
+
services.webex.canAuthorize = true;
|
|
346
|
+
currentCatalog.status.postauth.ready = true;
|
|
347
|
+
freshLoginCall!.args[2]();
|
|
348
|
+
|
|
349
|
+
assert.isFalse(
|
|
350
|
+
services.initServiceCatalogs.called,
|
|
351
|
+
'must not re-fetch postauth catalog if it is already ready'
|
|
352
|
+
);
|
|
353
|
+
});
|
|
354
|
+
|
|
355
|
+
it('finalizes ready when cache is warm (skips network fetch)', async () => {
|
|
356
|
+
services.listenToOnce = sinon.stub();
|
|
357
|
+
services._loadCatalogFromCache = sinon.stub().returns(Promise.resolve(true));
|
|
358
|
+
services.initServiceCatalogs = sinon.stub().returns(Promise.resolve());
|
|
359
|
+
services.collectPreauthCatalog = sinon.stub().returns(Promise.resolve());
|
|
360
|
+
|
|
361
|
+
services.initialize();
|
|
362
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
363
|
+
services.listenToOnce.getCall(1).args[2]();
|
|
364
|
+
await waitForAsync();
|
|
365
|
+
await waitForAsync();
|
|
366
|
+
|
|
367
|
+
assert.isTrue(services.ready);
|
|
368
|
+
assert.isFalse(
|
|
369
|
+
services.initServiceCatalogs.called,
|
|
370
|
+
'must skip network fetch when cache is warm'
|
|
371
|
+
);
|
|
372
|
+
assert.isFalse(
|
|
373
|
+
services.collectPreauthCatalog.called,
|
|
374
|
+
'must skip preauth fetch when cache is warm'
|
|
375
|
+
);
|
|
376
|
+
});
|
|
377
|
+
});
|
|
378
|
+
|
|
379
|
+
describe('#_finalizeReady', () => {
|
|
380
|
+
beforeEach(() => {
|
|
381
|
+
// Outer beforeEach construction already ran initialize() (ungated,
|
|
382
|
+
// sets ready=true). Reset so _finalizeReady's flip is observable.
|
|
383
|
+
services.ready = false;
|
|
384
|
+
});
|
|
385
|
+
|
|
386
|
+
it('sets ready=true immediately when credentials are not refreshing', async () => {
|
|
387
|
+
services.webex.credentials = {isRefreshing: false};
|
|
388
|
+
assert.isFalse(services.ready);
|
|
389
|
+
|
|
390
|
+
await services._finalizeReady();
|
|
391
|
+
|
|
392
|
+
assert.isTrue(services.ready);
|
|
393
|
+
});
|
|
394
|
+
|
|
395
|
+
it('sets ready=true when credentials are missing', async () => {
|
|
396
|
+
services.webex.credentials = undefined;
|
|
397
|
+
|
|
398
|
+
await services._finalizeReady();
|
|
399
|
+
|
|
400
|
+
assert.isTrue(services.ready);
|
|
401
|
+
});
|
|
402
|
+
|
|
403
|
+
it('awaits change:isRefreshing before setting ready=true', async () => {
|
|
404
|
+
let onChangeIsRefreshing: (() => void) | undefined;
|
|
405
|
+
services.webex.credentials = {
|
|
406
|
+
isRefreshing: true,
|
|
407
|
+
once: sinon.stub().callsFake((event: string, cb: () => void) => {
|
|
408
|
+
if (event === 'change:isRefreshing') onChangeIsRefreshing = cb;
|
|
409
|
+
}),
|
|
410
|
+
};
|
|
411
|
+
|
|
412
|
+
const settled = services._finalizeReady();
|
|
413
|
+
await waitForAsync();
|
|
414
|
+
|
|
415
|
+
assert.isFalse(services.ready, 'ready must not flip while refresh is in flight');
|
|
416
|
+
assert.isFunction(onChangeIsRefreshing);
|
|
417
|
+
|
|
418
|
+
onChangeIsRefreshing!();
|
|
419
|
+
await settled;
|
|
420
|
+
|
|
421
|
+
assert.isTrue(services.ready);
|
|
422
|
+
});
|
|
128
423
|
});
|
|
129
424
|
|
|
130
425
|
describe('#initServiceCatalogs', () => {
|