Fix merge from master

Author: Greg Soltis

integration/browserify/package.json

@@ -7,7 +7,7 @@
     "test": "karma start --single-run"
   },
   "dependencies": {
-    "firebase": "5.5.1"
+    "firebase": "5.5.2"
   },
   "devDependencies": {
     "@babel/core": "7.0.0-beta.47",

integration/firebase-typings/package.json

@@ -6,7 +6,7 @@
     "test": "tsc index.ts --outDir dist"
   },
   "dependencies": {
-    "firebase": "5.5.1"
+    "firebase": "5.5.2"
   },
   "devDependencies": {
     "typescript": "2.8.1"

integration/messaging/package.json

@@ -8,7 +8,7 @@
     "test:manual": "mocha --exit"
   },
   "dependencies": {
-    "firebase": "5.5.1"
+    "firebase": "5.5.2"
   },
   "devDependencies": {
     "chai": "4.1.2",

integration/typescript/package.json

@@ -6,7 +6,7 @@
     "test": "karma start --single-run"
   },
   "dependencies": {
-    "firebase": "5.5.1"
+    "firebase": "5.5.2"
   },
   "devDependencies": {
     "@babel/core": "7.0.0-beta.47",

integration/webpack/package.json

@@ -7,7 +7,7 @@
     "test": "karma start --single-run"
   },
   "dependencies": {
-    "firebase": "5.5.1"
+    "firebase": "5.5.2"
   },
   "devDependencies": {
     "@babel/core": "7.0.0-beta.47",

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/auth",
-  "version": "0.7.6",
+  "version": "0.7.7",
   "main": "dist/auth.js",
   "module": "dist/auth.esm.js",
   "description": "Javascript library for Firebase Auth SDK",

packages/auth/src/error_auth.js

@@ -174,6 +174,7 @@ fireauth.authenum.Error = {
   QUOTA_EXCEEDED: 'quota-exceeded',
   REDIRECT_CANCELLED_BY_USER: 'redirect-cancelled-by-user',
   REDIRECT_OPERATION_PENDING: 'redirect-operation-pending',
+  REJECTED_CREDENTIAL: 'rejected-credential',
   TIMEOUT: 'timeout',
   TOKEN_EXPIRED: 'user-token-expired',
   TOO_MANY_ATTEMPTS_TRY_LATER: 'too-many-requests',
@@ -368,6 +369,8 @@ fireauth.AuthError.MESSAGES_[
 fireauth.AuthError.MESSAGES_[
     fireauth.authenum.Error.REDIRECT_OPERATION_PENDING] =
     'A redirect sign-in operation is already pending.';
+fireauth.AuthError.MESSAGES_[fireauth.authenum.Error.REJECTED_CREDENTIAL] =
+    'The request contains malformed or mismatching credentials.';
 fireauth.AuthError.MESSAGES_[fireauth.authenum.Error.TIMEOUT] =
     'The operation has timed out.';
 fireauth.AuthError.MESSAGES_[

packages/auth/src/rpchandler.js

@@ -226,6 +226,7 @@ fireauth.RpcHandler.ServerError = {
   PASSWORD_LOGIN_DISABLED: 'PASSWORD_LOGIN_DISABLED',
   QUOTA_EXCEEDED: 'QUOTA_EXCEEDED',
   RESET_PASSWORD_EXCEED_LIMIT: 'RESET_PASSWORD_EXCEED_LIMIT',
+  REJECTED_CREDENTIAL: 'REJECTED_CREDENTIAL',
   SESSION_EXPIRED: 'SESSION_EXPIRED',
   TOKEN_EXPIRED: 'TOKEN_EXPIRED',
   TOO_MANY_ATTEMPTS_TRY_LATER: 'TOO_MANY_ATTEMPTS_TRY_LATER',
@@ -2306,6 +2307,8 @@ fireauth.RpcHandler.getDeveloperError_ =
       fireauth.authenum.Error.QUOTA_EXCEEDED;
   errorMap[fireauth.RpcHandler.ServerError.SESSION_EXPIRED] =
       fireauth.authenum.Error.CODE_EXPIRED;
+  errorMap[fireauth.RpcHandler.ServerError.REJECTED_CREDENTIAL] =
+      fireauth.authenum.Error.REJECTED_CREDENTIAL;
 
   // Other action code errors when additional settings passed.
   errorMap[fireauth.RpcHandler.ServerError.INVALID_CONTINUE_URI] =

packages/auth/test/rpchandler_test.js

@@ -5573,6 +5573,8 @@ function testSendVerificationCode_caughtServerError() {
       fireauth.authenum.Error.MISSING_PHONE_NUMBER;
   errorMap[fireauth.RpcHandler.ServerError.QUOTA_EXCEEDED] =
       fireauth.authenum.Error.QUOTA_EXCEEDED;
+  errorMap[fireauth.RpcHandler.ServerError.REJECTED_CREDENTIAL] =
+      fireauth.authenum.Error.REJECTED_CREDENTIAL;
 
   assertServerErrorsAreHandled(function() {
     return rpcHandler.sendVerificationCode(requestBody);
@@ -5779,6 +5781,8 @@ function testVerifyPhoneNumber_caughtServerError() {
       fireauth.authenum.Error.MISSING_SESSION_INFO;
   errorMap[fireauth.RpcHandler.ServerError.SESSION_EXPIRED] =
       fireauth.authenum.Error.CODE_EXPIRED;
+  errorMap[fireauth.RpcHandler.ServerError.REJECTED_CREDENTIAL] =
+      fireauth.authenum.Error.REJECTED_CREDENTIAL;
 
   assertServerErrorsAreHandled(function() {
     return rpcHandler.verifyPhoneNumber(requestBody);

packages/firebase/index.d.ts

@@ -105,7 +105,7 @@ declare namespace firebase {
 
   function app(name?: string): firebase.app.App;
 
-  var apps: (firebase.app.App | null)[];
+  var apps: firebase.app.App[];
 
   function auth(app?: firebase.app.App): firebase.auth.Auth;
 

packages/firebase/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase",
-  "version": "5.5.1",
+  "version": "5.5.2",
   "description": "Firebase JavaScript library for web and Node.js",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "license": "Apache-2.0",
@@ -36,9 +36,9 @@
   "react-native": "dist/index.rn.cjs.js",
   "dependencies": {
     "@firebase/app": "0.3.4",
-    "@firebase/auth": "0.7.6",
+    "@firebase/auth": "0.7.7",
     "@firebase/database": "0.3.6",
-    "@firebase/firestore": "0.8.1",
+    "@firebase/firestore": "0.8.2",
     "@firebase/functions": "0.3.1",
     "@firebase/messaging": "0.3.6",
     "@firebase/polyfill": "0.3.3",

packages/firestore/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/firestore",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "scripts": {
@@ -27,7 +27,7 @@
   "dependencies": {
     "@firebase/firestore-types": "0.7.0",
     "@firebase/logger": "0.1.1",
-    "@firebase/webchannel-wrapper": "0.2.9",
+    "@firebase/webchannel-wrapper": "0.2.10",
     "grpc": "1.13.1",
     "tslib": "1.9.0"
   },

packages/firestore/src/core/sync_engine.ts

@@ -684,7 +684,7 @@ export class SyncEngine implements RemoteSyncer, SharedClientStateSyncer {
         queryView.targetId
       );
       this.limboDocumentRefs.removeReferencesForId(queryView.targetId);
-      await PersistencePromise.forEach(limboKeys.toArray(), limboKey => {
+      await PersistencePromise.forEach(limboKeys, limboKey => {
         return this.limboDocumentRefs
           .containsKey(null, limboKey)
           .next(isReferenced => {

packages/firestore/src/local/indexeddb_persistence.ts

@@ -19,14 +19,14 @@ import { DatabaseInfo } from '../core/database_info';
 import { ListenSequence, SequenceNumberSyncer } from '../core/listen_sequence';
 import { ListenSequenceNumber, TargetId } from '../core/types';
 import { DocumentKey } from '../model/document_key';
+import { Platform } from '../platform/platform';
 import { JsonProtoSerializer } from '../remote/serializer';
 import { assert, fail } from '../util/assert';
+import { AsyncQueue, TimerId } from '../util/async_queue';
 import { Code, FirestoreError } from '../util/error';
 import * as log from '../util/log';
-
-import { Platform } from '../platform/platform';
-import { AsyncQueue, TimerId } from '../util/async_queue';
 import { CancelablePromise } from '../util/promise';
+
 import { decode, encode, EncodedResourcePath } from './encoded_resource_path';
 import {
   IndexedDbMutationQueue,

packages/firestore/src/local/persistence_promise.ts

@@ -170,49 +170,70 @@ export class PersistencePromise<T> {
 
   static waitFor(
     // tslint:disable-next-line:no-any Accept all Promise types in waitFor().
-    all: Array<PersistencePromise<any>>
+    all: Iterable<PersistencePromise<any>>
   ): PersistencePromise<void> {
-    const expectedCount = all.length;
-    if (expectedCount === 0) {
-      return PersistencePromise.resolve();
-    }
-
-    let resolvedCount = 0;
+    const it = all[Symbol.iterator]();
     return new PersistencePromise<void>((resolve, reject) => {
-      for (const promise of all) {
-        promise.next(
+      let expectedCount = 0;
+      let resolvedCount = 0;
+
+      let result = it.next();
+      while (!result.done) {
+        ++expectedCount;
+        result.value.next(
           () => {
             ++resolvedCount;
-            if (resolvedCount === expectedCount) {
+            if (result.done && resolvedCount === expectedCount) {
               resolve();
             }
           },
           err => reject(err)
         );
+        result = it.next();
+      }
+
+      if (resolvedCount === expectedCount) {
+        resolve();
       }
     });
   }
 
-  static map<R>(all: Array<PersistencePromise<R>>): PersistencePromise<R[]> {
+  static map<R>(all: Iterable<PersistencePromise<R>>): PersistencePromise<R[]> {
     const results: R[] = [];
     const promises: Array<PersistencePromise<void>> = [];
-    for (let i = 0; i < all.length; ++i) {
-      promises[i] = all[i].next(result => {
-        results[i] = result;
-      });
+
+    const it = all[Symbol.iterator]();
+    let result = it.next();
+    let count = 0;
+    while (!result.done) {
+      const value = result.value;
+      const index = count;
+
+      promises.push(
+        value.next(val => {
+          results[index] = val;
+        })
+      );
+
+      result = it.next();
+      ++count;
     }
-    return PersistencePromise.waitFor(promises).next(() => {
-      return results;
-    });
+
+    return PersistencePromise.waitFor(promises).next(() => results);
   }
 
   static forEach<T>(
-    elements: T[],
-    callback: (T) => PersistencePromise<void>
+    all: Iterable<T>,
+    callback: (elem: T) => PersistencePromise<void>
   ): PersistencePromise<void> {
+    const it = all[Symbol.iterator]();
+
     let p = PersistencePromise.resolve();
-    for (const element of elements) {
-      p = p.next(() => callback(element));
+    let result = it.next();
+    while (!result.done) {
+      const value = result.value;
+      p = p.next(() => callback(value));
+      result = it.next();
     }
     return p;
   }

packages/firestore/src/model/document.ts

@@ -141,6 +141,7 @@ export class NoDocument extends MaybeDocument {
   isEqual(other: MaybeDocument | null | undefined): boolean {
     return (
       other instanceof NoDocument &&
+      other.hasCommittedMutations === this.hasCommittedMutations &&
       other.version.isEqual(this.version) &&
       other.key.isEqual(this.key)
     );

packages/firestore/src/util/sorted_map.ts

@@ -168,6 +168,21 @@ export class SortedMap<K, V> {
   getReverseIteratorFrom(key: K): SortedMapIterator<K, V> {
     return new SortedMapIterator<K, V>(this.root, key, this.comparator, true);
   }
+
+  [Symbol.iterator](): Iterator<Entry<K, V>> {
+    const it = this.getIterator();
+    return {
+      next(): IteratorResult<Entry<K, V>> {
+        if (it.hasNext()) {
+          return { done: false, value: it.getNext() };
+        } else {
+          // The TypeScript typings don't allow `undefined` for Iterator<T>,
+          // so we return an empty object instead.
+          return { done: true, value: {} as Entry<K, V> };
+        }
+      }
+    };
+  }
 } // end SortedMap
 
 // An iterator over an LLRBNode.

packages/firestore/src/util/sorted_set.ts

@@ -154,6 +154,21 @@ export class SortedSet<T> {
     return 'SortedSet(' + result.toString() + ')';
   }
 
+  [Symbol.iterator](): Iterator<T> {
+    const it = this.data.getIterator();
+    return {
+      next(): IteratorResult<T> {
+        if (it.hasNext()) {
+          return { done: false, value: it.getNext().key };
+        } else {
+          // The TypeScript typings don't allow `undefined` for Iterator<T>,
+          // so we return an empty object instead.
+          return { done: true, value: {} as T };
+        }
+      }
+    };
+  }
+
   private copy(data: SortedMap<T, boolean>): SortedSet<T> {
     const result = new SortedSet(this.comparator);
     result.data = data;

packages/firestore/test/integration/prime_backend.test.ts

@@ -0,0 +1,51 @@
+/**
+ * Copyright 2018 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import * as firestore from '@firebase/firestore-types';
+import { expect } from 'chai';
+import { EventsAccumulator } from './util/events_accumulator';
+import { withTestDoc } from './util/helpers';
+
+// Firestore databases can be subject to a ~30s "cold start" delay if they have not been used
+// recently, so before any tests run we "prime" the backend.
+
+const PRIMING_TIMEOUT_MS = 45000;
+
+before(
+  'Prime backend by waiting for a write to show up in the watch stream',
+  function(): Promise<void> {
+    this.timeout(PRIMING_TIMEOUT_MS);
+
+    return withTestDoc(/*persistence=*/ false, async doc => {
+      const accumulator = new EventsAccumulator<firestore.DocumentSnapshot>();
+      const unsubscribe = doc.onSnapshot(accumulator.storeEvent);
+
+      // Wait for watch to initialize and deliver first event.
+      await accumulator.awaitRemoteEvent();
+
+      // Use a transaction to perform a write without triggering any local events.
+      await doc.firestore.runTransaction(async txn => {
+        txn.set(doc, { value: 'done' });
+      });
+
+      // Wait to see the write on the watch stream.
+      const docSnap = await accumulator.awaitRemoteEvent();
+      expect(docSnap.get('value')).to.equal('done');
+
+      unsubscribe();
+    });
+  }
+);

packages/firestore/test/unit/local/indexeddb_persistence.test.ts

@@ -416,7 +416,7 @@ describe('IndexedDbSchema: createOrUpgradeDb', () => {
             return PersistencePromise.forEach(testMutation.mutations, write => {
               const indexKey = DbDocumentMutation.key(
                 testMutation.userId,
-                path(write.update.name, 5),
+                path(write.update!.name!, 5),
                 testMutation.batchId
               );
               return documentMutationStore.put(