Merge master into release

Author: github-actions[bot]

.changeset/cool-elephants-leave.md

@@ -0,0 +1,5 @@
+---
+"@firebase/auth": patch
+---
+
+Add missing field to `firebase` claim in token result typing

.changeset/eighty-bobcats-compete.md

@@ -0,0 +1,5 @@
+---
+'@firebase/auth-compat': patch
+---
+
+Fix auth scheme reconition in capacitor env

.changeset/polite-fireants-mate.md

@@ -1 +1,5 @@
+# Source files
+# ============
+*.md       text eol=lf
+
 *.json  linguist-language=JSON-with-Comments

.gitattributes

@@ -10,6 +10,6 @@ jobs:
 
     steps:
       - name: assign techwriters to PR
-        uses: kentaro-m/[email protected].0
+        uses: kentaro-m/[email protected].1
         with:
           configuration-path: ".github/auto_assign.yml"

.github/workflows/assign-tech-writers.yml

@@ -2,12 +2,8 @@ name: E2E Smoke Tests
 
 # Allows REST trigger. Currently triggered by release-cli script during a staging run.
 on:
-  workflow_dispatch:
-    inputs:
-      versionOrTag:
-        description: 'release version or tag'
-        required: true
-        default: 'next'
+  repository_dispatch:
+    types: [staging-tests]
 
 jobs:
   test:
@@ -39,8 +35,8 @@ jobs:
           echo "export const config = $PROJECT_CONFIG; export const testAccount = $TEST_ACCOUNT" > firebase-config.js
       - name: Yarn install
         run: |
-          echo "Installing firebase@${{ github.event.inputs.versionOrTag }}"
-          yarn add firebase@${{ github.event.inputs.versionOrTag }}
+          echo "Installing firebase@${{ github.event.client_payload.versionOrTag }}"
+          yarn add firebase@${{ github.event.client_payload.versionOrTag }}
           yarn
       - name: Deploy "callTest" cloud function
         run: |

.github/workflows/e2e-test.yml

@@ -9,14 +9,28 @@ jobs:
     permissions:
       contents: write
     steps:
