firebase-admin 4.1.2 → 4.2.1

package/lib/default-namespace.js

@@ -1,4 +1,4 @@
-/*! firebase-admin v4.1.2
+/*! firebase-admin v4.2.1
     https://firebase.google.com/terms/ */
 "use strict";
 var firebase_namespace_1 = require("./firebase-namespace");

package/lib/firebase-app.js

@@ -1,15 +1,18 @@
-/*! firebase-admin v4.1.2
+/*! firebase-admin v4.2.1
     https://firebase.google.com/terms/ */
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+var validator = require("./utils/validator");
 var deep_copy_1 = require("./utils/deep-copy");
 var credential_1 = require("./auth/credential");
+var error_1 = require("./utils/error");
 /**
  * Internals of a FirebaseApp instance.
  */
 var FirebaseAppInternals = (function () {
     function FirebaseAppInternals(credential_) {
         this.credential_ = credential_;
+        this.isDeleted_ = false;
         this.tokenListeners_ = [];
     }
     /**
@@ -22,23 +25,37 @@ var FirebaseAppInternals = (function () {
         var _this = this;
         var expired = this.cachedToken_ && this.cachedToken_.expirationTime < Date.now();
         if (this.cachedTokenPromise_ && !forceRefresh && !expired) {
-            return this.cachedTokenPromise_;
+            return this.cachedTokenPromise_
+                .catch(function (error) {
+                // Update the cached token promise to avoid caching errors. Set it to resolve with the
+                // cached token if we have one (and return that promise since the token has still not
+                // expired).
+                if (_this.cachedToken_) {
+                    _this.cachedTokenPromise_ = Promise.resolve(_this.cachedToken_);
+                    return _this.cachedTokenPromise_;
+                }
+                // Otherwise, set the cached token promise to null so that it will force a refresh next
+                // time getToken() is called.
+                _this.cachedTokenPromise_ = null;
+                // And re-throw the caught error.
+                throw error;
+            });
         }
         else {
+            // Clear the outstanding token refresh timeout. This is a noop if the timeout is undefined.
+            clearTimeout(this.tokenRefreshTimeout_);
             // this.credential_ may be an external class; resolving it in a promise helps us
             // protect against exceptions and upgrades the result to a promise in all cases.
             this.cachedTokenPromise_ = Promise.resolve(this.credential_.getAccessToken())
                 .then(function (result) {
-                if (result === null) {
-                    return null;
-                }
                 // Since the developer can provide the credential implementation, we want to weakly verify
                 // the return type until the type is properly exported.
-                if (typeof result !== 'object' ||
+                if (!validator.isNonNullObject(result) ||
                     typeof result.expires_in !== 'number' ||
                     typeof result.access_token !== 'string') {
-                    throw new Error("Invalid access token generated: " + JSON.stringify(result) + ". Valid access tokens must " +
-                        'be an object with the "expires_in" (number) and "access_token" (string) properties.');
+                    throw new error_1.FirebaseAppError(error_1.AppErrorCodes.INVALID_CREDENTIAL, "Invalid access token generated: \"" + JSON.stringify(result) + "\". Valid access " +
+                        'tokens must be an object with the "expires_in" (number) and "access_token" ' +
+                        '(string) properties.');
                 }
                 var token = {
                     accessToken: result.access_token,
@@ -52,21 +69,33 @@ var FirebaseAppInternals = (function () {
                         listener(token.accessToken);
                     });
                 }
+                // Establish a timeout to proactively refresh the token every minute starting at five
+                // minutes before it expires. Once a token refresh succeeds, no further retries are
+                // needed; if it fails, retry every minute until the token expires (resulting in a total
+                // of four retries: at 4, 3, 2, and 1 minutes).
+                var refreshTimeInSeconds = (result.expires_in - (5 * 60));
+                var numRetries = 4;
+                // In the rare cases the token is short-lived (that is, it expires in less than five
+                // minutes from when it was fetched), establish the timeout to refresh it after the
+                // current minute ends and update the number of retries that should be attempted before
+                // the token expires.
+                if (refreshTimeInSeconds <= 0) {
+                    refreshTimeInSeconds = result.expires_in % 60;
+                    numRetries = Math.floor(result.expires_in / 60) - 1;
+                }
+                // The token refresh timeout keeps the Node.js process alive, so only create it if this
+                // instance has not already been deleted.
+                if (numRetries && !_this.isDeleted_) {
+                    _this.setTokenRefreshTimeout(refreshTimeInSeconds * 1000, numRetries);
+                }
                 return token;
             })
                 .catch(function (error) {
-                // Update the cached token promise to avoid caching errors. Set it to resolve with the
-                // cached token if we have one; otherwise, set it to null.
-                if (_this.cachedToken_) {
-                    _this.cachedTokenPromise_ = Promise.resolve(_this.cachedToken_);
-                }
-                else {
-                    _this.cachedTokenPromise_ = null;
-                }
-                var errorMessage = 'Credential implementation provided to initializeApp() via the ' +
+                var errorMessage = (typeof error === 'string') ? error : error.message;
+                errorMessage = 'Credential implementation provided to initializeApp() via the ' +
                     '"credential" property failed to fetch a valid Google OAuth2 access token with the ' +
-                    ("following error: \"" + error.message + "\".");
-                if (error.message.indexOf('invalid_grant') !== -1) {
+                    ("following error: \"" + errorMessage + "\".");
+                if (errorMessage.indexOf('invalid_grant') !== -1) {
                     errorMessage += ' There are two likely causes: (1) your server time is not properly ' +
                         'synced or (2) your certificate key file has been revoked. To solve (1), re-sync the ' +
                         'time on your server. To solve (2), make sure the key ID for your key file is still ' +
@@ -74,7 +103,7 @@ var FirebaseAppInternals = (function () {
                         'not, generate a new key file at ' +
                         'https://console.firebase.google.com/project/_/settings/serviceaccounts/adminsdk.';
                 }
-                throw new Error(errorMessage);
+                throw new error_1.FirebaseAppError(error_1.AppErrorCodes.INVALID_CREDENTIAL, errorMessage);
             });
             return this.cachedTokenPromise_;
         }
@@ -98,6 +127,35 @@ var FirebaseAppInternals = (function () {
     FirebaseAppInternals.prototype.removeAuthTokenListener = function (listener) {
         this.tokenListeners_ = this.tokenListeners_.filter(function (other) { return other !== listener; });
     };
+    /**
+     * Deletes the FirebaseAppInternals instance.
+     */
+    FirebaseAppInternals.prototype.delete = function () {
+        this.isDeleted_ = true;
+        // Clear the token refresh timeout so it doesn't keep the Node.js process alive.
+        clearTimeout(this.tokenRefreshTimeout_);
+    };
+    /**
+     * Establishes timeout to refresh the Google OAuth2 access token used by the SDK.
+     *
+     * @param {number} delayInMilliseconds The delay to use for the timeout.
+     * @param {number} numRetries The number of times to retry fetching a new token if the prior fetch
+     *   failed.
+     */
+    FirebaseAppInternals.prototype.setTokenRefreshTimeout = function (delayInMilliseconds, numRetries) {
+        var _this = this;
+        this.tokenRefreshTimeout_ = setTimeout(function () {
+            _this.getToken(/* forceRefresh */ true)
+                .catch(function (error) {
+                // Ignore the error since this might just be an intermittent failure. If we really cannot
+                // refresh the token, an error will be logged once the existing token expires and we try
+                // to fetch a fresh one.
+                if (numRetries > 0) {
+                    _this.setTokenRefreshTimeout(60 * 1000, numRetries - 1);
+                }
+            });
+        }, delayInMilliseconds);
+    };
     return FirebaseAppInternals;
 }());
 exports.FirebaseAppInternals = FirebaseAppInternals;
