Merge branch 'master' into mrschmidt/fixauth

firebase · Jun 9, 2021 · 79f0a00 · 79f0a00
2 parents 701ef07 + ed4f95c
commit 79f0a00
Show file tree

Hide file tree

Showing 82 changed files with 485 additions and 167 deletions.
diff --git a/.changeset/blue-hairs-scream.md b/.changeset/blue-hairs-scream.md
diff --git a/.changeset/fuzzy-teachers-guess.md b/.changeset/fuzzy-teachers-guess.md
diff --git a/.changeset/rotten-wombats-shop.md b/.changeset/rotten-wombats-shop.md
diff --git a/.changeset/twenty-scissors-exist.md b/.changeset/twenty-scissors-exist.md
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,6 +24,9 @@ jobs:
       - name: Install Dependencies
         run: yarn
 
+      - name: Add a changeset for @firebase/app
+        run: yarn ts-node-script scripts/add_changeset.ts
+
       - name: Create Release Pull Request
         uses: changesets/action@master
         env:

diff --git a/integration/compat-interop/package.json b/integration/compat-interop/package.json
@@ -1,29 +1,29 @@
 {
-    "name": "firebase-compat-interop-test",
-    "private": true,
-    "version": "0.1.0",
-    "scripts": {
-        "test": "karma start --single-run",
-        "test:ci": "node ../../scripts/run_tests_in_ci.js -s test",
-        "test:debug": "karma start --browsers Chrome --auto-watch"
-    },
-    "dependencies": {
-      "@firebase/app-exp": "0.0.900",
-      "@firebase/app-compat": "0.0.900",
-      "@firebase/analytics-exp": "0.0.900",
-      "@firebase/analytics-compat": "0.0.900",
-      "@firebase/auth-exp": "0.0.900",
-      "@firebase/auth-compat": "0.0.900",
-      "@firebase/functions-exp": "0.0.900",
-      "@firebase/functions-compat": "0.0.900",
-      "@firebase/messaging-exp": "0.0.900",
-      "@firebase/messaging-compat": "0.0.900",
-      "@firebase/performance-exp": "0.0.900",
-      "@firebase/performance-compat": "0.0.900",
-      "@firebase/remote-config-exp": "0.0.900",
-      "@firebase/remote-config-compat": "0.0.900"
-    },
-    "devDependencies": {
-      "typescript": "4.2.2"
-    }
-  }
+  "name": "firebase-compat-interop-test",
+  "private": true,
+  "version": "0.1.0",
+  "scripts": {
+    "test": "karma start --single-run",
+    "test:ci": "node ../../scripts/run_tests_in_ci.js -s test",
+    "test:debug": "karma start --browsers Chrome --auto-watch"
+  },
+  "dependencies": {
+    "@firebase/app-exp": "0.0.900",
+    "@firebase/app-compat": "0.0.900",
+    "@firebase/analytics-exp": "0.0.900",
+    "@firebase/analytics-compat": "0.0.900",
+    "@firebase/auth-exp": "0.0.900",
+    "@firebase/auth-compat": "0.0.900",
+    "@firebase/functions-exp": "0.0.900",
+    "@firebase/functions-compat": "0.0.900",
+    "@firebase/messaging-exp": "0.0.900",
+    "@firebase/messaging-compat": "0.0.900",
+    "@firebase/performance-exp": "0.0.900",
+    "@firebase/performance-compat": "0.0.900",
+    "@firebase/remote-config-exp": "0.0.900",
+    "@firebase/remote-config-compat": "0.0.900"
+  },
+  "devDependencies": {
+    "typescript": "4.2.2"
+  }
+}
diff --git a/integration/firebase/package.json b/integration/firebase/package.json
@@ -7,7 +7,7 @@
     "test:ci": "node ../../scripts/run_tests_in_ci.js -s test"
   },
   "devDependencies": {
-    "firebase": "8.6.2",
+    "firebase": "8.6.5",
     "@types/chai": "4.2.14",
     "@types/mocha": "7.0.2",
     "chai": "4.2.0",

diff --git a/integration/firestore/package.json b/integration/firestore/package.json
@@ -14,8 +14,8 @@
     "test:memory:debug": "yarn build:memory; karma start --auto-watch --browsers Chrome"
   },
   "devDependencies": {
-    "@firebase/app": "0.6.22",
-    "@firebase/firestore": "2.3.1",
+    "@firebase/app": "0.6.24",
+    "@firebase/firestore": "2.3.4",
     "@types/mocha": "7.0.2",
     "gulp": "4.0.2",
     "gulp-filter": "6.0.0",

diff --git a/integration/messaging/package.json b/integration/messaging/package.json
@@ -9,7 +9,7 @@
     "test:manual": "mocha --exit"
   },
   "devDependencies": {
-    "firebase": "8.6.2",
+    "firebase": "8.6.5",
     "chai": "4.2.0",
     "chromedriver": "89.0.0",
     "express": "4.17.1",

diff --git a/packages-exp/analytics-compat/package.json b/packages-exp/analytics-compat/package.json
@@ -44,7 +44,7 @@
   },
   "typings": "dist/src/index.d.ts",
   "dependencies": {
-    "@firebase/component": "0.5.0",
+    "@firebase/component": "0.5.1",
     "@firebase/analytics-exp": "0.0.900",
     "@firebase/analytics-types": "0.4.0",
     "@firebase/util": "1.1.0",

diff --git a/packages-exp/analytics-exp/package.json b/packages-exp/analytics-exp/package.json
@@ -35,7 +35,7 @@
     "@firebase/installations-exp": "0.0.900",
     "@firebase/logger": "0.2.6",
     "@firebase/util": "1.1.0",
-    "@firebase/component": "0.5.0",
+    "@firebase/component": "0.5.1",
     "tslib": "^2.1.0"
   },
   "license": "Apache-2.0",

