Skip to content

Commit fc45c4f

Browse files
authored
Fixing a number of TS errors/warnings (#78)
* Fixing a number of TS errors/warnings * Fixing another warning * Fixing another warning
1 parent b945ca5 commit fc45c4f

File tree

7 files changed

+21
-15
lines changed

7 files changed

+21
-15
lines changed

src/auth/token-generator.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export class FirebaseTokenGenerator {
152152
);
153153
}
154154

155-
const fullDecodedToken = jwt.decode(idToken, {
155+
const fullDecodedToken: any = jwt.decode(idToken, {
156156
complete: true,
157157
});
158158

@@ -222,7 +222,7 @@ export class FirebaseTokenGenerator {
222222
return new Promise((resolve, reject) => {
223223
jwt.verify(idToken, publicKeys[header.kid], {
224224
algorithms: [ALGORITHM],
225-
}, (error, decodedToken) => {
225+
}, (error, decodedToken: any) => {
226226
if (error) {
227227
if (error.name === 'TokenExpiredError') {
228228
errorMessage = 'Firebase ID token has expired. Get a fresh token from your client app and try ' +
@@ -297,12 +297,12 @@ export class FirebaseTokenGenerator {
297297
} else {
298298
/* istanbul ignore else */
299299
if (res.headers.hasOwnProperty('cache-control')) {
300-
const cacheControlHeader = res.headers['cache-control'];
300+
const cacheControlHeader: string = res.headers['cache-control'] as string;
301301
const parts = cacheControlHeader.split(',');
302302
parts.forEach((part) => {
303303
const subParts = part.trim().split('=');
304304
if (subParts[0] === 'max-age') {
305-
const maxAge = subParts[1];
305+
const maxAge: number = +subParts[1];
306306
this.publicKeysExpireAt_ = Date.now() + (maxAge * 1000);
307307
}
308308
});

src/messaging/messaging.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -431,10 +431,10 @@ class Messaging implements FirebaseServiceInterface {
431431
// See b/35394951 for more context.
432432
if ('multicast_id' in response) {
433433
if ((response as any).success === 0) {
434-
return Promise.reject(new FirebaseMessagingError(
434+
throw new FirebaseMessagingError(
435435
MessagingClientErrorCode.INVALID_RECIPIENT,
436436
'Notification key provided to sendToDeviceGroup() is invalid.'
437-
));
437+
);
438438
} else {
439439
return mapRawResponseToDevicesResponse(response);
440440
}
@@ -485,7 +485,7 @@ class Messaging implements FirebaseServiceInterface {
485485
// Rename properties on the server response
486486
utils.renameProperties(response, MESSAGING_TOPIC_RESPONSE_KEYS_MAP);
487487

488-
return response;
488+
return response as MessagingTopicResponse;
489489
});
490490
}
491491

@@ -537,7 +537,7 @@ class Messaging implements FirebaseServiceInterface {
537537
// Rename properties on the server response
538538
utils.renameProperties(response, MESSAGING_CONDITION_RESPONSE_KEYS_MAP);
539539

540-
return response;
540+
return response as MessagingConditionResponse;
541541
});
542542
}
543543

src/utils/api-request.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import {deepCopy} from './deep-copy';
1818
import {FirebaseApp} from '../firebase-app';
1919
import {AppErrorCodes, FirebaseAppError} from './error';
2020

21+
import {OutgoingHttpHeaders} from 'http';
2122
import https = require('https');
2223

2324
/** Http method type definition. */
@@ -57,12 +58,12 @@ export class HttpRequestHandler {
5758
return Promise.reject(e);
5859
}
5960
}
60-
const options = {
61+
const options: https.RequestOptions = {
6162
method: httpMethod,
6263
host,
6364
port,
6465
path,
65-
headers,
66+
headers: headers as OutgoingHttpHeaders,
6667
};
6768
// Only https endpoints.
6869
return new Promise((resolve, reject) => {

test/unit/auth/auth.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ function getValidUserRecord(serverResponse: any) {
100100
describe('Auth', () => {
101101
let auth: Auth;
102102
let mockApp: FirebaseApp;
103-
let oldProcessEnv: Object;
103+
let oldProcessEnv: NodeJS.ProcessEnv;
104104
let nullAccessTokenAuth: Auth;
105105
let malformedAccessTokenAuth: Auth;
106106
let rejectedPromiseAccessTokenAuth: Auth;

test/unit/auth/credential.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ const ONE_HOUR_IN_SECONDS = 60 * 60;
8484
describe('Credential', () => {
8585
let mockedRequests: nock.Scope[] = [];
8686
let mockCertificateObject;
87-
let oldProcessEnv: Object;
87+
let oldProcessEnv: NodeJS.ProcessEnv;
8888

8989
before(() => utils.mockFetchAccessTokenRequests());
9090

test/unit/auth/token-generator.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ describe('FirebaseTokenGenerator', () => {
351351

352352
return tokenGenerator.createCustomToken(mocks.uid)
353353
.then(token => {
354-
const decoded = jwt.decode(token, {
354+
const decoded: any = jwt.decode(token, {
355355
complete: true,
356356
});
357357

test/unit/messaging/messaging.spec.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1564,7 +1564,12 @@ describe('Messaging', () => {
15641564
});
15651565
});
15661566

1567-
const whitelistedOptionsKeys = {
1567+
const whitelistedOptionsKeys: {
1568+
[name: string]: {
1569+
type: string,
1570+
underscoreCasedKey?: string
1571+
}
1572+
} = {
15681573
dryRun: { type: 'boolean', underscoreCasedKey: 'dry_run' },
15691574
priority: { type: 'string' },
15701575
timeToLive: { type: 'number', underscoreCasedKey: 'time_to_live' },
@@ -1574,7 +1579,7 @@ describe('Messaging', () => {
15741579
restrictedPackageName: { type: 'string', underscoreCasedKey: 'restricted_package_name' },
15751580
};
15761581

1577-
_.forEach(whitelistedOptionsKeys as any, ({ type, underscoreCasedKey }, camelCasedKey) => {
1582+
_.forEach(whitelistedOptionsKeys, ({ type, underscoreCasedKey }, camelCasedKey) => {
15781583
let validValue;
15791584
let invalidValues;
15801585
if (type === 'string') {

0 commit comments

Comments
 (0)