@webex/webex-core 3.12.0-next.5 → 3.12.0-next.50
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/README.md +5 -2
- package/dist/config.js +38 -0
- package/dist/config.js.map +1 -1
- package/dist/credentials-config.js +12 -0
- package/dist/credentials-config.js.map +1 -1
- package/dist/index.js +7 -0
- package/dist/index.js.map +1 -1
- package/dist/interceptors/catalog-url.js +87 -0
- package/dist/interceptors/catalog-url.js.map +1 -0
- package/dist/interceptors/payload-transformer.js +25 -4
- package/dist/interceptors/payload-transformer.js.map +1 -1
- package/dist/lib/batcher.js +23 -7
- package/dist/lib/batcher.js.map +1 -1
- package/dist/lib/credentials/credentials.js +103 -4
- package/dist/lib/credentials/credentials.js.map +1 -1
- package/dist/lib/credentials/token.js +1 -1
- package/dist/lib/domains.js +90 -0
- package/dist/lib/domains.js.map +1 -0
- package/dist/lib/services/service-catalog.js +108 -18
- package/dist/lib/services/service-catalog.js.map +1 -1
- package/dist/lib/services/services.js +232 -34
- package/dist/lib/services/services.js.map +1 -1
- package/dist/lib/services-v2/service-catalog.js +14 -13
- package/dist/lib/services-v2/service-catalog.js.map +1 -1
- package/dist/lib/services-v2/services-v2.js +241 -37
- package/dist/lib/services-v2/services-v2.js.map +1 -1
- package/dist/plugins/logger.js +1 -1
- package/dist/webex-core.js +11 -3
- package/dist/webex-core.js.map +1 -1
- package/package.json +13 -13
- package/src/config.js +42 -0
- package/src/credentials-config.js +13 -0
- package/src/index.js +1 -0
- package/src/interceptors/catalog-url.js +66 -0
- package/src/interceptors/payload-transformer.js +23 -1
- package/src/lib/batcher.js +25 -10
- package/src/lib/credentials/credentials.js +93 -3
- package/src/lib/domains.ts +94 -0
- package/src/lib/services/service-catalog.js +112 -16
- package/src/lib/services/services.js +208 -20
- package/src/lib/services-v2/service-catalog.ts +16 -12
- package/src/lib/services-v2/services-v2.ts +218 -21
- package/src/webex-core.js +8 -0
- package/test/fixtures/activation-email.ts +22 -0
- package/test/integration/spec/services/services.js +183 -112
- package/test/integration/spec/services-v2/services-v2.js +169 -98
- package/test/unit/spec/credentials/credentials.js +247 -3
- package/test/unit/spec/interceptors/auth.js +56 -0
- package/test/unit/spec/interceptors/catalog-url.js +224 -0
- package/test/unit/spec/interceptors/payload-transformer.js +119 -1
- package/test/unit/spec/lib/batcher.js +56 -0
- package/test/unit/spec/services/service-catalog.js +368 -11
- package/test/unit/spec/services/services.js +440 -2
- package/test/unit/spec/services-v2/service-catalog.ts +134 -11
- package/test/unit/spec/services-v2/services-v2.ts +467 -0
- package/test/unit/spec/webex-core.js +77 -1
|
@@ -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();
|
|
@@ -112,6 +115,7 @@ describe('webex-core', () => {
|
|
|
112
115
|
services.initialize();
|
|
113
116
|
|
|
114
117
|
// call the onReady callback
|
|
118
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
115
119
|
services.listenToOnce.getCall(1).args[2]();
|
|
116
120
|
|
|
117
121
|
await waitForAsync();
|
|
@@ -122,6 +126,440 @@ describe('webex-core', () => {
|
|
|
122
126
|
`services: failed to init initial services when credentials available, ${expectedMessage}`
|
|
123
127
|
);
|
|
124
128
|
});
|
|
129
|
+
|
|
130
|
+
it('sets services.ready to true when waitForCatalogInit is disabled (default)', () => {
|
|
131
|
+
services.listenToOnce = sinon.stub();
|
|
132
|
+
services.initialize();
|
|
133
|
+
|
|
134
|
+
// Fire the change:config handler which decides gated-vs-ungated and, in
|
|
135
|
+
// ungated mode, flips services.ready to true.
|
|
136
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
137
|
+
|
|
138
|
+
assert.isTrue(services.ready, 'services.ready should be true so it does not block webex.ready');
|
|
139
|
+
});
|
|
140
|
+
|
|
141
|
+
it('listens on the "ready" event when waitForCatalogInit is disabled (default)', () => {
|
|
142
|
+
services.listenToOnce = sinon.stub();
|
|
143
|
+
services.initialize();
|
|
144
|
+
|
|
145
|
+
// Fire change:config to trigger the mode-specific listener registration.
|
|
146
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
147
|
+
|
|
148
|
+
// Call 0 is 'change:config'; call 1 is the catalog init listener.
|
|
149
|
+
const [, event] = services.listenToOnce.getCall(1).args;
|
|
150
|
+
assert.equal(event, 'ready', 'default path listens on webex ready');
|
|
151
|
+
});
|
|
152
|
+
|
|
153
|
+
it('skips preauth catalog collection when skipPreauthCatalogOnUnauthenticated is true and no credentials', async () => {
|
|
154
|
+
services.webex.config = {
|
|
155
|
+
...(services.webex.config || {}),
|
|
156
|
+
services: {skipPreauthCatalogOnUnauthenticated: true},
|
|
157
|
+
};
|
|
158
|
+
services.listenToOnce = sinon.stub();
|
|
159
|
+
services.collectPreauthCatalog = sinon.stub().returns(Promise.resolve());
|
|
160
|
+
services.logger.info = sinon.stub();
|
|
161
|
+
|
|
162
|
+
services.initialize();
|
|
163
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
164
|
+
services.listenToOnce.getCall(1).args[2]();
|
|
165
|
+
await waitForAsync();
|
|
166
|
+
|
|
167
|
+
assert.isFalse(
|
|
168
|
+
services.collectPreauthCatalog.called,
|
|
169
|
+
'must not collect preauth catalog while unauthenticated when option is enabled'
|
|
170
|
+
);
|
|
171
|
+
assert.isFalse(services.initFailed);
|
|
172
|
+
sinon.assert.calledWith(
|
|
173
|
+
services.logger.info,
|
|
174
|
+
'services: skipping preauth catalog collection while unauthenticated as per the config'
|
|
175
|
+
);
|
|
176
|
+
});
|
|
177
|
+
|
|
178
|
+
it('still collects preauth catalog when skipPreauthCatalogOnUnauthenticated is false (default)', async () => {
|
|
179
|
+
services.webex.config = {
|
|
180
|
+
...(services.webex.config || {}),
|
|
181
|
+
services: {skipPreauthCatalogOnUnauthenticated: false},
|
|
182
|
+
};
|
|
183
|
+
services.listenToOnce = sinon.stub();
|
|
184
|
+
services.collectPreauthCatalog = sinon.stub().returns(Promise.resolve());
|
|
185
|
+
|
|
186
|
+
services.initialize();
|
|
187
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
188
|
+
services.listenToOnce.getCall(1).args[2]();
|
|
189
|
+
await waitForAsync();
|
|
190
|
+
|
|
191
|
+
assert.isTrue(
|
|
192
|
+
services.collectPreauthCatalog.called,
|
|
193
|
+
'must collect preauth catalog when option is disabled'
|
|
194
|
+
);
|
|
195
|
+
});
|
|
196
|
+
});
|
|
197
|
+
|
|
198
|
+
describe('#initialize (waitForCatalogInit=true)', () => {
|
|
199
|
+
let clock;
|
|
200
|
+
|
|
201
|
+
beforeEach(() => {
|
|
202
|
+
services.webex.config = {
|
|
203
|
+
...(services.webex.config || {}),
|
|
204
|
+
services: {waitForCatalogInit: true, catalogInitTimeout: 15000},
|
|
205
|
+
};
|
|
206
|
+
// Reset ready flag: the outer beforeEach constructs services which
|
|
207
|
+
// runs initialize() once with no config (ungated path, flips ready to
|
|
208
|
+
// true). We reset here so tests that call initialize() a second time
|
|
209
|
+
// with the flag enabled observe the gated behavior from a clean state.
|
|
210
|
+
services.ready = false;
|
|
211
|
+
// The gated path schedules a real 15s setTimeout via _makeInitTimeout()
|
|
212
|
+
// that is not cleared when the init race resolves. Fake only setTimeout/
|
|
213
|
+
// clearTimeout (leaving setImmediate real so waitForAsync still works)
|
|
214
|
+
// so restoring in afterEach clears the pending timer and Jest can exit.
|
|
215
|
+
clock = sinon.useFakeTimers({toFake: ['setTimeout', 'clearTimeout']});
|
|
216
|
+
});
|
|
217
|
+
|
|
218
|
+
afterEach(() => {
|
|
219
|
+
clock.restore();
|
|
220
|
+
});
|
|
221
|
+
|
|
222
|
+
it('leaves services.ready=false after initialize (does not flip until finalize)', () => {
|
|
223
|
+
services.listenToOnce = sinon.stub();
|
|
224
|
+
services.initialize();
|
|
225
|
+
|
|
226
|
+
assert.isFalse(services.ready, 'services.ready should block webex.ready until finalize');
|
|
227
|
+
});
|
|
228
|
+
|
|
229
|
+
it('listens on the "loaded" event (not "ready") to avoid deadlock', () => {
|
|
230
|
+
services.listenToOnce = sinon.stub();
|
|
231
|
+
services.initialize();
|
|
232
|
+
|
|
233
|
+
// Fire change:config to trigger the mode-specific listener registration.
|
|
234
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
235
|
+
|
|
236
|
+
// Call 0 is 'change:config'; call 1 is the catalog init listener.
|
|
237
|
+
const [, event] = services.listenToOnce.getCall(1).args;
|
|
238
|
+
assert.equal(event, 'loaded', 'gated path must listen on loaded to avoid deadlock');
|
|
239
|
+
});
|
|
240
|
+
|
|
241
|
+
it('flips services.ready=true after init succeeds with credentials', async () => {
|
|
242
|
+
services.listenToOnce = sinon.stub();
|
|
243
|
+
services.initServiceCatalogs = sinon.stub().returns(Promise.resolve());
|
|
244
|
+
services.webex.credentials = {
|
|
245
|
+
supertoken: {access_token: 'token'},
|
|
246
|
+
};
|
|
247
|
+
|
|
248
|
+
services.initialize();
|
|
249
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
250
|
+
services.listenToOnce.getCall(1).args[2]();
|
|
251
|
+
await waitForAsync();
|
|
252
|
+
|
|
253
|
+
assert.isTrue(services.ready);
|
|
254
|
+
});
|
|
255
|
+
|
|
256
|
+
it('flips services.ready=true after init succeeds without credentials (preauth path)', async () => {
|
|
257
|
+
services.listenToOnce = sinon.stub();
|
|
258
|
+
services.collectPreauthCatalog = sinon.stub().returns(Promise.resolve());
|
|
259
|
+
|
|
260
|
+
services.initialize();
|
|
261
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
262
|
+
services.listenToOnce.getCall(1).args[2]();
|
|
263
|
+
await waitForAsync();
|
|
264
|
+
|
|
265
|
+
assert.isTrue(services.ready);
|
|
266
|
+
});
|
|
267
|
+
|
|
268
|
+
it('flips services.ready=true even when initServiceCatalogs errors, so webex.ready can fire', async () => {
|
|
269
|
+
services.listenToOnce = sinon.stub();
|
|
270
|
+
services.initServiceCatalogs = sinon.stub().returns(Promise.reject(new Error('boom')));
|
|
271
|
+
services.webex.credentials = {
|
|
272
|
+
supertoken: {access_token: 'token'},
|
|
273
|
+
};
|
|
274
|
+
services.logger.error = sinon.stub();
|
|
275
|
+
|
|
276
|
+
services.initialize();
|
|
277
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
278
|
+
services.listenToOnce.getCall(1).args[2]();
|
|
279
|
+
await waitForAsync();
|
|
280
|
+
|
|
281
|
+
assert.isTrue(services.initFailed);
|
|
282
|
+
assert.isTrue(services.ready);
|
|
283
|
+
});
|
|
284
|
+
|
|
285
|
+
it('flips services.ready=true even when collectPreauthCatalog errors', async () => {
|
|
286
|
+
services.listenToOnce = sinon.stub();
|
|
287
|
+
services.collectPreauthCatalog = sinon.stub().returns(Promise.reject(new Error('boom')));
|
|
288
|
+
services.logger.error = sinon.stub();
|
|
289
|
+
|
|
290
|
+
services.initialize();
|
|
291
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
292
|
+
services.listenToOnce.getCall(1).args[2]();
|
|
293
|
+
await waitForAsync();
|
|
294
|
+
|
|
295
|
+
assert.isTrue(services.initFailed);
|
|
296
|
+
assert.isTrue(services.ready);
|
|
297
|
+
});
|
|
298
|
+
|
|
299
|
+
it('flips services.ready=true when init times out', async () => {
|
|
300
|
+
services.listenToOnce = sinon.stub();
|
|
301
|
+
// Never resolves - the timeout must win the race.
|
|
302
|
+
services.initServiceCatalogs = sinon.stub().returns(new Promise(() => {}));
|
|
303
|
+
services.webex.credentials = {
|
|
304
|
+
supertoken: {access_token: 'token'},
|
|
305
|
+
};
|
|
306
|
+
services.logger.error = sinon.stub();
|
|
307
|
+
|
|
308
|
+
services.initialize();
|
|
309
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
310
|
+
services.listenToOnce.getCall(1).args[2]();
|
|
311
|
+
|
|
312
|
+
// Advance past the 15s init timeout and flush microtasks so the
|
|
313
|
+
// rejected timeout can propagate through .catch and .finally into
|
|
314
|
+
// _finalizeReady().
|
|
315
|
+
await clock.tickAsync(15_001);
|
|
316
|
+
|
|
317
|
+
assert.isTrue(services.initFailed);
|
|
318
|
+
assert.isTrue(services.ready);
|
|
319
|
+
sinon.assert.calledWithMatch(
|
|
320
|
+
services.logger.error,
|
|
321
|
+
/services: init timed out after 15000ms/
|
|
322
|
+
);
|
|
323
|
+
});
|
|
324
|
+
|
|
325
|
+
it('awaits an in-flight credentials refresh before flipping services.ready=true', async () => {
|
|
326
|
+
services.listenToOnce = sinon.stub();
|
|
327
|
+
services.initServiceCatalogs = sinon.stub().returns(Promise.resolve());
|
|
328
|
+
|
|
329
|
+
let onChangeIsRefreshing;
|
|
330
|
+
services.webex.credentials = {
|
|
331
|
+
supertoken: {access_token: 'token'},
|
|
332
|
+
isRefreshing: true,
|
|
333
|
+
once: sinon.stub().callsFake((event, cb) => {
|
|
334
|
+
if (event === 'change:isRefreshing') onChangeIsRefreshing = cb;
|
|
335
|
+
}),
|
|
336
|
+
};
|
|
337
|
+
|
|
338
|
+
services.initialize();
|
|
339
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
340
|
+
services.listenToOnce.getCall(1).args[2]();
|
|
341
|
+
await waitForAsync();
|
|
342
|
+
|
|
343
|
+
assert.isFalse(services.ready, 'must not flip ready while refresh is in flight');
|
|
344
|
+
assert.isFunction(onChangeIsRefreshing, 'must subscribe to change:isRefreshing');
|
|
345
|
+
sinon.assert.calledWith(services.webex.credentials.once, 'change:isRefreshing');
|
|
346
|
+
|
|
347
|
+
// Simulate refresh completing.
|
|
348
|
+
onChangeIsRefreshing();
|
|
349
|
+
await waitForAsync();
|
|
350
|
+
|
|
351
|
+
assert.isTrue(services.ready);
|
|
352
|
+
});
|
|
353
|
+
|
|
354
|
+
it('registers a change:canAuthorize listener when there is no supertoken (fresh-login path)', async () => {
|
|
355
|
+
services.listenToOnce = sinon.stub();
|
|
356
|
+
services.collectPreauthCatalog = sinon.stub().returns(Promise.resolve());
|
|
357
|
+
services.initServiceCatalogs = sinon.stub().returns(Promise.resolve());
|
|
358
|
+
|
|
359
|
+
services.initialize();
|
|
360
|
+
// initialize() creates a new catalog and replaces the WeakMap entry.
|
|
361
|
+
const currentCatalog = services._getCatalog();
|
|
362
|
+
// Fire the 'loaded' listener (index 1; index 0 was 'change:config').
|
|
363
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
364
|
+
services.listenToOnce.getCall(1).args[2]();
|
|
365
|
+
await waitForAsync();
|
|
366
|
+
|
|
367
|
+
const freshLoginCall = services.listenToOnce
|
|
368
|
+
.getCalls()
|
|
369
|
+
.find((call) => call.args[1] === 'change:canAuthorize');
|
|
370
|
+
assert.isDefined(freshLoginCall, 'expected change:canAuthorize listener to be registered');
|
|
371
|
+
|
|
372
|
+
// Simulate OAuth completing.
|
|
373
|
+
services.webex.canAuthorize = true;
|
|
374
|
+
currentCatalog.status.postauth.ready = false;
|
|
375
|
+
freshLoginCall.args[2]();
|
|
376
|
+
|
|
377
|
+
assert.isTrue(
|
|
378
|
+
services.initServiceCatalogs.called,
|
|
379
|
+
'expected postauth catalog init after canAuthorize flips'
|
|
380
|
+
);
|
|
381
|
+
|
|
382
|
+
// `catalog.isReady` is now set inside initServiceCatalogs (after the
|
|
383
|
+
// postauth updateServices) rather than by this listener, so it is not
|
|
384
|
+
// asserted here where initServiceCatalogs is stubbed.
|
|
385
|
+
await waitForAsync();
|
|
386
|
+
});
|
|
387
|
+
|
|
388
|
+
it('does not re-init postauth catalog when canAuthorize fires but catalog is already ready', async () => {
|
|
389
|
+
services.listenToOnce = sinon.stub();
|
|
390
|
+
services.collectPreauthCatalog = sinon.stub().returns(Promise.resolve());
|
|
391
|
+
services.initServiceCatalogs = sinon.stub().returns(Promise.resolve());
|
|
392
|
+
|
|
393
|
+
services.initialize();
|
|
394
|
+
// initialize() creates a new catalog; grab the current one.
|
|
395
|
+
const currentCatalog = services._getCatalog();
|
|
396
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
397
|
+
services.listenToOnce.getCall(1).args[2]();
|
|
398
|
+
await waitForAsync();
|
|
399
|
+
|
|
400
|
+
const freshLoginCall = services.listenToOnce
|
|
401
|
+
.getCalls()
|
|
402
|
+
.find((call) => call.args[1] === 'change:canAuthorize');
|
|
403
|
+
|
|
404
|
+
services.webex.canAuthorize = true;
|
|
405
|
+
currentCatalog.status.postauth.ready = true; // already collected
|
|
406
|
+
freshLoginCall.args[2]();
|
|
407
|
+
|
|
408
|
+
assert.isFalse(
|
|
409
|
+
services.initServiceCatalogs.called,
|
|
410
|
+
'must not re-fetch postauth catalog if it is already ready'
|
|
411
|
+
);
|
|
412
|
+
});
|
|
413
|
+
|
|
414
|
+
it('finalizes ready when cache is warm (skips network fetch)', async () => {
|
|
415
|
+
services.listenToOnce = sinon.stub();
|
|
416
|
+
services._loadCatalogFromCache = sinon.stub().returns(Promise.resolve(true));
|
|
417
|
+
services.initServiceCatalogs = sinon.stub().returns(Promise.resolve());
|
|
418
|
+
services.collectPreauthCatalog = sinon.stub().returns(Promise.resolve());
|
|
419
|
+
|
|
420
|
+
services.initialize();
|
|
421
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
422
|
+
services.listenToOnce.getCall(1).args[2]();
|
|
423
|
+
await waitForAsync();
|
|
424
|
+
await waitForAsync();
|
|
425
|
+
|
|
426
|
+
assert.isTrue(services.ready);
|
|
427
|
+
assert.isFalse(
|
|
428
|
+
services.initServiceCatalogs.called,
|
|
429
|
+
'must skip network fetch when cache is warm'
|
|
430
|
+
);
|
|
431
|
+
assert.isFalse(
|
|
432
|
+
services.collectPreauthCatalog.called,
|
|
433
|
+
'must skip preauth fetch when cache is warm'
|
|
434
|
+
);
|
|
435
|
+
});
|
|
436
|
+
});
|
|
437
|
+
|
|
438
|
+
describe('#initialize (waitForCatalogInit=true, skipPreauthCatalogOnUnauthenticated=true)', () => {
|
|
439
|
+
beforeEach(() => {
|
|
440
|
+
services.webex.config = {
|
|
441
|
+
...(services.webex.config || {}),
|
|
442
|
+
services: {
|
|
443
|
+
waitForCatalogInit: true,
|
|
444
|
+
catalogInitTimeout: 15000,
|
|
445
|
+
skipPreauthCatalogOnUnauthenticated: true,
|
|
446
|
+
},
|
|
447
|
+
};
|
|
448
|
+
services.ready = false;
|
|
449
|
+
});
|
|
450
|
+
|
|
451
|
+
it('skips preauth catalog collection but still finalizes services.ready when unauthenticated', async () => {
|
|
452
|
+
services.listenToOnce = sinon.stub();
|
|
453
|
+
services.collectPreauthCatalog = sinon.stub().returns(Promise.resolve());
|
|
454
|
+
services.logger.info = sinon.stub();
|
|
455
|
+
|
|
456
|
+
services.initialize();
|
|
457
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
458
|
+
services.listenToOnce.getCall(1).args[2]();
|
|
459
|
+
await waitForAsync();
|
|
460
|
+
|
|
461
|
+
assert.isFalse(
|
|
462
|
+
services.collectPreauthCatalog.called,
|
|
463
|
+
'must not collect preauth catalog while unauthenticated when option is enabled'
|
|
464
|
+
);
|
|
465
|
+
assert.isTrue(services.ready, 'must still finalize ready so webex.ready is not stalled');
|
|
466
|
+
sinon.assert.calledWith(
|
|
467
|
+
services.logger.info,
|
|
468
|
+
'services: skipping preauth catalog collection while unauthenticated as per the config'
|
|
469
|
+
);
|
|
470
|
+
});
|
|
471
|
+
|
|
472
|
+
it('still registers a change:canAuthorize listener when skipping preauth (fresh-login path)', async () => {
|
|
473
|
+
services.listenToOnce = sinon.stub();
|
|
474
|
+
services.collectPreauthCatalog = sinon.stub().returns(Promise.resolve());
|
|
475
|
+
services.initServiceCatalogs = sinon.stub().returns(Promise.resolve());
|
|
476
|
+
|
|
477
|
+
services.initialize();
|
|
478
|
+
const currentCatalog = services._getCatalog();
|
|
479
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
480
|
+
services.listenToOnce.getCall(1).args[2]();
|
|
481
|
+
await waitForAsync();
|
|
482
|
+
|
|
483
|
+
const freshLoginCall = services.listenToOnce
|
|
484
|
+
.getCalls()
|
|
485
|
+
.find((call) => call.args[1] === 'change:canAuthorize');
|
|
486
|
+
assert.isDefined(freshLoginCall, 'expected change:canAuthorize listener to be registered');
|
|
487
|
+
|
|
488
|
+
services.webex.canAuthorize = true;
|
|
489
|
+
currentCatalog.status.postauth.ready = false;
|
|
490
|
+
freshLoginCall.args[2]();
|
|
491
|
+
|
|
492
|
+
assert.isTrue(
|
|
493
|
+
services.initServiceCatalogs.called,
|
|
494
|
+
'expected postauth catalog init after canAuthorize flips'
|
|
495
|
+
);
|
|
496
|
+
await waitForAsync();
|
|
497
|
+
});
|
|
498
|
+
|
|
499
|
+
it('does not schedule an init timeout when skipping preauth (no stray timer/rejection)', async () => {
|
|
500
|
+
const clock = sinon.useFakeTimers();
|
|
501
|
+
services.listenToOnce = sinon.stub();
|
|
502
|
+
services.collectPreauthCatalog = sinon.stub().returns(Promise.resolve());
|
|
503
|
+
services.logger.error = sinon.stub();
|
|
504
|
+
|
|
505
|
+
services.initialize();
|
|
506
|
+
services.listenToOnce.getCall(0).args[2]();
|
|
507
|
+
services.listenToOnce.getCall(1).args[2]();
|
|
508
|
+
|
|
509
|
+
// Advance well past the configured init timeout; since no timeout was
|
|
510
|
+
// scheduled in skip mode, no timeout error should ever be logged.
|
|
511
|
+
await clock.tickAsync(30_000);
|
|
512
|
+
clock.restore();
|
|
513
|
+
|
|
514
|
+
sinon.assert.neverCalledWithMatch(services.logger.error, /services: init timed out/);
|
|
515
|
+
});
|
|
516
|
+
});
|
|
517
|
+
|
|
518
|
+
describe('#_finalizeReady', () => {
|
|
519
|
+
beforeEach(() => {
|
|
520
|
+
// Outer beforeEach construction already ran initialize() (ungated,
|
|
521
|
+
// sets ready=true). Reset so _finalizeReady's flip is observable.
|
|
522
|
+
services.ready = false;
|
|
523
|
+
});
|
|
524
|
+
|
|
525
|
+
it('sets ready=true immediately when credentials are not refreshing', async () => {
|
|
526
|
+
services.webex.credentials = {isRefreshing: false};
|
|
527
|
+
assert.isFalse(services.ready);
|
|
528
|
+
|
|
529
|
+
await services._finalizeReady();
|
|
530
|
+
|
|
531
|
+
assert.isTrue(services.ready);
|
|
532
|
+
});
|
|
533
|
+
|
|
534
|
+
it('sets ready=true when credentials are missing', async () => {
|
|
535
|
+
services.webex.credentials = undefined;
|
|
536
|
+
|
|
537
|
+
await services._finalizeReady();
|
|
538
|
+
|
|
539
|
+
assert.isTrue(services.ready);
|
|
540
|
+
});
|
|
541
|
+
|
|
542
|
+
it('awaits change:isRefreshing before setting ready=true', async () => {
|
|
543
|
+
let onChangeIsRefreshing;
|
|
544
|
+
services.webex.credentials = {
|
|
545
|
+
isRefreshing: true,
|
|
546
|
+
once: sinon.stub().callsFake((event, cb) => {
|
|
547
|
+
if (event === 'change:isRefreshing') onChangeIsRefreshing = cb;
|
|
548
|
+
}),
|
|
549
|
+
};
|
|
550
|
+
|
|
551
|
+
const settled = services._finalizeReady();
|
|
552
|
+
// Let the async body reach its await point.
|
|
553
|
+
await waitForAsync();
|
|
554
|
+
|
|
555
|
+
assert.isFalse(services.ready, 'ready must not flip while refresh is in flight');
|
|
556
|
+
assert.isFunction(onChangeIsRefreshing);
|
|
557
|
+
|
|
558
|
+
onChangeIsRefreshing();
|
|
559
|
+
await settled;
|
|
560
|
+
|
|
561
|
+
assert.isTrue(services.ready);
|
|
562
|
+
});
|
|
125
563
|
});
|
|
126
564
|
|
|
127
565
|
describe('#initServiceCatalogs', () => {
|
|
@@ -1041,7 +1479,7 @@ describe('webex-core', () => {
|
|
|
1041
1479
|
sinon.stub(services, 'request').resolves({body: {services: [], activeServices: {}, timestamp: Date.now().toString(), orgId: 'urn:EXAMPLE:org', format: 'U2CV2'}});
|
|
1042
1480
|
// Cause ready callback to run immediately
|
|
1043
1481
|
services.listenToOnce = sinon.stub().callsFake((ctx, event, cb) => {
|
|
1044
|
-
if (event === 'ready') cb();
|
|
1482
|
+
if (event === 'change:config' || event === 'ready') cb();
|
|
1045
1483
|
});
|
|
1046
1484
|
|
|
1047
1485
|
// Act
|
|
@@ -1083,7 +1521,7 @@ describe('webex-core', () => {
|
|
|
1083
1521
|
const cacheSpy = sinon.spy(services, '_cacheCatalog');
|
|
1084
1522
|
// Cause ready callback to run immediately
|
|
1085
1523
|
services.listenToOnce = sinon.stub().callsFake((ctx, event, cb) => {
|
|
1086
|
-
if (event === 'ready') cb();
|
|
1524
|
+
if (event === 'change:config' || event === 'ready') cb();
|
|
1087
1525
|
});
|
|
1088
1526
|
|
|
1089
1527
|
// Act
|