Merge master into release

Author: google-oss-bot

.changeset/smart-crabs-warn.md

@@ -0,0 +1,6 @@
+---
+"@firebase/database": patch
+---
+
+Fix issue with how get results for filtered queries are added to cache.
+Fix issue with events not getting propagated to listeners by get.

.changeset/warm-pillows-know.md

@@ -0,0 +1,6 @@
+---
+"@firebase/database-compat": patch
+"@firebase/database": patch
+---
+
+Fixed faulty transaction bug causing filtered index queries to override default queries.

.github/CODEOWNERS

@@ -36,9 +36,9 @@
 *       @dwyfrequency @hsubox76 @firebase/jssdk-global-approvers
 
 # Database Code
-packages/database @maneesht @jsdt @firebase/jssdk-global-approvers
-packages/database-compat @maneesht @jsdt @firebase/jssdk-global-approvers
-packages/database-types @maneesht @jsdt @firebase/jssdk-global-approvers
+packages/database @maneesht @jsdt @IanWyszynski @firebase/jssdk-global-approvers
+packages/database-compat @maneesht @jsdt @IanWyszynski @firebase/jssdk-global-approvers
+packages/database-types @maneesht @jsdt @IanWyszynski @firebase/jssdk-global-approvers
 
 # Firestore Code
 packages/firestore  @firebase/firestore-js-team @firebase/jssdk-global-approvers

.github/workflows/test-changed-auth.yml

@@ -7,32 +7,66 @@ env:
   DETECT_CHROMEDRIVER_VERSION: true
 
 jobs:
-  test:
-    name: Test Auth If Changed
+  test-chrome:
+    name: Test Auth on Chrome and Node If Changed
     runs-on: ubuntu-latest
 
     steps:
-    # install Chrome first, so the correct version of webdriver can be installed by chromedriver when setting up the repo
-    - name: install Chrome stable
-      run: |
-        sudo apt-get update
-        sudo apt-get install google-chrome-stable
-    - name: Checkout Repo
-      uses: actions/checkout@master
-      with:
-        # This makes Actions fetch all Git history so run-changed script can diff properly.
-        fetch-depth: 0
-    - name: Set up Node (14)
-      uses: actions/setup-node@v2
-      with:
-        node-version: 14.x
-    - name: Bump Node memory limit
-      run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
-    - name: Test setup and yarn install
-      run: |
-        cp config/ci.config.json config/project.json
-        yarn
-    - name: build
-      run: yarn build:changed auth
-    - name: Run tests on changed packages
-      run: xvfb-run yarn test:changed auth
+      # install Chrome first, so the correct version of webdriver can be installed by chromedriver when setting up the repo
+      - name: install Chrome stable
+        run: |
+          sudo apt-get update
+          sudo apt-get install google-chrome-stable
+      - name: Checkout Repo
+        uses: actions/checkout@master
+        with:
+          # This makes Actions fetch all Git history so run-changed script can diff properly.
+          fetch-depth: 0
+      - name: Set up Node (14)
+        uses: actions/setup-node@v2
+        with:
+          node-version: 14.x
+      - name: Bump Node memory limit
+        run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
+      - name: Test setup and yarn install
+        run: |
+          cp config/ci.config.json config/project.json
+          yarn
+      - name: build
+        run: yarn build:changed auth
+      - name: Run tests on changed packages
+        run: xvfb-run yarn test:changed auth
+  test-firefox:
+    name: Test Auth on Firefox If Changed
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: install Firefox stable
+        run: |
+          sudo apt-get update
+          sudo apt-get install firefox
+      - name: Checkout Repo
+        uses: actions/checkout@master
+        with:
+          # This makes Actions fetch all Git history so run-changed script can diff properly.
+          fetch-depth: 0
+      - name: Set up Node (14)
+        uses: actions/setup-node@v2
+        with:
+          node-version: 14.x
+      - name: Bump Node memory limit
+        run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
+      - name: Test setup and yarn install
+        run: |
+          cp config/ci.config.json config/project.json
+          yarn
+      - name: build
+        run: yarn build:changed auth
+      - name: Run tests on auth changed packages
+        run: xvfb-run yarn --cwd packages/auth test:browser:unit
+        env:
+          BROWSERS: 'Firefox'
+      - name: Run tests on auth-compat changed packages
+        run: xvfb-run yarn --cwd packages/auth-compat test:browser:unit
+        env:
+          BROWSERS: 'Firefox'

