Merge branch 'master' into wuandy/Bundles

# Conflicts:
#	integration/messaging/test/utils/openNewTab.js
#	packages/firestore/src/core/component_provider.ts
#	packages/firestore/src/local/indexeddb_persistence.ts
#	packages/firestore/src/local/local_serializer.ts
#	packages/firestore/src/platform/platform.ts
#	packages/firestore/src/platform_browser/browser_platform.ts
#	packages/firestore/src/platform_node/node_platform.ts
#	packages/firestore/src/remote/serializer.ts
#	packages/firestore/test/unit/local/persistence_test_helpers.ts
#	packages/firestore/test/unit/specs/spec_test_components.ts
#	packages/firestore/test/util/test_platform.ts

Author: wu-hui

.github/workflows/test-all.yml

@@ -25,6 +25,8 @@ jobs:
       run: yarn build
     - name: Run unit tests
       run: xvfb-run yarn test:ci
+      env:
+        FCM_TEST_PROJECT_SERVER_KEY: $${{secrets.FCM_TEST_PROJECT_SERVER_KEY}}
     - name: Generate coverage file
       run: yarn ci:coverage
     - name: Run coverage

.github/workflows/test-changed.yml

@@ -28,3 +28,5 @@ jobs:
       run: yarn build
     - name: Run tests on changed packages
       run: xvfb-run yarn test:changed
+      env:
+        FCM_TEST_PROJECT_SERVER_KEY: $${{secrets.FCM_TEST_PROJECT_SERVER_KEY}}  

common/api-review/app-exp.api.md

@@ -58,6 +58,9 @@ export function _registerComponent(component: Component): boolean;
 // @public
 export function registerVersion(libraryKeyOrName: string, version: string, variant?: string): void;
 
+// @internal (undocumented)
+export function _removeServiceInstance<T extends Name>(app: FirebaseApp, name: T, instanceIdentifier?: string): void;
+
 // @public
 export const SDK_VERSION: string;
 

common/api-review/app-types-exp.api.md

@@ -53,6 +53,13 @@ export interface FirebaseOptions {
   storageBucket?: string;
 }
 
