Merge master into release

Author: google-oss-bot

.changeset/nervous-starfishes-crash.md

@@ -0,0 +1,5 @@
+---
+'@firebase/rules-unit-testing': patch
+---
+
+Add Node ESM build to rules-unit-testing.

.changeset/rotten-tables-brush.md

@@ -0,0 +1,5 @@
+---
+"@firebase/database": patch
+---
+
+Fixed issue where `get()` saved results incorrectly for non-default queries.

.changeset/sharp-rules-enjoy.md

@@ -0,0 +1,5 @@
+---
+'@firebase/analytics': patch
+---
+
+Fix typo in GtagConfigParams

.changeset/tame-rice-peel.md

@@ -0,0 +1,7 @@
+---
+"@firebase/app-check": patch
+"@firebase/database": patch
+"@firebase/util": patch
+---
+
+Extract uuid function into @firebase/util

.github/workflows/e2e-test.yml

@@ -61,6 +61,7 @@ jobs:
         env:
           WEBHOOK_URL: ${{ secrets.JSCORE_CHAT_WEBHOOK_URL }}
           RELEASE_TRACKER_URL: ${{ secrets.RELEASE_TRACKER_URL }}
+          VERSION_OR_TAG: ${{ github.event.client_payload.versionOrTag }}
         # run in root
         working-directory: '.'
       - name: Tests failed
@@ -69,5 +70,6 @@ jobs:
         env:
           WEBHOOK_URL: ${{ secrets.JSCORE_CHAT_WEBHOOK_URL }}
           RELEASE_TRACKER_URL: ${{ secrets.RELEASE_TRACKER_URL }}
+          VERSION_OR_TAG: ${{ github.event.client_payload.versionOrTag }}
         # run in root
         working-directory: '.'

.vscode/launch.json

@@ -8,14 +8,15 @@
       "type": "node",
       "request": "launch",
       "name": "RTDB Unit Tests (Node)",
-      "program": "${workspaceRoot}/packages/firebase/node_modules/.bin/_mocha",
+      "program": "${workspaceRoot}/node_modules/.bin/_mocha",
       "cwd": "${workspaceRoot}/packages/database",
       "args": [
         "test/{,!(browser)/**/}*.test.ts",
-        "--file", "index.node.ts",
-        "--config", "../../config/mocharc.node.js"
+        "--file", "src/index.node.ts",
+        "--config", "../../config/mocharc.node.js",
       ],
       "env": {
+        "TS_NODE_FILES":true,
         "TS_NODE_CACHE": "NO",
         "TS_NODE_COMPILER_OPTIONS" : "{\"module\":\"commonjs\"}"
       },
