Skip to content

Commit 1142982

Browse files
google-oss-botgoogle-oss-bot
authored
Merge master into release
2 parents c8f5ce9 + 6b8e0c1 commit 1142982

File tree

79 files changed

+2458
-208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+2458
-208
lines changed

‎.changeset/brave-ducks-relax.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@firebase/auth': minor
3+
'@firebase/auth-compat': minor
4+
---
5+
6+
[feature] Added Firebase App Check support to Firebase Auth.

‎.changeset/shaggy-zebras-leave.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@firebase/app-check': patch
3+
---
4+
5+
Catch all ReCAPTCHA errors and, if caught, prevent App Check from making a request to the exchange endpoint.

‎.changeset/smart-llamas-compete.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@firebase/auth': minor
3+
'firebase': minor
4+
---
5+
6+
[feature] Add reCAPTCHA enterprise support.

‎.changeset/three-months-lie.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@firebase/firestore": patch
3+
---
4+
5+
Fix a bug that sometimes prevented aggregations from being run when muli-tab persistence was enabled.

‎.github/workflows/canary-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
# Canary release script requires git history and tags.
1919
fetch-depth: 0
2020
- name: Set up Node (14)
21-
uses: actions/setup-node@v2
21+
uses: actions/setup-node@v3
2222
with:
2323
node-version: 14.x
2424
- name: Yarn install

‎.github/workflows/check-changeset.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
# This makes Actions fetch all Git history so check_changeset script can diff properly.
2222
fetch-depth: 0
2323
- name: Set up Node (14)
24-
uses: actions/setup-node@v2
24+
uses: actions/setup-node@v3
2525
with:
2626
node-version: 14.x
2727
- name: Yarn install

‎.github/workflows/check-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
# get all history for the diff
1515
fetch-depth: 0
1616
- name: Set up Node (14)
17-
uses: actions/setup-node@v2
17+
uses: actions/setup-node@v3
1818
with:
1919
node-version: 14.x
2020
- name: Yarn install

‎.github/workflows/check-pkg-paths.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
# This makes Actions fetch all Git history so run-changed script can diff properly.
1515
fetch-depth: 0
1616
- name: Set up Node (14)
17-
uses: actions/setup-node@v2
17+
uses: actions/setup-node@v3
1818
with:
1919
node-version: 14.x
2020
- name: Yarn install

‎.github/workflows/deploy-config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
# This makes Actions fetch all Git history so run-changed script can diff properly.
2222
fetch-depth: 0
2323
- name: Set up Node (14)
24-
uses: actions/setup-node@v2
24+
uses: actions/setup-node@v3
2525
with:
2626
node-version: 14.x
2727
- name: Yarn install

‎.github/workflows/e2e-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Checkout Repo
1919
uses: actions/checkout@master
2020
- name: Set up Node (14)
21-
uses: actions/setup-node@v2
21+
uses: actions/setup-node@master
2222
with:
2323
node-version: 14.x
2424
- name: install Chrome stable

‎.github/workflows/format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
# get all history for the diff
1919
fetch-depth: 0
2020
- name: Set up Node (14)
21-
uses: actions/setup-node@v2
21+
uses: actions/setup-node@v3
2222
with:
2323
node-version: 14.x
2424
- name: Yarn install

‎.github/workflows/health-metrics-pull-request.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323
if: github.event_name == 'push' || !(github.event.pull_request.head.repo.fork)
2424
runs-on: ubuntu-latest
2525
steps:
26-
- uses: actions/checkout@v2
27-
- uses: actions/setup-node@v2
26+
- uses: actions/checkout@v3
27+
- uses: actions/setup-node@v3
2828
with:
2929
node-version: 14.x
3030
- uses: 'google-github-actions/auth@v0'
@@ -40,8 +40,8 @@ jobs:
4040
if: github.event_name == 'push' || !(github.event.pull_request.head.repo.fork)
4141
runs-on: ubuntu-latest
4242
steps:
43-
- uses: actions/checkout@v2
44-
- uses: actions/setup-node@v2
43+
- uses: actions/checkout@v3
44+
- uses: actions/setup-node@v3
4545
with:
4646
node-version: 14.x
4747
- uses: 'google-github-actions/auth@v0'

‎.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ jobs:
88
runs-on: ubuntu-latest
99

1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v3
1212
- name: Set up Node (14)
13-
uses: actions/setup-node@v2
13+
uses: actions/setup-node@v3
1414
with:
1515
node-version: 14.x
1616
- name: yarn install

‎.github/workflows/prerelease-manual-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
# Canary release script requires git history and tags.
2222
fetch-depth: 0
2323
- name: Set up Node (14)
24-
uses: actions/setup-node@v2
24+
uses: actions/setup-node@v3
2525
with:
2626
node-version: 14.x
2727
- name: Yarn install

