Skip to content

Commit 04a0560

Browse files
committed
Make fixes to ListenerType
1 parent 4e044e1 commit 04a0560

File tree

6 files changed

+23
-22
lines changed

6 files changed

+23
-22
lines changed

packages-exp/app-check-exp/src/api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ export function onTokenChanged(
231231
}
232232
addTokenListener(
233233
appCheckInstance as AppCheckService,
234-
ListenerType['3P'],
234+
ListenerType.EXTERNAL,
235235
nextFn,
236236
errorFn
237237
);

packages-exp/app-check-exp/src/factory.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export function internalFactory(
5151
return {
5252
getToken: forceRefresh => getToken(appCheck, forceRefresh),
5353
addTokenListener: listener =>
54-
addTokenListener(appCheck, ListenerType['2P'], listener),
54+
addTokenListener(appCheck, ListenerType.INTERNAL, listener),
5555
removeTokenListener: listener => removeTokenListener(appCheck.app, listener)
5656
};
5757
}

packages-exp/app-check-exp/src/internal-api.test.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,12 @@ describe('internal api', () => {
158158
const listener2 = spy();
159159
addTokenListener(
160160
appCheck as AppCheckService,
161-
ListenerType['2P'],
161+
ListenerType.INTERNAL,
162162
listener1
163163
);
164164
addTokenListener(
165165
appCheck as AppCheckService,
166-
ListenerType['2P'],
166+
ListenerType.INTERNAL,
167167
listener2
168168
);
169169

@@ -196,12 +196,12 @@ describe('internal api', () => {
196196
const listener2 = spy();
197197
addTokenListener(
198198
appCheck as AppCheckService,
199-
ListenerType['2P'],
199+
ListenerType.INTERNAL,
200200
listener1
201201
);
202202
addTokenListener(
203203
appCheck as AppCheckService,
204-
ListenerType['2P'],
204+
ListenerType.INTERNAL,
205205
listener2
206206
);
207207

@@ -227,7 +227,7 @@ describe('internal api', () => {
227227

228228
addTokenListener(
229229
appCheck as AppCheckService,
230-
ListenerType['3P'],
230+
ListenerType.EXTERNAL,
231231
listener1,
232232
errorFn1
233233
);
@@ -254,12 +254,12 @@ describe('internal api', () => {
254254

255255
addTokenListener(
256256
appCheck as AppCheckService,
257-
ListenerType['2P'],
257+
ListenerType.INTERNAL,
258258
listener1
259259
);
260260
addTokenListener(
261261
appCheck as AppCheckService,
262-
ListenerType['2P'],
262+
ListenerType.INTERNAL,
263263
listener2
264264
);
265265

@@ -371,7 +371,7 @@ describe('internal api', () => {
371371

372372
addTokenListener(
373373
{ app } as AppCheckService,
374-
ListenerType['2P'],
374+
ListenerType.INTERNAL,
375375
listener
376376
);
377377

@@ -386,7 +386,7 @@ describe('internal api', () => {
386386

387387
addTokenListener(
388388
{ app } as AppCheckService,
389-
ListenerType['2P'],
389+
ListenerType.INTERNAL,
390390
listener
391391
);
392392

@@ -414,7 +414,7 @@ describe('internal api', () => {
414414

415415
addTokenListener(
416416
{ app } as AppCheckService,
417-
ListenerType['2P'],
417+
ListenerType.INTERNAL,
418418
fakeListener
419419
);
420420
});
@@ -443,7 +443,7 @@ describe('internal api', () => {
443443

444444
addTokenListener(
445445
appCheck as AppCheckService,
446-
ListenerType['2P'],
446+
ListenerType.INTERNAL,
447447
fakeListener
448448
);
449449

@@ -468,7 +468,7 @@ describe('internal api', () => {
468468
});
469469
addTokenListener(
470470
appCheck as AppCheckService,
471-
ListenerType['2P'],
471+
ListenerType.INTERNAL,
472472
fakeListener
473473
);
474474
});
@@ -484,7 +484,7 @@ describe('internal api', () => {
484484
});
485485
addTokenListener(
486486
appCheck as AppCheckService,
487-
ListenerType['2P'],
487+
ListenerType.INTERNAL,
488488
() => {}
489489
);
490490

@@ -498,7 +498,7 @@ describe('internal api', () => {
498498
const listener = (): void => {};
499499
addTokenListener(
500500
{ app } as AppCheckService,
501-
ListenerType['2P'],
501+
ListenerType.INTERNAL,
502502
listener
503503
);
504504
expect(getState(app).tokenObservers.length).to.equal(1);
@@ -513,7 +513,7 @@ describe('internal api', () => {
513513

514514
addTokenListener(
515515
{ app } as AppCheckService,
516-
ListenerType['2P'],
516+
ListenerType.INTERNAL,
517517
listener
518518
);
519519
expect(getState(app).tokenObservers.length).to.equal(1);

packages-exp/app-check-exp/src/internal-api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ function notifyTokenListeners(
284284

285285
for (const observer of observers) {
286286
try {
287-
if (observer.type === ListenerType['3P'] && token.error != null) {
287+
if (observer.type === ListenerType.EXTERNAL && token.error != null) {
288288
// If this listener was added by a 3P call, send any token error to
289289
// the supplied error handler. A 3P observer always has an error
290290
// handler.

packages-exp/app-check-exp/src/types.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@ export interface AppCheckTokenObserver
4242
}
4343

4444
export const enum ListenerType {
45-
'2P' = '2P',
46-
'3P' = '3P'
45+
// Listener added by a 2P library.
46+
'INTERNAL' = 'INTERNAL',
47+
// Listener added by users using the public API.
48+
'EXTERNAL' = 'EXTERNAL'
4749
}
4850

4951
// If the error field is defined, the token field will be populated with a dummy token

packages-exp/app-check-exp/tsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"extends": "../../config/tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "dist",
5-
"strict": true,
6-
"preserveConstEnums": true
5+
"strict": true
76
},
87
"exclude": ["dist/**/*"]
98
}

0 commit comments

Comments
 (0)