firebase-admin 4.1.2 → 4.2.1

package/README.md

@@ -69,4 +69,3 @@ and for their longtime use and support of the Firebase platform.
 
 The Firebase Admin Node.js SDK is covered by the
 [Terms of Service for Firebase Services](https://firebase.google.com/terms/).
-

package/lib/auth/auth-api-request.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 });
@@ -16,7 +16,7 @@ var FIREBASE_AUTH_PATH = '/identitytoolkit/v3/relyingparty/';
 /** Firebase Auth request header. */
 var FIREBASE_AUTH_HEADER = {
     'Content-Type': 'application/json',
-    'X-Client-Version': 'Node/Admin/4.1.2',
+    'X-Client-Version': 'Node/Admin/4.2.1',
 };
 /** Firebase Auth request timeout duration in milliseconds. */
 var FIREBASE_AUTH_TIMEOUT = 10000;

package/lib/auth/auth.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/auth/credential.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 });
@@ -9,6 +9,7 @@ var os = require("os");
 var http = require("http");
 var path = require("path");
 var https = require("https");
+var error_1 = require("../utils/error");
 var GOOGLE_TOKEN_AUDIENCE = 'https://accounts.google.com/o/oauth2/token';
 var GOOGLE_AUTH_TOKEN_HOST = 'accounts.google.com';
 var GOOGLE_AUTH_TOKEN_PATH = '/o/oauth2/token';