‎.github/workflows/release-prod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Set up Node (14)
22-
uses: actions/setup-node@v2
22+
uses: actions/setup-node@v3
2323
with:
2424
node-version: 14.x
2525
- name: Checkout release branch (with history)

‎.github/workflows/release-staging.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
if: github.event.inputs.release-branch == 'release' || endsWith(github.event.inputs.release-branch, '-releasebranch')
2626
steps:
2727
- name: Set up Node (14)
28-
uses: actions/setup-node@v2
28+
uses: actions/setup-node@v3
2929
with:
3030
node-version: 14.x
3131
- name: Merge master into release
@@ -132,14 +132,25 @@ jobs:
132132
-H "Authorization:Bearer $OSS_BOT_GITHUB_TOKEN" \
133133
-d "{\"event_type\":\"staging-tests\", \"client_payload\":{\"versionOrTag\":\"$VERSION_OR_TAG\"}}" \
134134
https://api.github.com/repos/firebase/firebase-js-sdk/dispatches
135+
- name: Check for changes requiring a reference doc publish
136+
id: docs-check
137+
run: git diff --exit-code origin/master HEAD docs-devsite
138+
- name: No diff, docs not needed
139+
if: ${{ success() }}
140+
run: echo "DOCS_NEEDED=false" >> $GITHUB_STATE
141+
- name: Diff returned something, docs are needed
142+
if: ${{ failure() }}
143+
run: echo "DOCS_NEEDED=true" >> $GITHUB_STATE
135144
- name: Log to release tracker
136145
# Sends release information to cloud functions endpoint of release tracker.
146+
if: ${{ always() }}
137147
run: |
138148
DATE=$(date +'%m/%d/%Y')
139149
BASE_VERSION=${{ steps.get-version.outputs.BASE_VERSION }}
140150
STAGING_VERSION=${{ steps.get-version.outputs.STAGING_VERSION }}
141151
OPERATOR=${{ github.actor }}
142152
RELEASE_TRACKER_URL=${{ secrets.RELEASE_TRACKER_URL }}
153+
DOCS_NEEDED=${{ steps.docs-check.outputs.DOCS_NEEDED }}
143154
curl -X POST -H "Content-Type:application/json" \
144-
-d "{\"version\":\"$BASE_VERSION\",\"tag\":\"$STAGING_VERSION\",\"date\":\"$DATE\",\"operator\":\"$OPERATOR\"}" \
155+
-d "{\"version\":\"$BASE_VERSION\",\"tag\":\"$STAGING_VERSION\",\"date\":\"$DATE\",\"operator\":\"$OPERATOR\",\"docs_needed\":\"$DOCS_NEEDED\"}" \
145156
$RELEASE_TRACKER_URL/logStaging

‎.github/workflows/test-all.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
run: |
2020
sudo apt-get update
2121
sudo apt-get install google-chrome-stable
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v3
2323
- name: Set up Node (16)
24-
uses: actions/setup-node@v2
24+
uses: actions/setup-node@v3
2525
with:
2626
node-version: 16.x
2727
- name: Bump Node memory limit

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
steps:
1515
# install Chrome first, so the correct version of webdriver can be installed by chromedriver when setting up the repo
1616
- name: install Chrome stable
17-
# Install Chrome version 110.0.5481.177-1 as test starts to fail on version 111.0.5563.64-1.
18-
# We will retry to use the latest, once Chrome releases stable version 112 (April 4 ETA).
17+
# Install Chrome version 110.0.5481.177-1 as test starts to fail on version 111.
18+
# We will retry to use the latest, once version 112 becomes stable.
1919
run: |
2020
sudo apt-get update
2121
sudo apt-get install wget
@@ -27,7 +27,7 @@ jobs:
2727
# This makes Actions fetch all Git history so run-changed script can diff properly.
2828
fetch-depth: 0
2929
- name: Set up Node (14)
30-
uses: actions/setup-node@v2
30+
uses: actions/setup-node@v3
3131
with:
3232
node-version: 14.x
3333
- name: Bump Node memory limit
@@ -58,7 +58,7 @@ jobs:
5858
# This makes Actions fetch all Git history so run-changed script can diff properly.
5959
fetch-depth: 0
6060
- name: Set up Node (14)
61-
uses: actions/setup-node@v2
61+
uses: actions/setup-node@v3
6262
with:
6363
node-version: 14.x
6464
- name: Bump Node memory limit

‎.github/workflows/test-changed-fcm-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
# This makes Actions fetch all Git history so run-changed script can diff properly.
2424
fetch-depth: 0
2525
- name: Set up Node (14)
26-
uses: actions/setup-node@v2
26+
uses: actions/setup-node@v3
2727
with:
2828
node-version: 14.x
2929
- name: Bump Node memory limit

‎.github/workflows/test-changed-firestore-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
# This makes Actions fetch all Git history so run-changed script can diff properly.
1515
fetch-depth: 0
1616
- name: Set up Node (14)
17-
uses: actions/setup-node@v2
17+
uses: actions/setup-node@v3
1818
with:
1919
node-version: 14.x
2020
- name: install Chrome stable