.prettierignore

@@ -1,5 +1,4 @@
 # This file is pre-built and need not be formatted
-packages/auth
 packages/firebase/firebase*
 packages/firestore/scripts
 dist

README.md

@@ -126,7 +126,8 @@ command, as follows:
 
 
 ```bash
-# Select the Firebase project via the text-based UI.
+# Select the Firebase project via the text-based UI. This will run tools/config.js
+# and deploy from config/ to your Firebase project.
 $ yarn test:setup
 
 # Specify the Firebase project via the command-line arguments.

common/api-review/firestore.api.md

@@ -233,30 +233,6 @@ export function getFirestore(app?: FirebaseApp): Firestore;
 // @public
 export function increment(n: number): FieldValue;
 
-// @public
-export interface Index {
-    // (undocumented)
-    [key: string]: unknown;
-    readonly collectionGroup: string;
-    readonly fields?: IndexField[];
-}
-
-// @public
-export interface IndexConfiguration {
-    // (undocumented)
-    [key: string]: unknown;
-    readonly indexes?: Index[];
-}
-
-// @public
-export interface IndexField {
-    // (undocumented)
-    [key: string]: unknown;
-    readonly arrayConfig?: 'CONTAINS';
-    readonly fieldPath: string;
-    readonly order?: 'ASCENDING' | 'DESCENDING';
-}
-
 // @public
 export function initializeFirestore(app: FirebaseApp, settings: FirestoreSettings): Firestore;
 
@@ -420,12 +396,6 @@ export function setDoc<T>(reference: DocumentReference<T>, data: WithFieldValue<
 // @public
 export function setDoc<T>(reference: DocumentReference<T>, data: PartialWithFieldValue<T>, options: SetOptions): Promise<void>;
 
-// @public
-export function setIndexConfiguration(firestore: Firestore, configuration: IndexConfiguration): Promise<void>;
-
-// @public
-export function setIndexConfiguration(firestore: Firestore, json: string): Promise<void>;
-
 // @public
 export function setLogLevel(logLevel: LogLevel): void;
 

config/database.rules.json

@@ -1,6 +1,9 @@
 {
   "rules": {
     ".read": true,
-    ".write": true
+    ".write": true,
+    "testing": {
+      ".indexOn": "testIndex"
+    }
   }
 }

packages/auth-compat/karma.conf.js

@@ -22,6 +22,7 @@ const files = ['src/**/*.test.ts'];
 
 module.exports = function (config) {
   const karmaConfig = Object.assign({}, karmaBase, {
+    browsers: getTestBrowsers(argv),
     // files to load into karma
     files: getTestFiles(),
     preprocessors: { '**/*.ts': ['webpack', 'sourcemap'] },
@@ -43,6 +44,14 @@ function getTestFiles() {
   }
 }
 
+function getTestBrowsers(argv) {
+  let browsers = ['ChromeHeadless'];
+  if (process.env?.BROWSERS && argv.unit) {
+    browsers = process.env?.BROWSERS?.split(',');
+  }
+  return browsers;
+}
+
 function getClientConfig() {
   if (!argv.integration) {
     return {};

packages/auth-compat/package.json

@@ -34,6 +34,7 @@
     "test:all": "run-p test:browser test:node test:integration",
     "test:ci": "node ../../scripts/run_tests_in_ci.js -s test:all",
     "test:browser": "karma start --single-run",
+    "test:browser:unit": "karma start --single-run --unit",
     "test:browser:integration": "karma start --single-run --integration",
     "test:node": "ts-node -O '{\"module\": \"commonjs\", \"target\": \"es6\"}' scripts/run_node_tests.ts",
     "test:node:integration": "ts-node -O '{\"module\": \"commonjs\", \"target\": \"es6\"}' scripts/run_node_tests.ts --integration",

packages/auth/demo/src/index.js

@@ -82,7 +82,7 @@ import {
   logAtLevel_
 } from './logging';
 
-/** 
+/**
  * Constants that are used when connecting to the Auth Emulator.
  */
 const USE_AUTH_EMULATOR = false;
@@ -1658,7 +1658,6 @@ function initApp() {
   if (USE_AUTH_EMULATOR) {
     connectAuthEmulator(auth, AUTH_EMULATOR_URL);
   }
-  
 
   tempApp = initializeApp(
     {

packages/auth/demo/src/worker/service-worker.ts

@@ -76,18 +76,16 @@ function getOriginFromUrl(url: string): string {
 
 self.addEventListener('install', (event: ExtendableEvent) => {
   // Perform install steps.
-  event.waitUntil(
-    async (): Promise<void> => {
-      const cache = await caches.open(CACHE_NAME);
-      // Add all URLs of resources we want to cache.
-      try {
-        await cache.addAll(urlsToCache);
-      } catch {
-        // Suppress error as some of the files may not be available for the
-        // current page.
-      }
+  event.waitUntil(async (): Promise<void> => {
+    const cache = await caches.open(CACHE_NAME);
+    // Add all URLs of resources we want to cache.
+    try {
+      await cache.addAll(urlsToCache);
+    } catch {
+      // Suppress error as some of the files may not be available for the
+      // current page.
     }
-  );
+  });
 });
 
 // As this is a test app, let's only return cached data when offline.
@@ -160,18 +158,16 @@ self.addEventListener('fetch', (event: FetchEvent) => {
 self.addEventListener('activate', (event: ExtendableEvent) => {
   // Update this list with all caches that need to remain cached.
   const cacheWhitelist = ['cache-v1'];
-  event.waitUntil(
-    async (): Promise<void> => {
-      const cacheNames = await caches.keys();
-      await Promise.all(
-        cacheNames.map(cacheName => {
-          // Check if cache is not whitelisted above.
-          if (cacheWhitelist.indexOf(cacheName) === -1) {
-            // If not whitelisted, delete it.
-            return caches.delete(cacheName);
-          }
-        })
-      );
-    }
-  );
+  event.waitUntil(async (): Promise<void> => {
+    const cacheNames = await caches.keys();
+    await Promise.all(
+      cacheNames.map(cacheName => {
+        // Check if cache is not whitelisted above.
+        if (cacheWhitelist.indexOf(cacheName) === -1) {
+          // If not whitelisted, delete it.
+          return caches.delete(cacheName);
+        }
+      })
+    );
+  });
 });

packages/auth/demo/src/worker/web-worker.ts

@@ -105,9 +105,8 @@ async function runWorkerTests(googleIdToken: string): Promise<void> {
   if (!userCredential.user || !userCredential.user.uid) {
     throw new Error('signInWithCredential unexpectedly failed!');
   }
-  const googleCredential = GoogleAuthProvider.credentialFromResult(
-    userCredential
-  );
+  const googleCredential =
+    GoogleAuthProvider.credentialFromResult(userCredential);
   if (!googleCredential) {
     throw new Error('signInWithCredential unexpectedly failed!');
   }

packages/auth/index.doc.ts

@@ -28,4 +28,7 @@
 export * from './index';
 
 export { cordovaPopupRedirectResolver } from './index.cordova';
-export { reactNativeLocalPersistence, getReactNativePersistence } from './index.rn';
+export {
+  reactNativeLocalPersistence,
+  getReactNativePersistence
+} from './index.rn';

packages/auth/index.rn.ts

@@ -69,10 +69,10 @@ export const reactNativeLocalPersistence: Persistence =
     removeItem(...args) {
       // Called inline to avoid deprecation warnings on startup.
       return ReactNative.AsyncStorage.removeItem(...args);
-    },
+    }
   });
 
-export {getReactNativePersistence};
+export { getReactNativePersistence };
 
 export function getAuth(app: FirebaseApp = getApp()): Auth {
   const provider = _getProvider(app, 'auth');

packages/auth/karma.conf.js

@@ -20,6 +20,7 @@ const { argv } = require('yargs');
 
 module.exports = function (config) {
   const karmaConfig = Object.assign({}, karmaBase, {
+    browsers: getTestBrowsers(argv),
     // files to load into karma
     files: getTestFiles(argv),
     // frameworks to use
@@ -52,6 +53,14 @@ function getTestFiles(argv) {
   }
 }
 
+function getTestBrowsers(argv) {
+  let browsers = ["ChromeHeadless"]; 
+  if (process.env?.BROWSERS && argv.unit) {
+    browsers = process.env?.BROWSERS?.split(',');
+  } 
+  return browsers;
+}
+
 function getClientConfig(argv) {
   if (!argv.local) {
     return {};