@@ -30,7 +31,7 @@
       "cwd": "${workspaceRoot}/packages/firestore",
       "args": [
         "--require", "babel-register.js",
-        "--require", "index.node.ts",
+        "--require", "src/index.node.ts",
         "--timeout", "5000",
         "test/{,!(browser|integration)/**/}*.test.ts",
         "--exit"

common/api-review/analytics.api.md

@@ -121,10 +121,10 @@ export function getAnalytics(app?: FirebaseApp): Analytics;
 
 // @public
 export interface GtagConfigParams {
-    'allow_google_signals?': boolean;
     // (undocumented)
     [key: string]: unknown;
     'allow_ad_personalization_signals'?: boolean;
+    'allow_google_signals'?: boolean;
     'cookie_domain'?: string;
     'cookie_expires'?: number;
     'cookie_flags'?: string;

common/api-review/util.api.md

@@ -422,6 +422,9 @@ export interface Subscribe<T> {
 // @public (undocumented)
 export type Unsubscribe = () => void;
 
+// @public
+export const uuidv4: () => string;
+
 // Warning: (ae-missing-release-tag) "validateArgCount" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public

packages/analytics/src/get-config.ts

@@ -188,7 +188,9 @@ async function attemptFetchDynamicConfigWithRetry(
       logger.warn(
         `Timed out fetching this Firebase app's measurement ID from the server.` +
           ` Falling back to the measurement ID ${measurementId}` +
-          ` provided in the "measurementId" field in the local Firebase config. [${e.message}]`
+          ` provided in the "measurementId" field in the local Firebase config. [${
+            (e as Error)?.message
+          }]`
       );
       return { appId, measurementId };
     }
@@ -203,13 +205,14 @@ async function attemptFetchDynamicConfigWithRetry(
 
     return response;
   } catch (e) {
-    if (!isRetriableError(e)) {
+    const error = e as Error;
+    if (!isRetriableError(error)) {
       retryData.deleteThrottleMetadata(appId);
       if (measurementId) {
         logger.warn(
           `Failed to fetch this Firebase app's measurement ID from the server.` +
             ` Falling back to the measurement ID ${measurementId}` +
-            ` provided in the "measurementId" field in the local Firebase config. [${e.message}]`
+            ` provided in the "measurementId" field in the local Firebase config. [${error?.message}]`
         );
         return { appId, measurementId };
       } else {
@@ -218,7 +221,7 @@ async function attemptFetchDynamicConfigWithRetry(
     }
 
     const backoffMillis =
-      Number(e.customData.httpStatus) === 503
+      Number(error?.customData?.httpStatus) === 503
         ? calculateBackoffMillis(
             backoffCount,
             retryData.intervalMillis,

packages/analytics/src/initialize-analytics.ts

@@ -43,7 +43,7 @@ async function validateIndexedDB(): Promise<boolean> {
     } catch (e) {
       logger.warn(
         ERROR_FACTORY.create(AnalyticsError.INDEXEDDB_UNAVAILABLE, {
-          errorInfo: e
+          errorInfo: (e as Error)?.toString()
         }).message
       );
       return false;

packages/analytics/src/public-types.ts

@@ -70,7 +70,7 @@ export interface GtagConfigParams {
    * If set to false, disables all advertising features with `gtag.js`.
    * See {@link https://developers.google.com/analytics/devguides/collection/ga4/display-features | Disable advertising features }
    */
-  'allow_google_signals?': boolean;
+  'allow_google_signals'?: boolean;
   /**
    * If set to false, disables all advertising personalization with `gtag.js`.
    * See {@link https://developers.google.com/analytics/devguides/collection/ga4/display-features | Disable advertising features }

packages/app-check/src/storage.ts

@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 
-import { uuidv4 } from './util';
 import { FirebaseApp } from '@firebase/app';
-import { isIndexedDBAvailable } from '@firebase/util';
+import { isIndexedDBAvailable, uuidv4 } from '@firebase/util';
 import {
   readDebugTokenFromIndexedDB,
   readTokenFromIndexedDB,

packages/app-check/src/util.ts

@@ -37,17 +37,6 @@ export function ensureActivated(app: FirebaseApp): void {
   }
 }
 
-/**
- * Copied from https://stackoverflow.com/a/2117523
- */
-export function uuidv4(): string {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
-    const r = (Math.random() * 16) | 0,
-      v = c === 'x' ? r : (r & 0x3) | 0x8;
-    return v.toString(16);
-  });
-}
-
 export function getDurationString(durationInMillis: number): string {
   const totalSeconds = Math.round(durationInMillis / 1000);
   const days = Math.floor(totalSeconds / (3600 * 24));

packages/auth-compat/src/user_credential.ts

@@ -33,7 +33,7 @@ function attachExtraErrorFields(auth: exp.Auth, e: FirebaseError): void {
   // actually match the underlying type
   const response = (e.customData as exp.TaggedWithTokenResponse | undefined)
     ?._tokenResponse as unknown as Record<string, string>;
-  if (e.code === 'auth/multi-factor-auth-required') {
+  if ((e as FirebaseError)?.code === 'auth/multi-factor-auth-required') {
     const mfaErr = e as compat.MultiFactorError;
     mfaErr.resolver = new MultiFactorResolver(
       auth,

packages/auth/src/core/auth/auth_impl.ts

@@ -35,6 +35,7 @@ import {
 import {
   createSubscribe,
   ErrorFactory,
+  FirebaseError,
   getModularInstance,
   Observer,
   Subscribe
@@ -301,7 +302,7 @@ export class AuthImpl implements AuthInternal, _FirebaseService {
     try {
       await _reloadWithoutSaving(user);
     } catch (e) {
-      if (e.code !== `auth/${AuthErrorCode.NETWORK_REQUEST_FAILED}`) {
+      if ((e as FirebaseError)?.code !== `auth/${AuthErrorCode.NETWORK_REQUEST_FAILED}`) {
         // Something's wrong with the user's token. Log them out and remove
         // them from storage
         return this.directlySetCurrentUser(null);

packages/auth/src/core/user/id_token_result.ts

@@ -110,7 +110,7 @@ export function _parseToken(token: string): ParsedToken | null {
     }
     return JSON.parse(decoded);
   } catch (e) {
-    _logError('Caught error parsing JWT payload as JSON', e);
+    _logError('Caught error parsing JWT payload as JSON', (e as Error)?.toString());
     return null;
   }
 }

packages/auth/src/core/user/proactive_refresh.ts

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+import { FirebaseError } from '@firebase/util';
 import { UserInternal } from '../../model/user';
 import { AuthErrorCode } from '../errors';
 
@@ -92,7 +93,7 @@ export class ProactiveRefresh {
       await this.user.getIdToken(true);
     } catch (e) {
       // Only retry on network errors
-      if (e.code === `auth/${AuthErrorCode.NETWORK_REQUEST_FAILED}`) {
+      if ((e as FirebaseError)?.code === `auth/${AuthErrorCode.NETWORK_REQUEST_FAILED}`) {
         this.schedule(/* wasError */ true);
       }
 

packages/auth/src/core/user/reauthenticate.ts

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+import { FirebaseError } from '@firebase/util';
 import { _processCredentialSavingMfaContextIfNecessary } from '../../mfa/mfa_error';
 import { OperationType } from '../../model/enums';
 import { UserInternal } from '../../model/user';
@@ -54,7 +55,7 @@ export async function _reauthenticate(
     return UserCredentialImpl._forOperation(user, operationType, response);
   } catch (e) {
     // Convert user deleted error into user mismatch
-    if (e?.code === `auth/${AuthErrorCode.USER_DELETED}`) {
+    if ((e as FirebaseError)?.code === `auth/${AuthErrorCode.USER_DELETED}`) {
       _fail(auth, AuthErrorCode.USER_MISMATCH);
     }
     throw e;

packages/auth/src/mfa/mfa_user.ts

@@ -29,7 +29,7 @@ import { UserInternal } from '../model/user';
 import { MultiFactorAssertionImpl } from './mfa_assertion';
 import { MultiFactorInfoImpl } from './mfa_info';
 import { MultiFactorSessionImpl } from './mfa_session';
-import { getModularInstance } from '@firebase/util';
+import { FirebaseError, getModularInstance } from '@firebase/util';
 
 export class MultiFactorUserImpl implements MultiFactorUser {
   enrolledFactors: MultiFactorInfo[] = [];
@@ -94,7 +94,7 @@ export class MultiFactorUserImpl implements MultiFactorUser {
     try {
       await this.user.reload();
     } catch (e) {
-      if (e.code !== `auth/${AuthErrorCode.TOKEN_EXPIRED}`) {
+      if ((e as FirebaseError)?.code !== `auth/${AuthErrorCode.TOKEN_EXPIRED}`) {
         throw e;
       }
     }

packages/auth/src/platform_browser/providers/phone.ts

@@ -179,7 +179,7 @@ export class PhoneAuthProvider {
    *       auth.currentUser,
    *       PhoneAuthProvider.credential(verificationId, code));
    * } catch (e) {
-   *   if (e.code === 'auth/account-exists-with-different-credential') {
+   *   if ((e as FirebaseError)?.code === 'auth/account-exists-with-different-credential') {
    *     const cred = PhoneAuthProvider.credentialFromError(e);
    *     await linkWithCredential(auth.currentUser, cred);
    *   }

packages/database/package.json

@@ -56,7 +56,8 @@
     "@firebase/app": "0.7.26",
     "rollup": "2.72.1",
     "rollup-plugin-typescript2": "0.31.2",
-    "typescript": "4.2.2"
+    "typescript": "4.2.2",
+    "uuid": "^8.3.2"
   },
   "repository": {
     "directory": "packages/database",

packages/database/src/core/PersistentConnection.ts

@@ -206,12 +206,6 @@ export class PersistentConnection extends ServerActions {
       onComplete: (message: { [k: string]: unknown }) => {
         const payload = message['d'] as string;
         if (message['s'] === 'ok') {
-          this.onDataUpdate_(
-            request['p'],
-            payload,
-            /*isMerge*/ false,
-            /*tag*/ null
-          );
           deferred.resolve(payload);
         } else {
           deferred.reject(payload);
@@ -265,7 +259,7 @@ export class PersistentConnection extends ServerActions {
     );
     assert(
       !this.listens.get(pathString)!.has(queryId),
-      'listen() called twice for same path/queryId.'
+      `listen() called twice for same path/queryId.`
     );
     const listenSpec: ListenSpec = {
       onComplete,

packages/database/src/core/Repo.ts

@@ -60,7 +60,8 @@ import {
   syncTreeApplyUserOverwrite,
   syncTreeCalcCompleteEventCache,
   syncTreeGetServerValue,
-  syncTreeRemoveEventRegistration
+  syncTreeRemoveEventRegistration,
+  syncTreeRegisterQuery
 } from './SyncTree';
 import { Indexable } from './util/misc';
 import {
@@ -466,16 +467,36 @@ export function repoGetValue(repo: Repo, query: QueryContext): Promise<Node> {
   }
   return repo.server_.get(query).then(
     payload => {
-      const node = nodeFromJSON(payload as string).withIndex(
+      const node = nodeFromJSON(payload).withIndex(
         query._queryParams.getIndex()
       );
-      const events = syncTreeApplyServerOverwrite(
+      // if this is a filtered query, then overwrite at path
+      if (query._queryParams.loadsAllData()) {
+        syncTreeApplyServerOverwrite(repo.serverSyncTree_, query._path, node);
+      } else {
+        // Simulate `syncTreeAddEventRegistration` without events/listener setup.
+        // We do this (along with the syncTreeRemoveEventRegistration` below) so that
+        // `repoGetValue` results have the same cache effects as initial listener(s)
+        // updates.
+        const tag = syncTreeRegisterQuery(repo.serverSyncTree_, query);
+        syncTreeApplyTaggedQueryOverwrite(
+          repo.serverSyncTree_,
+          query._path,
+          node,
+          tag
+        );
+        // Call `syncTreeRemoveEventRegistration` with a null event registration, since there is none.
+        // Note: The below code essentially unregisters the query and cleans up any views/syncpoints temporarily created above.
+      }
+      const cancels = syncTreeRemoveEventRegistration(
         repo.serverSyncTree_,
-        query._path,
-        node
+        query,
+        null
       );
-      eventQueueRaiseEventsAtPath(repo.eventQueue_, query._path, events);
-      return Promise.resolve(node);
+      if (cancels.length > 0) {
+        repoLog(repo, 'unexpected cancel events in repoGetValue');
+      }
+      return node;
     },
     err => {
       repoLog(repo, 'get for query ' + stringify(query) + ' failed: ' + err);