‎.github/workflows/test-changed-firestore.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
# This makes Actions fetch all Git history so run-changed script can diff properly.
1515
fetch-depth: 0
1616
- name: Set up Node (14)
17-
uses: actions/setup-node@v2
17+
uses: actions/setup-node@v3
1818
with:
1919
node-version: 14.x
2020
- name: install Chrome stable
@@ -50,7 +50,7 @@ jobs:
5050
# This makes Actions fetch all Git history so run-changed script can diff properly.
5151
fetch-depth: 0
5252
- name: Set up Node (14)
53-
uses: actions/setup-node@v2
53+
uses: actions/setup-node@v3
5454
with:
5555
node-version: 14.x
5656
- name: Bump Node memory limit

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
# This makes Actions fetch all Git history so run-changed script can diff properly.
1515
fetch-depth: 0
1616
- name: Set up Node (16)
17-
uses: actions/setup-node@v2
17+
uses: actions/setup-node@v3
1818
with:
1919
node-version: 16.x
2020
- name: install Chrome stable

‎.github/workflows/test-changed.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
# This makes Actions fetch all Git history so run-changed script can diff properly.
1515
fetch-depth: 0
1616
- name: Set up Node (14)
17-
uses: actions/setup-node@v2
17+
uses: actions/setup-node@v3
1818
with:
1919
node-version: 14.x
2020
- name: install Chrome stable
@@ -45,7 +45,7 @@ jobs:
4545
with:
4646
fetch-depth: 0
4747
- name: Set up Node (14)
48-
uses: actions/setup-node@v2
48+
uses: actions/setup-node@v3
4949
with:
5050
node-version: 14.x
5151
- name: install Firefox stable

‎.github/workflows/test-firebase-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
# This makes Actions fetch all Git history so run-changed script can diff properly.
1515
fetch-depth: 0
1616
- name: Set up Node (14)
17-
uses: actions/setup-node@v2
17+
uses: actions/setup-node@v3
1818
with:
1919
node-version: 14.x
2020
- name: install Chrome stable

‎.github/workflows/update-api-reports.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
uses: actions/checkout@master
1515
with:
1616
# checkout HEAD commit instead of merge commit
17-
ref: ${{ github.event.pull_request.head.sha }}
17+
ref: ${{ github.event.pull_request.head.ref }}
1818
token: ${{ github.token }}
1919
- name: Set up Node (14)
20-
uses: actions/setup-node@v2
20+
uses: actions/setup-node@v3
2121
with:
2222
node-version: 14.x
2323
- name: Yarn install

‎common/api-review/auth.api.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,14 @@ export const AuthErrorCodes: {
226226
readonly WEAK_PASSWORD: "auth/weak-password";
227227
readonly WEB_STORAGE_UNSUPPORTED: "auth/web-storage-unsupported";
228228
readonly ALREADY_INITIALIZED: "auth/already-initialized";
229+
readonly RECAPTCHA_NOT_ENABLED: "auth/recaptcha-not-enabled";
230+
readonly MISSING_RECAPTCHA_TOKEN: "auth/missing-recaptcha-token";
231+
readonly INVALID_RECAPTCHA_TOKEN: "auth/invalid-recaptcha-token";
232+
readonly INVALID_RECAPTCHA_ACTION: "auth/invalid-recaptcha-action";
233+
readonly MISSING_CLIENT_TYPE: "auth/missing-client-type";
234+
readonly MISSING_RECAPTCHA_VERSION: "auth/missing-recaptcha-version";
235+
readonly INVALID_RECAPTCHA_VERSION: "auth/invalid-recaptcha-version";
236+
readonly INVALID_REQ_TYPE: "auth/invalid-req-type";
229237
};
230238

231239
// @public
@@ -422,6 +430,9 @@ export const indexedDBLocalPersistence: Persistence;
422430
// @public
423431
export function initializeAuth(app: FirebaseApp, deps?: Dependencies): Auth;
424432

433+
// @public
434+
export function initializeRecaptchaConfig(auth: Auth): Promise<void>;
435+
425436
// @public
426437
export const inMemoryPersistence: Persistence;
427438

@@ -754,7 +765,7 @@ export interface TotpMultiFactorAssertion extends MultiFactorAssertion {
754765
export class TotpMultiFactorGenerator {
755766
static assertionForEnrollment(secret: TotpSecret, oneTimePassword: string): TotpMultiFactorAssertion;
756767
static assertionForSignIn(enrollmentId: string, oneTimePassword: string): TotpMultiFactorAssertion;
757-
static FACTOR_ID: "totp";
768+
static FACTOR_ID: 'totp';
758769
static generateSecret(session: MultiFactorSession): Promise<TotpSecret>;
759770
}
760771

0 commit comments

Comments
 (0)