+      - name: Checkout Release Branch
+        uses: actions/checkout@master
+        with:
+          ref: release
+      - name: Get release version
+        id: get-version
+        run: |
+          export VERSION_SCRIPT="const pkg = require('./packages/firebase/package.json'); console.log(pkg.version);"
+          export VERSION=`node -e "${VERSION_SCRIPT}"`
+          echo "::set-output name=RELEASE_VERSION::$VERSION"
+      - name: Echo version in shell
+        run: |
+          echo "Merging release ${{ steps.get-version.outputs.RELEASE_VERSION }}"
       - name: Merge to master
         uses: actions/github-script@v6
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            github.repos.merge({
+            github.rest.repos.merge({
               owner: context.repo.owner,
               repo: context.repo.repo,
               base: 'master',
-              head: 'release'
+              head: 'release',
+              commit_message: 'Release ${{ steps.get-version.outputs.RELEASE_VERSION }}'
             })

.github/workflows/merge-release-branch.yml

@@ -0,0 +1,140 @@
+name: Staging Release
+
+on: workflow_dispatch
+
+jobs:
+  deploy:
+    name: Staging Release
+    runs-on: ubuntu-latest
+    # Allow GITHUB_TOKEN to have write permissions
+    permissions:
+      contents: write
+
+    steps:
+    - name: Set up Node (14)
+      uses: actions/setup-node@v2
+      with:
+        node-version: 14.x
+    - name: Merge master into release
+      uses: actions/github-script@v6
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        script: |
+          github.rest.repos.merge({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            base: 'release',
+            head: 'master'
+          })
+    - name: Checkout release branch (with history)
+      uses: actions/checkout@master
+      with:
+        # Release script requires git history and tags.
+        fetch-depth: 0
+        ref: release
+    - name: Yarn install
+      run: yarn
+    # Ensures a new @firebase/app is published with every release.
+    # This keeps the SDK_VERSION variable up to date.
+    - name: Add a changeset for @firebase/app
+      # pull master so changeset can diff against it
+      run: |
+        git pull -f --no-rebase origin master:master
+        yarn ts-node-script scripts/ci/add_changeset.ts
+    - name: Create Release Pull Request
+      uses: changesets/action@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.OSS_BOT_GITHUB_TOKEN }}
+    - name: Publish to NPM
+      # --skipTests No need to run tests
+      # --skipReinstall Yarn install has already been run
+      # --ignoreUnstaged Adding the @firebase/app changeset file means
+      # there's unstaged changes. Ignore.
+      # TODO: Make these flags defaults in the release script.
+      run: yarn release --releaseType staging --skipTests --skipReinstall --ignoreUnstaged
+      env:
+        NPM_TOKEN_ANALYTICS: ${{secrets.NPM_TOKEN_ANALYTICS}}
+        NPM_TOKEN_ANALYTICS_INTEROP_TYPES: ${{secrets.NPM_TOKEN_ANALYTICS_INTEROP_TYPES}}
+        NPM_TOKEN_ANALYTICS_TYPES: ${{secrets.NPM_TOKEN_ANALYTICS_TYPES}}
+        NPM_TOKEN_APP: ${{secrets.NPM_TOKEN_APP}}
+        NPM_TOKEN_APP_TYPES: ${{secrets.NPM_TOKEN_APP_TYPES}}
+        NPM_TOKEN_APP_CHECK: ${{secrets.NPM_TOKEN_APP_CHECK}}
+        NPM_TOKEN_APP_CHECK_INTEROP_TYPES: ${{secrets.NPM_TOKEN_APP_CHECK_INTEROP_TYPES}}
+        NPM_TOKEN_APP_CHECK_TYPES: ${{secrets.NPM_TOKEN_APP_CHECK_TYPES}}
+        NPM_TOKEN_AUTH: ${{secrets.NPM_TOKEN_AUTH}}
+        NPM_TOKEN_AUTH_INTEROP_TYPES: ${{secrets.NPM_TOKEN_AUTH_INTEROP_TYPES}}
+        NPM_TOKEN_AUTH_TYPES: ${{secrets.NPM_TOKEN_AUTH_TYPES}}
+        NPM_TOKEN_COMPONENT: ${{secrets.NPM_TOKEN_COMPONENT}}
+        NPM_TOKEN_DATABASE: ${{secrets.NPM_TOKEN_DATABASE}}
+        NPM_TOKEN_DATABASE_TYPES: ${{secrets.NPM_TOKEN_DATABASE_TYPES}}
+        NPM_TOKEN_FIRESTORE: ${{secrets.NPM_TOKEN_FIRESTORE}}
+        NPM_TOKEN_FIRESTORE_TYPES: ${{secrets.NPM_TOKEN_FIRESTORE_TYPES}}
+        NPM_TOKEN_FUNCTIONS: ${{secrets.NPM_TOKEN_FUNCTIONS}}
+        NPM_TOKEN_FUNCTIONS_TYPES: ${{secrets.NPM_TOKEN_FUNCTIONS_TYPES}}
+        NPM_TOKEN_INSTALLATIONS: ${{secrets.NPM_TOKEN_INSTALLATIONS}}
+        NPM_TOKEN_INSTALLATIONS_TYPES: ${{secrets.NPM_TOKEN_INSTALLATIONS_TYPES}}
+        NPM_TOKEN_LOGGER: ${{secrets.NPM_TOKEN_LOGGER}}
+        NPM_TOKEN_MESSAGING: ${{secrets.NPM_TOKEN_MESSAGING}}
+        NPM_TOKEN_MESSAGING_TYPES: ${{secrets.NPM_TOKEN_MESSAGING_TYPES}}
+        NPM_TOKEN_PERFORMANCE: ${{secrets.NPM_TOKEN_PERFORMANCE}}
+        NPM_TOKEN_PERFORMANCE_TYPES: ${{secrets.NPM_TOKEN_PERFORMANCE_TYPES}}
+        NPM_TOKEN_POLYFILL: ${{secrets.NPM_TOKEN_POLYFILL}}
+        NPM_TOKEN_REMOTE_CONFIG: ${{secrets.NPM_TOKEN_REMOTE_CONFIG}}
+        NPM_TOKEN_REMOTE_CONFIG_TYPES: ${{secrets.NPM_TOKEN_REMOTE_CONFIG_TYPES}}
+        NPM_TOKEN_RULES_UNIT_TESTING: ${{secrets.NPM_TOKEN_RULES_UNIT_TESTING}}
+        NPM_TOKEN_STORAGE: ${{secrets.NPM_TOKEN_STORAGE}}
+        NPM_TOKEN_STORAGE_TYPES: ${{secrets.NPM_TOKEN_STORAGE_TYPES}}
+        NPM_TOKEN_TESTING: ${{secrets.NPM_TOKEN_TESTING}}
+        NPM_TOKEN_UTIL: ${{secrets.NPM_TOKEN_UTIL}}
+        NPM_TOKEN_WEBCHANNEL_WRAPPER: ${{secrets.NPM_TOKEN_WEBCHANNEL_WRAPPER}}
+        NPM_TOKEN_FIREBASE: ${{secrets.NPM_TOKEN_FIREBASE}}
+        NPM_TOKEN_APP_COMPAT: ${{ secrets.NPM_TOKEN_APP_COMPAT }}
+        NPM_TOKEN_INSTALLATIONS_COMPAT: ${{ secrets.NPM_TOKEN_INSTALLATIONS_COMPAT }}
+        NPM_TOKEN_ANALYTICS_COMPAT: ${{ secrets.NPM_TOKEN_ANALYTICS_COMPAT }}
+        NPM_TOKEN_AUTH_COMPAT: ${{ secrets.NPM_TOKEN_AUTH_COMPAT }}
+        NPM_TOKEN_MESSAGING_INTEROP_TYPES: ${{ secrets.NPM_TOKEN_MESSAGING_INTEROP_TYPES }}
+        NPM_TOKEN_FUNCTIONS_COMPAT: ${{ secrets.NPM_TOKEN_FUNCTIONS_COMPAT }}
+        NPM_TOKEN_MESSAGING_COMPAT: ${{ secrets.NPM_TOKEN_MESSAGING_COMPAT }}
+        NPM_TOKEN_PERFORMANCE_COMPAT: ${{ secrets.NPM_TOKEN_PERFORMANCE_COMPAT }}
+        NPM_TOKEN_REMOTE_CONFIG_COMPAT: ${{ secrets.NPM_TOKEN_REMOTE_CONFIG_COMPAT }}
+        NPM_TOKEN_DATABASE_COMPAT: ${{ secrets.NPM_TOKEN_DATABASE_COMPAT }}
+        NPM_TOKEN_FIRESTORE_COMPAT: ${{ secrets.NPM_TOKEN_FIRESTORE_COMPAT }}
+        NPM_TOKEN_STORAGE_COMPAT: ${{ secrets.NPM_TOKEN_STORAGE_COMPAT }}
+        NPM_TOKEN_APP_CHECK_COMPAT: ${{ secrets.NPM_TOKEN_APP_CHECK_COMPAT }}
+        NPM_TOKEN_API_DOCUMENTER: ${{ secrets.NPM_TOKEN_API_DOCUMENTER }}
+        CI: true
+    - name: Get release version
+      id: get-version
+      # STAGING_VERSION = version with staging hash, e.g. 1.2.3-20430523
+      # BASE_VERSION = version without staging hash, e.g. 1.2.3
+      run: |
+        VERSION_SCRIPT="const pkg = require('./packages/firebase/package.json'); console.log(pkg.version);"
+        VERSION=`node -e "${VERSION_SCRIPT}"`
+        echo "::set-output name=STAGING_VERSION::$VERSION"
+        BASE_VERSION=$(echo ${{ steps.get-version.outputs.STAGING_VERSION }} | cut -d "-" -f 1)
+        echo "::set-output name=BASE_VERSION::$BASE_VERSION"
+    - name: Echo version in shell
+      run: |
+        echo "Staging release ${{ steps.get-version.outputs.STAGING_VERSION }}"
+    - name: Launch E2E tests workflow
+      # Trigger e2e-test.yml
+      run: |
+        OSS_BOT_GITHUB_TOKEN=${{ secrets.OSS_BOT_GITHUB_TOKEN }}
+        VERSION_OR_TAG=${{ steps.get-version.outputs.STAGING_VERSION }}
+        curl -X POST \
+        -H "Content-Type:application/json" \
+        -H "Accept:application/vnd.github.v3+json" \
+        -H "Authorization:Bearer $OSS_BOT_GITHUB_TOKEN" \
+        -d "{\"event_type\":\"staging-tests\", \"client_payload\":{\"versionOrTag\":\"$VERSION_OR_TAG\"}}" \
+        https://api.github.com/repos/firebase/firebase-js-sdk/dispatches
+    - name: Log to release tracker
+      # Sends release information to cloud functions endpoint of release tracker.
+      run: |
+        DATE=$(date +'%m/%d/%Y')
+        BASE_VERSION=${{ steps.get-version.outputs.BASE_VERSION }}
+        STAGING_VERSION=${{ steps.get-version.outputs.STAGING_VERSION }}
+        OPERATOR=${{ github.actor }}
+        RELEASE_TRACKER_URL=${{ secrets.RELEASE_TRACKER_URL }}
+        curl -X POST -H "Content-Type:application/json" \
+        -d "{\"version\":\"$BASE_VERSION\",\"tag\":\"$STAGING_VERSION\",\"date\":\"$DATE\",\"operator\":\"$OPERATOR\"}" \
+        $RELEASE_TRACKER_URL/logStaging