+// @internal (undocumented)
+export interface _FirebaseService {
+  // (undocumented)
+  app: FirebaseApp;
+   delete(): Promise<void>;
+}
+
 // @public (undocumented)
 export interface PlatformLoggerService {
   // (undocumented)

common/api-review/functions-exp.api.md

@@ -0,0 +1,24 @@
+## API Report File for "@firebase/functions-exp"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { FirebaseApp } from '@firebase/app-types-exp';
+import { Functions } from '@firebase/functions-types-exp';
+import { HttpsCallable } from '@firebase/functions-types-exp';
+import { HttpsCallableOptions } from '@firebase/functions-types-exp';
+
+// @public
+export function getFunctions(app: FirebaseApp, region?: string): Functions;
+
+// @public
+export function httpsCallable(functionsInstance: Functions, name: string, options?: HttpsCallableOptions): HttpsCallable;
+
+// @public
+export function useFunctionsEmulator(functionsInstance: Functions, origin: string): void;
+
+
+// (No @packageDocumentation comment for this package)
+
+```

config/karma.saucelabs.js

@@ -49,6 +49,14 @@ const packageConfigs = {
   messaging: {
     // Messaging currently only supports these browsers.
     browsers: ['Chrome_Windows', 'Firefox_Windows', 'Edge_Windows']
+  },
+  firestore: {
+    browsers: [
+      'Chrome_Windows',
+      'Firefox_Windows',
+      'Edge_Windows',
+      'Safari_macOS'
+    ]
   }
 };
 
@@ -170,7 +178,8 @@ module.exports = function(config) {
       'packages/polyfill/index.ts': ['webpack', 'sourcemap'],
       '**/test/**/*.ts': ['webpack', 'sourcemap'],
       '**/*.test.ts': ['webpack', 'sourcemap'],
-      'packages/firestore/test/**/bootstrap.ts': ['webpack', 'babel'],
+      // Restore when ready to run Firestore unit tests in IE.
+      // 'packages/firestore/test/**/bootstrap.ts': ['webpack', 'babel'],
       'integration/**/namespace.*': ['webpack', 'babel', 'sourcemap']
     },
 

config/webpack.test.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,12 @@
 const path = require('path');
 const webpack = require('webpack');
 
+/**
+ * A regular expression used to replace Firestore's platform specific modules,
+ * which are located under 'packages/firestore/src/platform/'.
+ */
+const FIRESTORE_PLATFORM_RE = /^(.*)\/platform\/([^.\/]*)(\.ts)?$/;
+
 module.exports = {
   mode: 'development',
   devtool: 'source-map',
@@ -77,6 +83,15 @@ module.exports = {
     extensions: ['.js', '.ts']
   },
   plugins: [
+    new webpack.NormalModuleReplacementPlugin(
+      FIRESTORE_PLATFORM_RE,
+      resource => {
+        resource.request = resource.request.replace(
+          FIRESTORE_PLATFORM_RE,
+          '$1/platform/browser/$2.ts'
+        );
+      }
+    ),
     new webpack.EnvironmentPlugin([
       'RTDB_EMULATOR_PORT',
       'RTDB_EMULATOR_NAMESPACE'

integration/browserify/package.json

@@ -8,7 +8,7 @@
     "test:ci": "node ../../scripts/run_tests_in_ci.js"
   },
   "dependencies": {
-    "firebase": "7.14.4"
+    "firebase": "7.15.4"
   },
   "devDependencies": {
     "@babel/core": "7.9.6",

integration/firebase-typings/package.json

@@ -7,7 +7,7 @@
     "test:ci": "node ../../scripts/run_tests_in_ci.js"
   },
   "dependencies": {
-    "firebase": "7.14.4"
+    "firebase": "7.15.4"
   },
   "devDependencies": {
     "typescript": "3.8.3"

integration/firestore/gulpfile.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,6 +51,7 @@ function copyTests() {
         testBase + '/integration/api/*.ts',
         testBase + '/integration/util/events_accumulator.ts',
         testBase + '/integration/util/helpers.ts',
+        testBase + '/integration/util/settings.ts',
         testBase + '/util/equality_matcher.ts',
         testBase + '/util/promise.ts'
       ],

integration/messaging/download-browsers.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,14 +18,9 @@
 const seleniumAssistant = require('selenium-assistant');
 
 console.log('Starting browser download - this may take some time.');
-Promise.all([
-  seleniumAssistant.downloadLocalBrowser('chrome', 'stable', 48),
-  seleniumAssistant.downloadLocalBrowser('chrome', 'beta', 48),
-  seleniumAssistant.downloadLocalBrowser('chrome', 'unstable', 48),
-  seleniumAssistant.downloadLocalBrowser('firefox', 'stable', 48),
-  seleniumAssistant.downloadLocalBrowser('firefox', 'beta', 48),
-  seleniumAssistant.downloadLocalBrowser('firefox', 'unstable', 48)
-])
+// TODO: enable firefox testing once figure out how to give notification permission with SE webdriver.
+// TODO: Run the integration test against multiple major chrome versions to ensure backward compatibility
+Promise.all([seleniumAssistant.downloadLocalBrowser('chrome', 'stable', 80)])
   .then(() => {
     console.log('Browser download complete.');
   })

integration/messaging/package.json

@@ -4,15 +4,15 @@
   "version": "0.2.1",
   "scripts": {
     "pretest:manual": "node ./download-browsers.js",
-    "test": "echo 'Tests disabled due to flakiness'",
+    "test": "mocha --exit",
     "test:manual": "mocha --exit"
   },
   "dependencies": {
-    "firebase": "7.14.4"
+    "firebase": "7.15.4"
   },
   "devDependencies": {
     "chai": "4.2.0",
-    "chromedriver": "80.0.2",
+    "chromedriver": "^83.0.0",
     "express": "4.17.1",
     "geckodriver": "1.19.1",
     "mocha": "7.1.2",

integration/messaging/test/static/app.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-const EIGHT_DAYS_IN_MS = 8 * 86400000;
-
 /**
  * This class just wraps the expected behavior or a demo app that will
  * be orchestrated by selenium tests (Although manual use of the demo will
@@ -36,40 +34,49 @@ class DemoApp {
     this._triggerDeleteToken = this.triggerDeleteToken;
     this._triggerGetToken = this.triggerGetToken;
     this._triggerTimeForward = this.triggerTimeForward;
+    this._clearInstanceForTest = this.clearInstanceForTest;
+    this.appendMessage = this.appendMessage;
 
     // Initialize Firebase
     firebase.initializeApp(firebaseConfig);
 
     this._messaging = firebase.messaging();
 
-    if (options.applicationKey) {
-      this._messaging.usePublicVapidKey(options.applicationKey);
+    if (options.vapidKey) {
+      console.debug('VapidKey is provided to the test app. ');
+      this._messaging.usePublicVapidKey(options.vapidKey);
+    } else {
+      console.debug('VapidKey is not specified. Skip setting it');
     }
 
     if (options.swReg) {
+      console.debug('ServiceWorker is provided to the test app');
       this._messaging.useServiceWorker(options.swReg);
+    } else {
+      console.debug(
+        'ServiceWorker is not specified. The default ServiceWorker will be used.'
+      );
     }
 
-    this._messaging.onMessage(payload => {
-      console.log(`Message received: `, payload);
-      this._messages.push(payload);
+    this._messaging.onMessage(message => {
+      this.appendMessage(message);
     });
 
-    // Initializa state of token
-    this._messaging
-      .requestPermission()
-      .then(() => this._messaging.getToken())
-      .then(
-        token => {
-          console.log('getToken() worked: ', token);
-          this._token = token;
-        },
-        err => {
-          console.log('getToken() failed: ', err.message, err.stack);
-          this._errors.push(err);
-          this._token = null;
-        }
-      );
+    this._messaging.getToken().then(
+      token => {
+        console.log('Test app getToken() succeed. Token: ', token);
+        this._token = token;
+      },
+      err => {
+        console.log('Test app getToken() failed: ', err.message, err.stack);
+        this._errors.push(err);
+        this._token = null;
+      }
+    );
+  }
+
+  appendMessage(payload) {
+    this._messages.push(payload);
   }
 
   async triggerDeleteToken(token) {
@@ -95,10 +102,15 @@ class DemoApp {
     return this._token;
   }
 
-  async triggerTimeForward() {
+  triggerTimeForward() {
     this._clock.tick(EIGHT_DAYS_IN_MS);
   }
 
+  clearInstanceForTest() {
+    this._errors = [];
+    this._messages = [];
+  }
+
   get token() {
     return this._token;
   }

integration/messaging/test/static/constants.js

@@ -0,0 +1,35 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ *
+ * 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.
+ */
+
+// Test project managed by the FCM team
+const PUBLIC_VAPID_KEY =
+  'BNjjus3nz38aYtbDLVfunY3VULg0Yq5T4GXWd7iDDmeqWCUNqfrK1eiKVdoT0VncLuCjfJ1GmdfmNZz-AjHfkxM';
+const FIREBASE_CONFIG = {
+  apiKey: 'AIzaSyBpIe0xyUNHOwtE_go32NmUJF4acsc6S6c',
+  projectId: 'fcm-web-sdk-test',
+  messagingSenderId: '750970317741',
+  appId: '1:750970317741:web:f382be3155e250906a4f24'
+};
+
+const TAG = 'FCM_INTEGRATION_TEST: ';
+const EIGHT_DAYS_IN_MS = 8 * 86400000;
+const TEST_DB = 'FCM_INTEGRATION_TEST_DB';
+const TEST_DB_VERSION = 1;
+const BACKGROUND_MESSAGES_OBJECT_STORE = 'background_messages';
+// indexDb object store creation require a "primary key", "ndx" is used.
+const BACKGROUND_MESSAGES_OBJECT_STORE_PRIMARY_KEY = 'ndx';
+const BACKGROUND_MESSAGES_OBJECT_STORE_DEFAULT_NDX = 'default_ndx';

integration/messaging/test/static/default-sw/index.html

@@ -1,17 +1,19 @@
 <html>
-    <head>
-      <title>FCM Demo</title>
-      <meta name="viewport" content="width=device-width,initial-scale=1">
-    </head>
-    <body>
-      <h1>Default SW</h1>
-      <script src="/firebase/firebase-app.js"></script>
-      <script src="/firebase/firebase-messaging.js"></script>
-      <script src="/app.js"></script>
-      <script src="../valid-no-vapid-key/firebaseConfig.js"></script>
-      <script src="https://cdnjs.cloudflare.com/ajax/libs/sinon.js/4.1.3/sinon.min.js"></script>
-      <script>
-        window.__test = new window.DemoApp(window.firebaseConfig);
-      </script>
-    </body>
-    </html>
+  <head>
+    <title>FCM Demo</title>
+    <meta name="viewport" content="width=device-width,initial-scale=1" />
+  </head>
+  <body>
+    <h1>Default SW</h1>
+    <script src="/firebase-app.js"></script>
+    <script src="/firebase-messaging.js"></script>
+    <script src="../app.js"></script>
+    <script src="../constants.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/sinon.js/4.1.3/sinon.min.js"></script>
+    <script>
+      window.__test = new window.DemoApp(FIREBASE_CONFIG, {
+        vapidKey: PUBLIC_VAPID_KEY
+      });
+    </script>
+  </body>
+</html>