Skip to content

Commit d95bac6

Browse files
committed
cleanup unit tests
1 parent c7e4046 commit d95bac6

File tree

3 files changed

+25
-11
lines changed

3 files changed

+25
-11
lines changed

src/app-check/app-check-api-client-internal.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,12 @@ export class AppCheckApiClient {
104104
return this.httpClient.send(request);
105105
})
106106
.then((resp) => {
107-
if (!validator.isBoolean(resp.data?.already_consumed)) {
107+
if (typeof resp.data.alreadyConsumed !== 'undefined'
108+
&& !validator.isBoolean(resp.data?.alreadyConsumed)) {
108109
throw new FirebaseAppCheckError(
109-
'invalid-argument', '`already_consumed` must be a boolean value.');
110+
'invalid-argument', '`alreadyConsumed` must be a boolean value.');
110111
}
111-
return resp.data.already_consumed;
112+
return resp.data.alreadyConsumed || false;
112113
})
113114
.catch((err) => {
114115
throw this.toFirebaseError(err);

test/unit/app-check/app-check-api-client-internal.spec.ts

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -305,23 +305,23 @@ describe('AppCheckApiClient', () => {
305305

306306
['', 'abc', '3s2', 'sssa', '3.000000001', '3.2', null, NaN, [], {}, 100, 1.2, -200, -2.4]
307307
.forEach((invalidAlreadyConsumed) => {
308-
it(`should throw if the returned already_consumed value is: ${invalidAlreadyConsumed}`, () => {
309-
const response = { already_consumed: invalidAlreadyConsumed };
308+
it(`should throw if the returned alreadyConsumed value is: ${invalidAlreadyConsumed}`, () => {
309+
const response = { alreadyConsumed: invalidAlreadyConsumed };
310310
const stub = sinon
311311
.stub(HttpClient.prototype, 'send')
312312
.resolves(utils.responseFrom(response, 200));
313313
stubs.push(stub);
314314
const expected = new FirebaseAppCheckError(
315-
'invalid-argument', '`already_consumed` must be a boolean value.');
315+
'invalid-argument', '`alreadyConsumed` must be a boolean value.');
316316
return apiClient.verifyReplayProtection(TEST_TOKEN_TO_EXCHANGE)
317317
.should.eventually.be.rejected.and.deep.include(expected);
318318
});
319319
});
320320

321-
it('should resolve with the already_consumed status on success', () => {
321+
it('should resolve with the alreadyConsumed status on success', () => {
322322
const stub = sinon
323323
.stub(HttpClient.prototype, 'send')
324-
.resolves(utils.responseFrom({ already_consumed: true }, 200));
324+
.resolves(utils.responseFrom({ alreadyConsumed: true }, 200));
325325
stubs.push(stub);
326326
return apiClient.verifyReplayProtection(TEST_TOKEN_TO_EXCHANGE)
327327
.then((alreadyConsumed) => {
@@ -336,9 +336,9 @@ describe('AppCheckApiClient', () => {
336336
});
337337

338338
[true, false].forEach((expectedAlreadyConsumed) => {
339-
it(`should resolve with alreadyConsumed as ${expectedAlreadyConsumed} when already_consumed
339+
it(`should resolve with alreadyConsumed as ${expectedAlreadyConsumed} when alreadyConsumed
340340
from server is: ${expectedAlreadyConsumed}`, () => {
341-
const response = { already_consumed: expectedAlreadyConsumed };
341+
const response = { alreadyConsumed: expectedAlreadyConsumed };
342342
const stub = sinon
343343
.stub(HttpClient.prototype, 'send')
344344
.resolves(utils.responseFrom(response, 200));
@@ -349,6 +349,19 @@ describe('AppCheckApiClient', () => {
349349
});
350350
});
351351
});
352+
353+
it(`should resolve with alreadyConsumed as false when alreadyConsumed
354+
from server is: undefined`, () => {
355+
const response = { };
356+
const stub = sinon
357+
.stub(HttpClient.prototype, 'send')
358+
.resolves(utils.responseFrom(response, 200));
359+
stubs.push(stub);
360+
return apiClient.verifyReplayProtection(TEST_TOKEN_TO_EXCHANGE)
361+
.then((alreadyConsumed) => {
362+
expect(alreadyConsumed).to.equal(false);
363+
});
364+
});
352365
});
353366

354367
});

test/unit/app-check/app-check.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ describe('AppCheck', () => {
309309
return expect(replayStub).to.not.have.been.called;
310310
});
311311

312-
it('should resolve with VerifyAppCheckTokenResponse on success with already_consumed set', () => {
312+
it('should resolve with VerifyAppCheckTokenResponse on success with alreadyConsumed set', () => {
313313
const response = {
314314
sub: 'app-id',
315315
iss: 'https://firebaseappcheck.googleapis.com/123456',

0 commit comments

Comments
 (0)