.github/workflows/release-staging.yml

@@ -388,7 +388,7 @@ export interface Promotion {
 // @public
 export function setAnalyticsCollectionEnabled(analyticsInstance: Analytics, enabled: boolean): void;
 
-// @public
+// @public @deprecated
 export function setCurrentScreen(analyticsInstance: Analytics, screenName: string, options?: AnalyticsCallOptions): void;
 
 // @public

common/api-review/analytics.api.md

@@ -544,6 +544,7 @@ export interface ParsedToken {
     'firebase'?: {
         'sign_in_provider'?: string;
         'sign_in_second_factor'?: string;
+        'identities'?: Record<string, string>;
     };
     'iat'?: string;
     'sub'?: string;

common/api-review/auth.api.md

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

config/functions/package.json

@@ -16,25 +16,25 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "firebase": "9.0.2"
+    "firebase": "9.8.1"
   },
   "devDependencies": {
-    "@babel/core": "7.14.6",
-    "@babel/preset-env": "7.14.4",
-    "@types/chai": "4.2.18",
+    "@babel/core": "7.17.10",
+    "@babel/preset-env": "7.17.10",
+    "@types/chai": "4.3.1",
     "@types/mocha": "9.1.1",
-    "babel-loader": "8.0.5",
+    "babel-loader": "8.2.5",
     "chai": "4.3.6",
-    "karma": "6.3.16",
+    "karma": "6.3.19",
     "karma-chrome-launcher": "3.1.1",
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.34",
     "karma-typescript": "5.5.3",
     "karma-typescript-es6-transform": "5.5.3",
     "mocha": "9.2.2",
     "typescript": "4.3.4",
-    "webpack": "5.41.1",
+    "webpack": "5.72.1",
     "webpack-cli": "4.9.2",
-    "webpack-dev-server": "4.7.3"
+    "webpack-dev-server": "4.9.0"
   }
 }