Merge master into release

Author: google-oss-bot

.changeset/cyan-buses-float.md

@@ -0,0 +1,6 @@
+---
+'@firebase/firestore': patch
+'@firebase/rules-unit-testing': patch
+---
+
+Update `@grpc/proto-loader` and `firebase-admin` dependencies to address `protobufjs` security issue.

.changeset/cyan-sheep-battle.md

@@ -0,0 +1,5 @@
+---
+'@firebase/app-check': patch
+---
+
+Fix logic to trigger app check throttling

.github/workflows/test-all.yml

@@ -20,10 +20,10 @@ jobs:
         sudo apt-get update
         sudo apt-get install google-chrome-stable
     - uses: actions/checkout@v2
-    - name: Set up Node (14)
+    - name: Set up Node (16)
       uses: actions/setup-node@v2
       with:
-        node-version: 14.x
+        node-version: 16.x
     - name: Bump Node memory limit
       run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
     - name: Test setup and yarn install
@@ -38,6 +38,8 @@ jobs:
       run: |
         xvfb-run yarn test:ci
         node scripts/print_test_logs.js
+      env:
+        FIREBASE_TOKEN: ${{ secrets.FIREBASE_CLI_TOKEN }}
     - name: Generate coverage file
       run: yarn ci:coverage
     - name: Run coverage

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

@@ -13,10 +13,10 @@ jobs:
       with:
         # This makes Actions fetch all Git history so run-changed script can diff properly.
         fetch-depth: 0
-    - name: Set up Node (14)
+    - name: Set up Node (16)
       uses: actions/setup-node@v2
       with:
-        node-version: 14.x
+        node-version: 16.x
     - name: install Chrome stable
       run: |
         sudo apt-get update
@@ -30,4 +30,6 @@ jobs:
     - name: build
       run: yarn build:changed misc
     - name: Run tests
-      run: yarn test:changed misc
+      run: yarn test:changed misc
+      env:
+        FIREBASE_TOKEN: ${{ secrets.FIREBASE_CLI_TOKEN }}

config/functions/package.json

@@ -3,7 +3,7 @@
   "description": "Cloud Functions for Firebase",
   "dependencies": {
     "cors": "2.8.5",
-    "firebase-admin": "10.2.0",
+    "firebase-admin": "11.0.0",
     "firebase-functions": "3.21.0"
   },
   "private": true,

package.json

@@ -107,7 +107,7 @@
     "express": "4.18.1",
     "find-free-port": "2.0.0",
     "firebase-functions": "3.21.0",
-    "firebase-tools": "9.23.3",
+    "firebase-tools": "11.2.2",
     "glob": "7.2.0",
     "http-server": "14.1.0",
     "indexeddbshim": "8.0.0",

packages/app-check/src/internal-api.test.ts

@@ -41,11 +41,11 @@ import * as util from './util';
 import { logger } from './logger';
 import { getState, clearState, setState, getDebugState } from './state';
 import { AppCheckTokenListener } from './public-types';
-import { Deferred, FirebaseError } from '@firebase/util';
+import { Deferred } from '@firebase/util';
 import { ReCaptchaEnterpriseProvider, ReCaptchaV3Provider } from './providers';
 import { AppCheckService } from './factory';
 import { ListenerType } from './types';
-import { AppCheckError } from './errors';
+import { AppCheckError, ERROR_FACTORY } from './errors';
 
 const fakeRecaptchaToken = 'fake-recaptcha-token';
 const fakeRecaptchaAppCheckToken = {
@@ -396,11 +396,9 @@ describe('internal api', () => {
       const warnStub = stub(logger, 'warn');
       stub(client, 'exchangeToken').returns(
         Promise.reject(
-          new FirebaseError(
-            AppCheckError.FETCH_STATUS_ERROR,
-            'test error msg',
-            { httpStatus: 503 }
-          )
+          ERROR_FACTORY.create(AppCheckError.FETCH_STATUS_ERROR, {
+            httpStatus: 503
+          })
         )
       );
 
@@ -424,11 +422,9 @@ describe('internal api', () => {
       const warnStub = stub(logger, 'warn');
       stub(client, 'exchangeToken').returns(
         Promise.reject(
-          new FirebaseError(
-            AppCheckError.FETCH_STATUS_ERROR,
-            'test error msg',
-            { httpStatus: 403 }
-          )
+          ERROR_FACTORY.create(AppCheckError.FETCH_STATUS_ERROR, {
+            httpStatus: 403
+          })
         )
       );
 

packages/app-check/src/providers.ts

@@ -80,7 +80,9 @@ export class ReCaptchaV3Provider implements AppCheckProvider {
         this._heartbeatServiceProvider!
       );
     } catch (e) {
-      if ((e as FirebaseError).code === AppCheckError.FETCH_STATUS_ERROR) {
+      if (
+        (e as FirebaseError).code?.includes(AppCheckError.FETCH_STATUS_ERROR)
+      ) {
         this._throttleData = setBackoff(
           Number((e as FirebaseError).customData?.httpStatus),
           this._throttleData
@@ -167,7 +169,9 @@ export class ReCaptchaEnterpriseProvider implements AppCheckProvider {
         this._heartbeatServiceProvider!
       );
     } catch (e) {
-      if ((e as FirebaseError).code === AppCheckError.FETCH_STATUS_ERROR) {
+      if (
+        (e as FirebaseError).code?.includes(AppCheckError.FETCH_STATUS_ERROR)
+      ) {
         this._throttleData = setBackoff(
           Number((e as FirebaseError).customData?.httpStatus),
           this._throttleData

packages/auth-compat/demo/functions/package.json

@@ -9,7 +9,7 @@
     "logs": "firebase functions:log"
   },
   "dependencies": {
-    "firebase-admin": "10.2.0",
+    "firebase-admin": "11.0.0",
     "firebase-functions": "3.21.0"
   },
   "private": true

packages/auth/demo/functions/package.json

@@ -9,7 +9,7 @@
     "logs": "firebase functions:log"
   },
   "dependencies": {
-    "firebase-admin": "10.2.0",
+    "firebase-admin": "11.0.0",
     "firebase-functions": "3.21.0"
   },
   "private": true,

packages/firestore/package.json

@@ -84,7 +84,7 @@
     "@firebase/util": "1.6.3",
     "@firebase/webchannel-wrapper": "0.6.2",
     "@grpc/grpc-js": "^1.3.2",
-    "@grpc/proto-loader": "^0.6.0",
+    "@grpc/proto-loader": "^0.6.13",
     "node-fetch": "2.6.7",
     "tslib": "^2.1.0"
   },

packages/rules-unit-testing/functions/package.json

@@ -8,7 +8,10 @@
   },
   "private": true,
   "dependencies": {
-    "firebase-admin": "10.2.0",
+    "firebase-admin": "11.0.0",
     "firebase-functions": "3.21.0"
+  },
+  "engines": {
+    "node": "16"
   }
 }

scripts/docgen-compat/theme/layouts/default.hbs

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="hide_page_heading" value="true" />
-    <meta name="project_path" value="/_project.yaml" />
+    <meta name="project_path" value="/docs/reference/js/_project.yaml" />
     <meta name="book_path" value="/docs/reference/_book.yaml" />
     <meta name="translation" value="disabled" />
     <meta name="page_type" value="reference" />