@@ -44,17 +45,21 @@ var RefreshToken = (function () {
         copyAttr(this, json, 'clientSecret', 'client_secret');
         copyAttr(this, json, 'refreshToken', 'refresh_token');
         copyAttr(this, json, 'type', 'type');
+        var errorMessage;
         if (typeof this.clientId !== 'string' || !this.clientId) {
-            throw new Error('Refresh token must contain a "client_id" property');
+            errorMessage = 'Refresh token must contain a "client_id" property.';
         }
         else if (typeof this.clientSecret !== 'string' || !this.clientSecret) {
-            throw new Error('Refresh token must contain a "client_secret" property');
+            errorMessage = 'Refresh token must contain a "client_secret" property.';
         }
         else if (typeof this.refreshToken !== 'string' || !this.refreshToken) {
-            throw new Error('Refresh token must contain a "refresh_token" property');
+            errorMessage = 'Refresh token must contain a "refresh_token" property.';
         }
         else if (typeof this.type !== 'string' || !this.type) {
-            throw new Error('Refresh token must contain a "type" property');
+            errorMessage = 'Refresh token must contain a "type" property.';
+        }
+        if (typeof errorMessage !== 'undefined') {
+            throw new error_1.FirebaseAppError(error_1.AppErrorCodes.INVALID_CREDENTIAL, errorMessage);
         }
     }
     /*
@@ -75,7 +80,7 @@ var RefreshToken = (function () {
         }
         catch (error) {
             // Throw a nicely formed error message if the file contents cannot be parsed
-            throw new Error('Failed to parse refresh token file: ' + error);
+            throw new error_1.FirebaseAppError(error_1.AppErrorCodes.INVALID_CREDENTIAL, 'Failed to parse refresh token file: ' + error);
         }
     };
     return RefreshToken;
@@ -87,29 +92,33 @@ exports.RefreshToken = RefreshToken;
 var Certificate = (function () {
     function Certificate(json) {
         if (typeof json !== 'object' || json === null) {
-            throw new Error('Certificate object must be an object.');
+            throw new error_1.FirebaseAppError(error_1.AppErrorCodes.INVALID_CREDENTIAL, 'Certificate object must be an object.');
         }
         copyAttr(this, json, 'projectId', 'project_id');
         copyAttr(this, json, 'privateKey', 'private_key');
         copyAttr(this, json, 'clientEmail', 'client_email');
+        var errorMessage;
         if (typeof this.privateKey !== 'string' || !this.privateKey) {
-            throw new Error('Certificate object must contain a string "private_key" property');
+            errorMessage = 'Certificate object must contain a string "private_key" property.';
         }
         else if (typeof this.clientEmail !== 'string' || !this.clientEmail) {
-            throw new Error('Certificate object must contain a string "client_email" property');
+            errorMessage = 'Certificate object must contain a string "client_email" property.';
+        }
+        if (typeof errorMessage !== 'undefined') {
+            throw new error_1.FirebaseAppError(error_1.AppErrorCodes.INVALID_CREDENTIAL, errorMessage);
         }
     }
     Certificate.fromPath = function (path) {
         // Node bug encountered in v6.x. fs.readFileSync hangs when path is a 0 or 1.
         if (typeof path !== 'string') {
-            throw new Error('Failed to parse certificate key file: TypeError: path must be a string');
+            throw new error_1.FirebaseAppError(error_1.AppErrorCodes.INVALID_CREDENTIAL, 'Failed to parse certificate key file: TypeError: path must be a string');
         }
         try {
             return new Certificate(JSON.parse(fs.readFileSync(path, 'utf8')));
         }
         catch (error) {
             // Throw a nicely formed error message if the file contents cannot be parsed
-            throw new Error('Failed to parse certificate key file: ' + error);
+            throw new error_1.FirebaseAppError(error_1.AppErrorCodes.INVALID_CREDENTIAL, 'Failed to parse certificate key file: ' + error);
         }
     };
     return Certificate;
@@ -128,21 +137,21 @@ function requestAccessToken(transit, options, data) {
                 try {
                     var json = JSON.parse(Buffer.concat(buffers).toString());
                     if (json.error) {
-                        var msg = 'Error fetching access token: ' + json.error;
+                        var errorMessage = 'Error fetching access token: ' + json.error;
                         if (json.error_description) {
-                            msg += ' (' + json.error_description + ')';
+                            errorMessage += ' (' + json.error_description + ')';
                         }
-                        reject(new Error(msg));
+                        reject(new error_1.FirebaseAppError(error_1.AppErrorCodes.INVALID_CREDENTIAL, errorMessage));
                     }
                     else if (!json.access_token || !json.expires_in) {
-                        reject(new Error('Unexpected response from server'));
+                        reject(new error_1.FirebaseAppError(error_1.AppErrorCodes.INVALID_CREDENTIAL, "Unexpected response while fetching access token: " + JSON.stringify(json)));
                     }
                     else {
                         resolve(json);
                     }
                 }
                 catch (err) {
-                    reject(err);
+                    reject(new error_1.FirebaseAppError(error_1.AppErrorCodes.INVALID_CREDENTIAL, "Failed to parse access token response: " + err.toString()));
                 }
             });
         });

package/lib/auth/register-auth.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/auth/token-generator.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 });
@@ -152,14 +152,13 @@ var FirebaseTokenGenerator = (function () {
                 verifyIdTokenDocsMessage;
         }
         if (typeof errorMessage !== 'undefined') {
-            return Promise.reject(new Error(errorMessage));
+            return Promise.reject(new error_1.FirebaseAuthError(error_1.AuthClientErrorCode.INVALID_ARGUMENT, errorMessage));
         }
         return this.fetchPublicKeys_().then(function (publicKeys) {
             if (!publicKeys.hasOwnProperty(header.kid)) {
-                errorMessage = 'Firebase ID token has "kid" claim which does not correspond to a known ' +
-                    'public key. Most likely the ID token is expired, so get a fresh token from your client ' +
-                    'app and try again.' + verifyIdTokenDocsMessage;
-                return Promise.reject(new Error(errorMessage));
+                return Promise.reject(new error_1.FirebaseAuthError(error_1.AuthClientErrorCode.INVALID_ARGUMENT, 'Firebase ID token has "kid" claim which does not correspond to a known public key. ' +
+                    'Most likely the ID token is expired, so get a fresh token from your client app and ' +
+                    'try again.' + verifyIdTokenDocsMessage));
             }
             return new Promise(function (resolve, reject) {
                 jwt.verify(idToken, publicKeys[header.kid], {
@@ -173,7 +172,7 @@ var FirebaseTokenGenerator = (function () {
                         else if (error.name === 'JsonWebTokenError') {
                             errorMessage = 'Firebase ID token has invalid signature.' + verifyIdTokenDocsMessage;
                         }
-                        reject(new Error(errorMessage));
+                        return reject(new error_1.FirebaseAuthError(error_1.AuthClientErrorCode.INVALID_ARGUMENT, errorMessage));
                     }
                     else {
                         decodedToken.uid = decodedToken.sub;
@@ -224,7 +223,7 @@ var FirebaseTokenGenerator = (function () {
                             if (response.error_description) {
                                 errorMessage += ' (' + response.error_description + ')';
                             }
-                            reject(new Error(errorMessage));
+                            reject(new error_1.FirebaseAuthError(error_1.AuthClientErrorCode.INTERNAL_ERROR, errorMessage));
                         }
                         else {
                             /* istanbul ignore else */

package/lib/auth/user-record.js

@@ -1,7 +1,8 @@
-/*! firebase-admin v4.1.2
+/*! firebase-admin v4.2.1
     https://firebase.google.com/terms/ */
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+var utils = require("../utils");
 var error_1 = require("../utils/error");
 /**
  * Parses a time stamp string or number and returns the corresponding date if valid.
@@ -35,25 +36,9 @@ var UserMetadata = (function () {
         // were cases in the past where users did not have creation date properly set.
         // This included legacy Firebase migrating project users and some anonymous users.
         // These bugs have already been addressed since then.
-        this.createdAtInternal = parseDate(response.createdAt);
-        this.lastSignedInAtInternal = parseDate(response.lastLoginAt);
+        utils.addReadonlyGetter(this, 'createdAt', parseDate(response.createdAt));
+        utils.addReadonlyGetter(this, 'lastSignedInAt', parseDate(response.lastLoginAt));
     }
-    Object.defineProperty(UserMetadata.prototype, "lastSignedInAt", {
-        /** @return {Date} The user's last sign-in date. */
-        get: function () {
-            return this.lastSignedInAtInternal;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(UserMetadata.prototype, "createdAt", {
-        /** @return {Date} The user's account creation date. */
-        get: function () {
-            return this.createdAtInternal;
-        },
-        enumerable: true,
-        configurable: true
-    });
     /** @return {Object} The plain object representation of the user's metadata. */
     UserMetadata.prototype.toJSON = function () {
         return {
@@ -78,52 +63,12 @@ var UserInfo = (function () {
         if (!response.rawId || !response.providerId) {
             throw new error_1.FirebaseAuthError(error_1.AuthClientErrorCode.INTERNAL_ERROR, 'INTERNAL ASSERT FAILED: Invalid user info response');
         }
-        this.uidInternal = response.rawId;
-        this.displayNameInternal = response.displayName;
-        this.emailInternal = response.email;
-        this.photoURLInternal = response.photoUrl;
-        this.providerIdInternal = response.providerId;
+        utils.addReadonlyGetter(this, 'uid', response.rawId);
+        utils.addReadonlyGetter(this, 'displayName', response.displayName);
+        utils.addReadonlyGetter(this, 'email', response.email);
+        utils.addReadonlyGetter(this, 'photoURL', response.photoUrl);
+        utils.addReadonlyGetter(this, 'providerId', response.providerId);
     }
-    Object.defineProperty(UserInfo.prototype, "uid", {
-        /** @return {string} The provider user id. */
-        get: function () {
-            return this.uidInternal;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(UserInfo.prototype, "displayName", {
-        /** @return {string} The provider display name. */
-        get: function () {
-            return this.displayNameInternal;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(UserInfo.prototype, "email", {
-        /** @return {string} The provider email. */
-        get: function () {
-            return this.emailInternal;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(UserInfo.prototype, "photoURL", {
-        /** @return {string} The provider photo URL. */
-        get: function () {
-            return this.photoURLInternal;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(UserInfo.prototype, "providerId", {
-        /** @return {string} The provider Firebase ID. */
-        get: function () {
-            return this.providerIdInternal;
-        },
-        enumerable: true,
-        configurable: true
-    });
     /** @return {Object} The plain object representation of the current provider data. */
     UserInfo.prototype.toJSON = function () {
         return {
@@ -151,96 +96,33 @@ var UserRecord = (function () {
         if (!response.localId) {
             throw new error_1.FirebaseAuthError(error_1.AuthClientErrorCode.INTERNAL_ERROR, 'INTERNAL ASSERT FAILED: Invalid user response');
         }
-        this.uidInternal = response.localId;
-        this.emailInternal = response.email;
-        this.emailVerifiedInternal = !!response.emailVerified;
-        this.displayNameInternal = response.displayName;
-        this.photoURLInternal = response.photoUrl;
+        utils.addReadonlyGetter(this, 'uid', response.localId);
+        utils.addReadonlyGetter(this, 'email', response.email);
+        utils.addReadonlyGetter(this, 'emailVerified', !!response.emailVerified);
+        utils.addReadonlyGetter(this, 'displayName', response.displayName);
+        utils.addReadonlyGetter(this, 'photoURL', response.photoUrl);
         // If disabled is not provided, the account is enabled by default.
-        this.disabledInternal = response.disabled || false;
-        this.metadataInternal = new UserMetadata(response);
-        var providerData = response.providerUserInfo || [];
-        this.providerDataInternal = [];
-        for (var _i = 0, providerData_1 = providerData; _i < providerData_1.length; _i++) {
-            var entry = providerData_1[_i];
-            this.providerData.push(new UserInfo(entry));
+        utils.addReadonlyGetter(this, 'disabled', response.disabled || false);
+        utils.addReadonlyGetter(this, 'metadata', new UserMetadata(response));
+        var providerData = [];
+        for (var _i = 0, _a = (response.providerUserInfo || []); _i < _a.length; _i++) {
+            var entry = _a[_i];
+            providerData.push(new UserInfo(entry));
         }
+        utils.addReadonlyGetter(this, 'providerData', providerData);
     }
-    Object.defineProperty(UserRecord.prototype, "uid", {
-        /** @return {string} The Firebase user id corresponding to the current user record. */
-        get: function () {
-            return this.uidInternal;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(UserRecord.prototype, "email", {
-        /** @return {string} The primary email corresponding to the current user record. */
-        get: function () {
-            return this.emailInternal;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(UserRecord.prototype, "emailVerified", {
-        /** @return {boolean} Whether the primary email is verified. */
-        get: function () {
-            return this.emailVerifiedInternal;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(UserRecord.prototype, "displayName", {
-        /** @return {string} The display name corresponding to the current user record. */
-        get: function () {
-            return this.displayNameInternal;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(UserRecord.prototype, "photoURL", {
-        /** @return {string} The photo URL corresponding to the current user record. */
-        get: function () {
-            return this.photoURLInternal;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(UserRecord.prototype, "disabled", {
-        /** @return {boolean} Whether the current user is disabled or not. */
-        get: function () {
-            return this.disabledInternal;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(UserRecord.prototype, "metadata", {
-        /** @return {UserMetadata} The user record's metadata. */
-        get: function () {
-            return this.metadataInternal;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(UserRecord.prototype, "providerData", {
-        /** @return {UserInfo[]} The list of providers linked to the current record. */
-        get: function () {
-            return this.providerDataInternal;
-        },
-        enumerable: true,
-        configurable: true
-    });
     /** @return {Object} The plain object representation of the user record. */
     UserRecord.prototype.toJSON = function () {
-        var json = {};
-        json.uid = this.uid;
-        json.email = this.email;
-        json.emailVerified = this.emailVerified;
-        json.displayName = this.displayName;
-        json.photoURL = this.photoURL;
-        json.disabled = this.disabled;
-        // Convert metadata to json.
-        json.metadata = this.metadata.toJSON();
+        var json = {
+            uid: this.uid,
+            email: this.email,
+            emailVerified: this.emailVerified,
+            displayName: this.displayName,
+            photoURL: this.photoURL,
+            disabled: this.disabled,
+            // Convert metadata to json.
+            metadata: this.metadata.toJSON(),
+        };
         json.providerData = [];
         for (var _i = 0, _a = this.providerData; _i < _a.length; _i++) {
             var entry = _a[_i];