@@ -142,7 +200,7 @@ var FirebaseApp = (function () {
             }
         }
         if (typeof errorMessage !== 'undefined') {
-            throw new Error("Invalid Firebase app options passed as the first argument to initializeApp() for the " +
+            throw new error_1.FirebaseAppError(error_1.AppErrorCodes.INVALID_APP_OPTIONS, "Invalid Firebase app options passed as the first argument to initializeApp() for the " +
                 ("app named \"" + this.name_ + "\". " + errorMessage));
         }
         // TODO(jwenger): NEXT MAJOR RELEASE - remove "serviceAccount" property deprecation warning and
@@ -160,24 +218,6 @@ var FirebaseApp = (function () {
             _this[serviceName] = _this.getService_.bind(_this, serviceName);
         });
         this.INTERNAL = new FirebaseAppInternals(this.options_.credential);
-        // Asynchronously ensure the provided credential can generate OAuth access tokens. We explicitly
-        // call this here to provide the developer with an error as soon as possible and so that each
-        // individual service doesn't have to worry about logging this class of error. Because getToken()
-        // caches tokens, there is no real performance penalty for calling this here.
-        // b/35366344: We only do this if the credential has a non-null certificate to ensure we do not
-        // do this check for things like Application Default Credentials on Cloud Functions, which
-        // often results in ECONNTIMEOUT errors.
-        if (typeof this.options_.credential.getCertificate === 'function') {
-            var certificate = this.options_.credential.getCertificate();
-            if (certificate) {
-                this.INTERNAL.getToken()
-                    .catch(function (error) {
-                    /* tslint:disable:no-console */
-                    console.error(error);
-                    /* tslint:enable:no-console */
-                });
-            }
-        }
     }
     /**
      * Firebase services available off of a FirebaseApp instance. These are monkey-patched via
@@ -186,15 +226,15 @@ var FirebaseApp = (function () {
      */
     /* istanbul ignore next */
     FirebaseApp.prototype.auth = function () {
-        throw new Error('INTERNAL ASSERT FAILED: Firebase auth() service has not been registered.');
+        throw new error_1.FirebaseAppError(error_1.AppErrorCodes.INTERNAL_ERROR, 'INTERNAL ASSERT FAILED: Firebase auth() service has not been registered.');
     };
     /* istanbul ignore next */
     FirebaseApp.prototype.database = function () {
-        throw new Error('INTERNAL ASSERT FAILED: Firebase database() service has not been registered.');
+        throw new error_1.FirebaseAppError(error_1.AppErrorCodes.INTERNAL_ERROR, 'INTERNAL ASSERT FAILED: Firebase database() service has not been registered.');
     };
     /* istanbul ignore next */
     FirebaseApp.prototype.messaging = function () {
-        throw new Error('INTERNAL ASSERT FAILED: Firebase messaging() service has not been registered.');
+        throw new error_1.FirebaseAppError(error_1.AppErrorCodes.INTERNAL_ERROR, 'INTERNAL ASSERT FAILED: Firebase messaging() service has not been registered.');
     };
     Object.defineProperty(FirebaseApp.prototype, "name", {
         /**
@@ -231,6 +271,7 @@ var FirebaseApp = (function () {
         var _this = this;
         this.checkDestroyed_();
         this.firebaseInternals_.removeApp(this.name_);
+        this.INTERNAL.delete();
         return Promise.all(Object.keys(this.services_).map(function (serviceName) {
             return _this.services_[serviceName].INTERNAL.delete();
         })).then(function () {
@@ -263,7 +304,7 @@ var FirebaseApp = (function () {
      */
     FirebaseApp.prototype.checkDestroyed_ = function () {
         if (this.isDeleted_) {
-            throw new Error("Firebase app named \"" + this.name_ + "\" has already been deleted.");
+            throw new error_1.FirebaseAppError(error_1.AppErrorCodes.APP_DELETED, "Firebase app named \"" + this.name_ + "\" has already been deleted.");
         }
     };
     return FirebaseApp;

package/lib/firebase-namespace.js

@@ -1,8 +1,9 @@
-/*! firebase-admin v4.1.2
+/*! firebase-admin v4.2.1
     https://firebase.google.com/terms/ */
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var deep_copy_1 = require("./utils/deep-copy");
+var error_1 = require("./utils/error");
 var firebase_app_1 = require("./firebase-app");
 var credential_1 = require("./auth/credential");
 var DEFAULT_APP_NAME = '[DEFAULT]';
@@ -30,18 +31,18 @@ var FirebaseNamespaceInternals = (function () {
     FirebaseNamespaceInternals.prototype.initializeApp = function (options, appName) {
         if (appName === void 0) { appName = DEFAULT_APP_NAME; }
         if (typeof appName !== 'string' || appName === '') {
-            throw new Error("Illegal Firebase app name \"" + appName + "\" provided. App name must be a non-empty string.");
+            throw new error_1.FirebaseAppError(error_1.AppErrorCodes.INVALID_APP_NAME, "Invalid Firebase app name \"" + appName + "\" provided. App name must be a non-empty string.");
         }
         else if (appName in this.apps_) {
             if (appName === DEFAULT_APP_NAME) {
-                throw new Error('The default Firebase app already exists. This means you called initializeApp() ' +
+                throw new error_1.FirebaseAppError(error_1.AppErrorCodes.DUPLICATE_APP, 'The default Firebase app already exists. This means you called initializeApp() ' +
                     'more than once without providing an app name as the second argument. In most cases ' +
                     'you only need to call initializeApp() once. But if you do want to initialize ' +
                     'multiple apps, pass a second argument to initializeApp() to give each app a unique ' +
                     'name.');
             }
             else {
-                throw new Error("Firebase app named \"" + appName + "\" already exists. This means you called initializeApp() " +
+                throw new error_1.FirebaseAppError(error_1.AppErrorCodes.DUPLICATE_APP, "Firebase app named \"" + appName + "\" already exists. This means you called initializeApp() " +
                     'more than once with the same app name as the second argument. Make sure you provide a ' +
                     'unique name every time you call initializeApp().');
             }
@@ -61,7 +62,7 @@ var FirebaseNamespaceInternals = (function () {
     FirebaseNamespaceInternals.prototype.app = function (appName) {
         if (appName === void 0) { appName = DEFAULT_APP_NAME; }
         if (typeof appName !== 'string' || appName === '') {
-            throw new Error("Illegal Firebase app name \"" + appName + "\" provided. App name must be a non-empty string.");
+            throw new error_1.FirebaseAppError(error_1.AppErrorCodes.INVALID_APP_NAME, "Invalid Firebase app name \"" + appName + "\" provided. App name must be a non-empty string.");
         }
         else if (!(appName in this.apps_)) {
             var errorMessage = void 0;
@@ -72,7 +73,7 @@ var FirebaseNamespaceInternals = (function () {
                 errorMessage = "Firebase app named \"" + appName + "\" does not exist. ";
             }
             errorMessage += 'Make sure you call initializeApp() before using any of the Firebase services.';
-            throw new Error(errorMessage);
+            throw new error_1.FirebaseAppError(error_1.AppErrorCodes.NO_APP, errorMessage);
         }
         return this.apps_[appName];
     };
@@ -97,7 +98,7 @@ var FirebaseNamespaceInternals = (function () {
      */
     FirebaseNamespaceInternals.prototype.removeApp = function (appName) {
         if (typeof appName === 'undefined') {
-            throw new Error("No Firebase app name provided. App name must be a non-empty string.");
+            throw new error_1.FirebaseAppError(error_1.AppErrorCodes.INVALID_APP_NAME, "No Firebase app name provided. App name must be a non-empty string.");
         }
         var appToRemove = this.app(appName);
         this.callAppHooks_(appToRemove, 'delete');
@@ -114,14 +115,18 @@ var FirebaseNamespaceInternals = (function () {
      */
     FirebaseNamespaceInternals.prototype.registerService = function (serviceName, createService, serviceProperties, appHook) {
         var _this = this;
+        var errorMessage;
         if (typeof serviceName === 'undefined') {
-            throw new Error("No service name provided. Service name must be a non-empty string.");
+            errorMessage = "No service name provided. Service name must be a non-empty string.";
         }
         else if (typeof serviceName !== 'string' || serviceName === '') {
-            throw new Error("Illegal service name \"" + serviceName + "\" provided. Service name must be a non-empty string.");
+            errorMessage = "Invalid service name \"" + serviceName + "\" provided. Service name must be a non-empty string.";
         }
         else if (serviceName in this.serviceFactories) {
-            throw new Error("Firebase service named \"" + serviceName + "\" has already been registered.");
+            errorMessage = "Firebase service named \"" + serviceName + "\" has already been registered.";
+        }
+        if (typeof errorMessage !== 'undefined') {
+            throw new error_1.FirebaseAppError(error_1.AppErrorCodes.INTERNAL_ERROR, "INTERNAL ASSERT FAILED: " + errorMessage);
         }
         this.serviceFactories[serviceName] = createService;
         if (appHook) {
@@ -196,7 +201,7 @@ var FirebaseNamespace = (function () {
         this.__esModule = true;
         /* tslint:enable:variable-name */
         this.credential = firebaseCredential;
-        this.SDK_VERSION = '4.1.2';
+        this.SDK_VERSION = '4.2.1';
         /* tslint:disable */
         // TODO(jwenger): Database is the only consumer of firebase.Promise. We should update it to use
         // use the native Promise and then remove this.
@@ -210,15 +215,15 @@ var FirebaseNamespace = (function () {
      */
     /* istanbul ignore next */
     FirebaseNamespace.prototype.auth = function () {
-        throw new Error('INTERNAL ASSERT FAILED: Firebase auth() service has not been registered.');
+        throw new error_1.FirebaseAppError(error_1.AppErrorCodes.INTERNAL_ERROR, 'INTERNAL ASSERT FAILED: Firebase auth() service has not been registered.');
     };
     /* istanbul ignore next */
     FirebaseNamespace.prototype.database = function () {
-        throw new Error('INTERNAL ASSERT FAILED: Firebase database() service has not been registered.');
+        throw new error_1.FirebaseAppError(error_1.AppErrorCodes.INTERNAL_ERROR, 'INTERNAL ASSERT FAILED: Firebase database() service has not been registered.');
     };
     /* istanbul ignore next */
     FirebaseNamespace.prototype.messaging = function () {
-        throw new Error('INTERNAL ASSERT FAILED: Firebase messaging() service has not been registered.');
+        throw new error_1.FirebaseAppError(error_1.AppErrorCodes.INTERNAL_ERROR, 'INTERNAL ASSERT FAILED: Firebase messaging() service has not been registered.');
     };
     /**
      * Initializes the FirebaseApp instance.

package/lib/firebase-service.js

@@ -1,4 +1,4 @@
-/*! firebase-admin v4.1.2
+/*! firebase-admin v4.2.1
     https://firebase.google.com/terms/ */
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-/*! firebase-admin v4.1.2
+/*! firebase-admin v4.2.1
     https://firebase.google.com/terms/ */
 declare namespace admin {
   interface FirebaseError {
@@ -9,21 +9,9 @@ declare namespace admin {
     toJSON(): Object;
   }
 
-  class Promise<T> extends Promise_Instance<T> {
-    static all(values: admin.Promise<any>[]): admin.Promise<any[]>;
-    static reject(error: Error): admin.Promise<any>;
-    static resolve<T>(value?: T): admin.Promise<T>;
-  }
-
-  class Promise_Instance<T> implements admin.Thenable<any> {
-    constructor(resolver: (a?: (a: T) => undefined, b?: (a: Error) => undefined) => any);
-    catch(onReject?: (a: Error) => any): admin.Thenable<any>;
-    then(onResolve?: (a: T) => any, onReject?: (a: Error) => any): admin.Promise<any>;
-  }
-
-  interface Thenable<T> {
-    catch(onReject?: (a: Error) => any): admin.Thenable<any>;
-    then(onResolve?: (a: T) => any, onReject?: (a: Error) => any): admin.Thenable<any>;
+  type FirebaseArrayIndexError = {
+    index: number;
+    error: FirebaseError;
   }
 
   interface ServiceAccount {
@@ -63,7 +51,7 @@ declare namespace admin.app {
     auth(): admin.auth.Auth;
     database(): admin.database.Database;
     messaging(): admin.messaging.Messaging;
-    delete(): admin.Promise<undefined>;
+    delete(): Promise<void>;
   }
 }
 
@@ -99,27 +87,39 @@ declare namespace admin.auth {
   }
 
   interface DecodedIdToken {
-    uid: string;
+    aud: string;
+    auth_time: number;
+    exp: number;
+    firebase: {
+      identities: {
+        [key: string]: any;
+      };
+      sign_in_provider: string;
+      [key: string]: any;
+    };
+    iat: number;
+    iss: string;
     sub: string;
-    [other: string]: any;
+    uid: string;
+    [key: string]: any;
   }
 
   interface Auth {
     app: admin.app.App;
 
-    createCustomToken(uid: string, developerClaims?: Object): admin.Promise<string>;
-    createUser(properties: Object): admin.Promise<admin.auth.UserRecord>;
-    deleteUser(uid: string): admin.Promise<undefined>;
-    getUser(uid: string): admin.Promise<admin.auth.UserRecord>;
-    getUserByEmail(email: string): admin.Promise<admin.auth.UserRecord>;
-    updateUser(uid: string, properties: Object): admin.Promise<admin.auth.UserRecord>;
-    verifyIdToken(idToken: string): admin.Promise<DecodedIdToken>;
+    createCustomToken(uid: string, developerClaims?: Object): Promise<string>;
+    createUser(properties: Object): Promise<admin.auth.UserRecord>;
+    deleteUser(uid: string): Promise<void>;
+    getUser(uid: string): Promise<admin.auth.UserRecord>;
+    getUserByEmail(email: string): Promise<admin.auth.UserRecord>;
+    updateUser(uid: string, properties: Object): Promise<admin.auth.UserRecord>;
+    verifyIdToken(idToken: string): Promise<admin.auth.DecodedIdToken>;
   }
 }
 
 declare namespace admin.credential {
   interface Credential {
-    getAccessToken(): admin.Promise<admin.GoogleOAuthAccessToken>;
+    getAccessToken(): Promise<admin.GoogleOAuthAccessToken>;
   }
 
   function applicationDefault(): admin.credential.Credential;
@@ -131,8 +131,8 @@ declare namespace admin.database {
   interface Database {
     app: admin.app.App;
 
-    goOffline(): undefined;
-    goOnline(): undefined;
+    goOffline(): void;
+    goOnline(): void;
     ref(path?: string): admin.database.Reference;
     refFromURL(url: string): admin.database.Reference;
   }
@@ -154,17 +154,18 @@ declare namespace admin.database {
   }
 
   interface OnDisconnect {
-    cancel(onComplete?: (a: Error|null) => any): admin.Promise<undefined>;
-    remove(onComplete?: (a: Error|null) => any): admin.Promise<undefined>;
-    set(value: any, onComplete?: (a: Error|null) => any): admin.Promise<undefined>;
+    cancel(onComplete?: (a: Error|null) => any): Promise<void>;
+    remove(onComplete?: (a: Error|null) => any): Promise<void>;
+    set(value: any, onComplete?: (a: Error|null) => any): Promise<void>;
     setWithPriority(
       value: any,
       priority: number|string|null,
       onComplete?: (a: Error|null) => any
-    ): admin.Promise<undefined>;
-    update(values: Object, onComplete?: (a: Error|null) => any): admin.Promise<undefined>;
+    ): Promise<void>;
+    update(values: Object, onComplete?: (a: Error|null) => any): Promise<void>;
   }
 
+  type EventType = 'value' | 'child_added' | 'child_changed' | 'child_moved' | 'child_removed';
   interface Query {
     ref: admin.database.Reference;
 
@@ -174,22 +175,22 @@ declare namespace admin.database {
     limitToFirst(limit: number): admin.database.Query;
     limitToLast(limit: number): admin.database.Query;
     off(
-      eventType?: string,
+      eventType?: admin.database.EventType,
       callback?: (a: admin.database.DataSnapshot, b?: string|null) => any,
       context?: Object|null
-    ): undefined;
+    ): void;
     on(
-      eventType: string,
+      eventType: admin.database.EventType,
       callback: (a: admin.database.DataSnapshot|null, b?: string) => any,
       cancelCallbackOrContext?: Object|null,
       context?: Object|null
     ): (a: admin.database.DataSnapshot|null, b?: string) => any;
     once(
-      eventType: string,
+      eventType: admin.database.EventType,
       successCallback?: (a: admin.database.DataSnapshot, b?: string) => any,
       failureCallbackOrContext?: Object|null,
       context?: Object|null
-    ): admin.Promise<any>;
+    ): Promise<any>;
     orderByChild(path: string): admin.database.Query;
     orderByKey(): admin.database.Query;
     orderByPriority(): admin.database.Query;
@@ -207,28 +208,28 @@ declare namespace admin.database {
     child(path: string): admin.database.Reference;
     onDisconnect(): admin.database.OnDisconnect;
     push(value?: any, onComplete?: (a: Error|null) => any): admin.database.ThenableReference;
-    remove(onComplete?: (a: Error|null) => any): admin.Promise<undefined>;
-    set(value: any, onComplete?: (a: Error|null) => any): admin.Promise<undefined>;
+    remove(onComplete?: (a: Error|null) => any): Promise<void>;
+    set(value: any, onComplete?: (a: Error|null) => any): Promise<void>;
     setPriority(
       priority: string|number|null,
       onComplete: (a: Error|null) => any
-    ): admin.Promise<undefined>;
+    ): Promise<void>;
     setWithPriority(
       newVal: any, newPriority: string|number|null,
       onComplete?: (a: Error|null) => any
-    ): admin.Promise<undefined>;
+    ): Promise<void>;
     transaction(
       transactionUpdate: (a: any) => any,
       onComplete?: (a: Error|null, b: boolean, c: admin.database.DataSnapshot|null) => any,
       applyLocally?: boolean
-    ): admin.Promise<{
+    ): Promise<{
       committed: boolean,
       snapshot: admin.database.DataSnapshot|null
     }>;
-    update(values: Object, onComplete?: (a: Error|null) => any): admin.Promise<undefined>;
+    update(values: Object, onComplete?: (a: Error|null) => any): Promise<void>;
   }
 
-  interface ThenableReference extends admin.database.Reference, admin.Thenable<any> {}
+  interface ThenableReference extends admin.database.Reference, Promise<any> {}
 
   function enableLogging(logger?: boolean|((message: string) => any), persistent?: boolean): any;
 }
@@ -255,7 +256,7 @@ declare namespace admin.messaging {
     clickAction?: string;
     titleLocKey?: string;
     titleLocArgs?: string;
-    [other: string]: string;
+    [key: string]: string | undefined;
   };
 
   type MessagingPayload = {
@@ -271,7 +272,7 @@ declare namespace admin.messaging {
     mutableContent?: boolean;
     contentAvailable?: boolean;
     restrictedPackageName?: string;
-    [other: string]: any;
+    [key: string]: any | undefined;
   };
 
   type MessagingDeviceResult = {
@@ -302,6 +303,12 @@ declare namespace admin.messaging {
     messageId: number;
   };
 
+  type MessagingTopicManagementResponse = {
+    failureCount: number;
+    successCount: number;
+    errors: admin.FirebaseArrayIndexError[];
+  };
+
   interface Messaging {
     app: admin.app.App;
 
@@ -309,27 +316,43 @@ declare namespace admin.messaging {
       registrationToken: string,
       payload: admin.messaging.MessagingPayload,
       options?: admin.messaging.MessagingOptions
-    ): admin.Promise<admin.messaging.MessagingDevicesResponse>;
+    ): Promise<admin.messaging.MessagingDevicesResponse>;
     sendToDevice(
       registrationTokens: string[],
       payload: admin.messaging.MessagingPayload,
       options?: admin.messaging.MessagingOptions
-    ): admin.Promise<admin.messaging.MessagingDevicesResponse>;
+    ): Promise<admin.messaging.MessagingDevicesResponse>;
     sendToDeviceGroup(
       notificationKey: string,
       payload: admin.messaging.MessagingPayload,
       options?: admin.messaging.MessagingOptions
-    ): admin.Promise<admin.messaging.MessagingDeviceGroupResponse>;
+    ): Promise<admin.messaging.MessagingDeviceGroupResponse>;
     sendToTopic(
       topic: string,
       payload: admin.messaging.MessagingPayload,
       options?: admin.messaging.MessagingOptions
-    ): admin.Promise<admin.messaging.MessagingTopicResponse>;
+    ): Promise<admin.messaging.MessagingTopicResponse>;
     sendToCondition(
       condition: string,
       payload: admin.messaging.MessagingPayload,
       options?: admin.messaging.MessagingOptions
-    ): admin.Promise<admin.messaging.MessagingConditionResponse>;
+    ): Promise<admin.messaging.MessagingConditionResponse>;
+    subscribeToTopic(
+      registrationToken: string,
+      topic: string
+    ): Promise<admin.messaging.MessagingTopicManagementResponse>;
+    subscribeToTopic(
+      registrationTokens: string[],
+      topic: string
+    ): Promise<admin.messaging.MessagingTopicManagementResponse>;
+    unsubscribeFromTopic(
+      registrationToken: string,
+      topic: string
+    ): Promise<admin.messaging.MessagingTopicManagementResponse>;
+    unsubscribeFromTopic(
+      registrationTokens: string[],
+      topic: string
+    ): Promise<admin.messaging.MessagingTopicManagementResponse>;
   }
 }
 

package/lib/index.js

@@ -1,4 +1,4 @@
-/*! firebase-admin v4.1.2
+/*! firebase-admin v4.2.1
     https://firebase.google.com/terms/ */
 "use strict";
 var firebase = require("./default-namespace");