diff --git a/packages-exp/app-compat/package.json b/packages-exp/app-compat/package.json
@@ -31,7 +31,7 @@
     "@firebase/app-exp": "0.0.900",
     "@firebase/util": "1.1.0",
     "@firebase/logger": "0.2.6",
-    "@firebase/component": "0.5.0",
+    "@firebase/component": "0.5.1",
     "tslib": "^2.1.0",
     "dom-storage": "2.1.0",
     "xmlhttprequest": "1.8.0"

diff --git a/packages-exp/app-exp/package.json b/packages-exp/app-exp/package.json
@@ -32,7 +32,7 @@
   "dependencies": {
     "@firebase/util": "1.1.0",
     "@firebase/logger": "0.2.6",
-    "@firebase/component": "0.5.0",
+    "@firebase/component": "0.5.1",
     "tslib": "^2.1.0"
   },
   "license": "Apache-2.0",

diff --git a/packages-exp/auth-compat-exp/package.json b/packages-exp/auth-compat-exp/package.json
@@ -34,7 +34,7 @@
   "dependencies": {
     "@firebase/auth-exp": "0.0.900",
     "@firebase/auth-types": "0.10.3",
-    "@firebase/component": "0.5.0",
+    "@firebase/component": "0.5.1",
     "@firebase/util": "1.1.0",
     "node-fetch": "2.6.1",
     "selenium-webdriver": "^4.0.0-beta.2",

diff --git a/packages-exp/auth-exp/package.json b/packages-exp/auth-exp/package.json
@@ -51,7 +51,7 @@
     "@firebase/app-exp": "0.x"
   },
   "dependencies": {
-    "@firebase/component": "0.5.0",
+    "@firebase/component": "0.5.1",
     "@firebase/logger": "0.2.6",
     "@firebase/util": "1.1.0",
     "node-fetch": "2.6.1",

diff --git a/packages-exp/auth-exp/src/api/authentication/mfa.test.ts b/packages-exp/auth-exp/src/api/authentication/mfa.test.ts
@@ -158,7 +158,7 @@ describe('api/authentication/finalizeSignInPhoneMfa', () => {
 
     await expect(finalizeSignInPhoneMfa(auth, request)).to.be.rejectedWith(
       FirebaseError,
-      'Firebase: The SMS verification code used to create the phone auth credential is invalid. Please resend the verification code sms and be sure use the verification code provided by the user. (auth/invalid-verification-code).'
+      'Firebase: The SMS verification code used to create the phone auth credential is invalid. Please resend the verification code sms and be sure to use the verification code provided by the user. (auth/invalid-verification-code).'
     );
     expect(mock.calls[0].request).to.eql({
       tenantId: null,

diff --git a/packages-exp/auth-exp/src/api/authentication/sms.test.ts b/packages-exp/auth-exp/src/api/authentication/sms.test.ts
@@ -154,7 +154,7 @@ describe('api/authentication/signInWithPhoneNumber', () => {
 
     await expect(signInWithPhoneNumber(auth, request)).to.be.rejectedWith(
       FirebaseError,
-      'Firebase: The SMS verification code used to create the phone auth credential is invalid. Please resend the verification code sms and be sure use the verification code provided by the user. (auth/invalid-verification-code).'
+      'Firebase: The SMS verification code used to create the phone auth credential is invalid. Please resend the verification code sms and be sure to use the verification code provided by the user. (auth/invalid-verification-code).'
     );
     expect(mock.calls[0].request).to.eql(request);
   });
@@ -222,7 +222,7 @@ describe('api/authentication/linkWithPhoneNumber', () => {
 
     await expect(linkWithPhoneNumber(auth, request)).to.be.rejectedWith(
       FirebaseError,
-      'Firebase: The SMS verification code used to create the phone auth credential is invalid. Please resend the verification code sms and be sure use the verification code provided by the user. (auth/invalid-verification-code).'
+      'Firebase: The SMS verification code used to create the phone auth credential is invalid. Please resend the verification code sms and be sure to use the verification code provided by the user. (auth/invalid-verification-code).'
     );
     expect(mock.calls[0].request).to.eql(request);
   });

diff --git a/packages-exp/auth-exp/src/core/errors.ts b/packages-exp/auth-exp/src/core/errors.ts
@@ -186,7 +186,7 @@ function _debugErrorMap(): ErrorMap<AuthErrorCode> {
     [AuthErrorCode.INVALID_AUTH_EVENT]: 'An internal AuthError has occurred.',
     [AuthErrorCode.INVALID_CODE]:
       'The SMS verification code used to create the phone auth credential is ' +
-      'invalid. Please resend the verification code sms and be sure use the ' +
+      'invalid. Please resend the verification code sms and be sure to use the ' +
       'verification code provided by the user.',
     [AuthErrorCode.INVALID_CONTINUE_URI]:
       'The continue URL provided in the request is invalid.',

diff --git a/packages-exp/auth-exp/src/core/strategies/anonymous.ts b/packages-exp/auth-exp/src/core/strategies/anonymous.ts
@@ -34,6 +34,7 @@ import { _castAuth } from '../auth/auth_impl';
  */
 export async function signInAnonymously(auth: Auth): Promise<UserCredential> {
   const authInternal = _castAuth(auth);
+  await authInternal._initializationPromise;
   if (authInternal.currentUser?.isAnonymous) {
     // If an anonymous user is already signed in, no need to sign them in again.
     return new UserCredentialImpl({

diff --git a/packages-exp/auth-exp/test/integration/webdriver/anonymous.test.ts b/packages-exp/auth-exp/test/integration/webdriver/anonymous.test.ts
@@ -52,4 +52,19 @@ browserDescribe('WebDriver anonymous auth test', driver => {
     );
     expect(after.uid).to.eq(before.uid);
   });
+
+  it('user persists after refresh and sign in (no init wait)', async () => {
+    const { user: before }: UserCredential = await driver.call(
+      AnonFunction.SIGN_IN_ANONYMOUSLY
+    );
+    await driver.webDriver.navigate().refresh();
+    await driver.injectConfigAndInitAuth();
+
+    // At this point we aren't waiting for auth to "settle"
+    // Sign in before the first onAuthStateChanged has occurred
+    const { user: after }: UserCredential = await driver.call(
+      AnonFunction.SIGN_IN_ANONYMOUSLY
+    );
+    expect(after.uid).to.eq(before.uid);
+  });
 });
diff --git a/packages-exp/firebase-exp/package.json b/packages-exp/firebase-exp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "firebase-exp",
-  "version": "9.0.0-beta.2",
+  "version": "9.0.0-beta.3",
   "private": true,
   "description": "Firebase JavaScript library for web and Node.js",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
@@ -129,11 +129,11 @@
     "@firebase/app-compat": "0.0.900",
     "@firebase/auth-exp": "0.0.900",
     "@firebase/auth-compat": "0.0.900",
-    "@firebase/database": "0.10.1",
+    "@firebase/database": "0.10.3",
     "@firebase/functions-exp": "0.0.900",
     "@firebase/functions-compat": "0.0.900",
-    "@firebase/firestore": "2.3.1",
-    "@firebase/storage": "0.5.2",
+    "@firebase/firestore": "2.3.4",
+    "@firebase/storage": "0.5.3",
     "@firebase/performance-exp": "0.0.900",
     "@firebase/performance-compat": "0.0.900",
     "@firebase/remote-config-exp": "0.0.900",

diff --git a/packages-exp/functions-compat/package.json b/packages-exp/functions-compat/package.json
@@ -47,7 +47,7 @@
   },
   "typings": "dist/src/index.d.ts",
   "dependencies": {
-    "@firebase/component": "0.5.0",
+    "@firebase/component": "0.5.1",
     "@firebase/functions-exp": "0.0.900",
     "@firebase/functions-types": "0.4.0",
     "@firebase/messaging-types": "0.5.0",

diff --git a/packages-exp/functions-exp/package.json b/packages-exp/functions-exp/package.json
@@ -50,7 +50,7 @@
   },
   "typings": "dist/functions-exp-public.d.ts",
   "dependencies": {
-    "@firebase/component": "0.5.0",
+    "@firebase/component": "0.5.1",
     "@firebase/messaging-types": "0.5.0",
     "@firebase/util": "1.1.0",
     "node-fetch": "2.6.1",

diff --git a/packages-exp/functions-exp/src/serializer.test.ts b/packages-exp/functions-exp/src/serializer.test.ts
@@ -82,6 +82,18 @@ describe('Serializer', () => {
     expect(decode('hello')).to.equal('hello');
   });
 
+  it('encodes date to ISO string', () => {
+    expect(encode(new Date(1620666095891))).to.equal(
+      '2021-05-10T17:01:35.891Z'
+    );
+  });
+
+  it('decodes date string without modifying it', () => {
+    expect(decode('2021-05-10T17:01:35.891Z')).to.equal(
+      '2021-05-10T17:01:35.891Z'
+    );
+  });
+
   // TODO(klimt): Make this test more interesting once we have a complex type
   // that can be created in JavaScript.
   it('encodes array', () => {
@@ -111,12 +123,14 @@ describe('Serializer', () => {
       encode({
         foo: 1,
         bar: 'hello',
-        baz: [1, 2, 3]
+        baz: [1, 2, 3],
+        date: new Date(1620666095891)
       })
     ).to.deep.equal({
       foo: 1,
       bar: 'hello',
-      baz: [1, 2, 3]
+      baz: [1, 2, 3],
+      date: '2021-05-10T17:01:35.891Z'
     });
   });
 
@@ -132,12 +146,14 @@ describe('Serializer', () => {
             value: '1099511627776',
             '@type': 'type.googleapis.com/google.protobuf.Int64Value'
           }
-        ]
+        ],
+        date: '2021-05-10T17:01:35.891Z'
       })
     ).to.deep.equal({
       foo: 1,
       bar: 'hello',
-      baz: [1, 2, 1099511627776]
+      baz: [1, 2, 1099511627776],
+      date: '2021-05-10T17:01:35.891Z'
     });
   });
 

diff --git a/packages-exp/functions-exp/src/serializer.ts b/packages-exp/functions-exp/src/serializer.ts
@@ -56,6 +56,9 @@ export function encode(data: unknown): unknown {
   if (Object.prototype.toString.call(data) === '[object String]') {
     return data;
   }
+  if (data instanceof Date) {
+    return data.toISOString();
+  }
   if (Array.isArray(data)) {
     return data.map(x => encode(x));
   }

diff --git a/packages-exp/installations-compat/package.json b/packages-exp/installations-compat/package.json
@@ -52,7 +52,7 @@
     "@firebase/installations-exp": "0.0.900",
     "@firebase/installations-types": "0.3.4",
     "@firebase/util": "1.1.0",
-    "@firebase/component": "0.5.0",
+    "@firebase/component": "0.5.1",
     "idb": "3.0.2",
     "tslib": "^2.1.0"
   },

diff --git a/packages-exp/installations-exp/package.json b/packages-exp/installations-exp/package.json
@@ -56,7 +56,7 @@
   },
   "dependencies": {
     "@firebase/util": "1.1.0",
-    "@firebase/component": "0.5.0",
+    "@firebase/component": "0.5.1",
     "idb": "3.0.2",
     "tslib": "^2.1.0"
   },

diff --git a/packages-exp/messaging-compat/package.json b/packages-exp/messaging-compat/package.json
@@ -25,14 +25,14 @@
     "test:karma": "karma start --single-run",
     "test:debug": "karma start --browsers=Chrome --auto-watch",
     "type-check": "tsc --noEmit",
-    "add-compat-overloads": "ts-node-script ../../scripts/exp/create-overloads.ts -i ../messaging-exp/dist/messaging-exp-public.d.ts -o dist/src/index.d.ts -a -r FirebaseMessaging:MessagingCompat -r FirebaseApp:FirebaseAppCompat --moduleToEnhance @firebase/messaging"
+    "add-compat-overloads": "ts-node-script ../../scripts/exp/create-overloads.ts -i ../messaging-exp/dist/index-public.d.ts -o dist/src/index.d.ts -a -r FirebaseMessaging:MessagingCompat -r FirebaseApp:FirebaseAppCompat --moduleToEnhance @firebase/messaging"
   },
   "peerDependencies": {
     "@firebase/app-compat": "0.x"
   },
   "dependencies": {
     "@firebase/messaging-exp": "0.0.900",
-    "@firebase/component": "0.5.0",
+    "@firebase/component": "0.5.1",
     "@firebase/installations-exp": "0.0.900",
     "@firebase/util": "1.1.0",
     "tslib": "^2.1.0"

diff --git a/packages-exp/messaging-exp/api-extractor.json b/packages-exp/messaging-exp/api-extractor.json
@@ -8,8 +8,15 @@
   }],
   "dtsRollup": {
     /** 
-     * rollup is not supported when multiple entry points are present
+     * rollup is not supported when multiple entry points are present.
+     * npm script api-report:rollup is used to generate dts rollup.
      */
     "enabled": false
-  }
+  },
+  "apiReport": {
+    /**
+     * apiReport is handled by npm script api-report:rollup
+     */
+    "enabled": false
+}
 }