Merge branch 'master' into fei-firestore-wait

Author: Feiyang1

.changeset/clever-icons-leave.md

@@ -0,0 +1,7 @@
+---
+"@firebase/database": minor
+"firebase": minor
+"@firebase/util": minor
+---
+
+Add mockUserToken support for database emulator.

.changeset/friendly-cooks-tan.md

@@ -55,12 +55,12 @@ packages/messaging-types @zwu52 @chliangGoogle @ciarand @firebase/jssdk-global-a
 integration/messaging @zwu52 @chliangGoogle @ciarand @firebase/jssdk-global-approvers
 
 # Auth Code
-packages/auth  @bojeil-google @avolkovi @samhorlbeck @yuchenshi @firebase/jssdk-global-approvers
-packages/auth-types  @bojeil-google @avolkovi @samhorlbeck @yuchenshi @firebase/jssdk-global-approvers
+packages/auth  @bojeil-google @avolkovi @sam-gc @yuchenshi @firebase/jssdk-global-approvers
+packages/auth-types  @bojeil-google @avolkovi @sam-gc @yuchenshi @firebase/jssdk-global-approvers
 
 # Testing Code
-packages/testing  @avolkovi @samhorlbeck @yuchenshi @firebase/jssdk-global-approvers
-packages/rules-unit-testing  @avolkovi @samhorlbeck @yuchenshi @firebase/jssdk-global-approvers
+packages/testing  @avolkovi @sam-gc @yuchenshi @firebase/jssdk-global-approvers
+packages/rules-unit-testing  @avolkovi @sam-gc @yuchenshi @firebase/jssdk-global-approvers
 
 # RxFire Code
 packages/rxfire @davideast @jamesdaniels @firebase/jssdk-global-approvers
@@ -89,8 +89,8 @@ scripts/docgen/content-sources/ @firebase/firebase-techwriters @firebase/jssdk-g
 .changeset @firebase/firebase-techwriters @firebase/jssdk-changeset-approvers @firebase/firestore-js-team @firebase/jssdk-global-approvers
 
 # Auth-Exp Code
-packages-exp/auth-exp  @avolkovi @samhorlbeck @yuchenshi @firebase/jssdk-global-approvers
-packages-exp/auth-compat-exp @avolkovi @samhorlbeck @yuchenshi @firebase/jssdk-global-approvers
+packages-exp/auth-exp  @avolkovi @sam-gc @yuchenshi @firebase/jssdk-global-approvers
+packages-exp/auth-compat-exp @avolkovi @sam-gc @yuchenshi @firebase/jssdk-global-approvers
 
 # Installations-Exp Code
 packages/installations-exp @andirayo @ChaoqunCHEN @firebase/jssdk-global-approvers

.changeset/loud-feet-jump.md

@@ -4,9 +4,10 @@
 
 ```ts
 
+import { EmulatorMockTokenOptions } from '@firebase/util';
 import { FirebaseApp } from '@firebase/app';
 
-// @public (undocumented)
+// @public
 export function child(parent: Reference, path: string): Reference;
 
 // @public
@@ -229,7 +230,9 @@ export type Unsubscribe = () => void;
 export function update(ref: Reference, values: object): Promise<void>;
 
 // @public
-export function useDatabaseEmulator(db: FirebaseDatabase, host: string, port: number): void;
+export function useDatabaseEmulator(db: FirebaseDatabase, host: string, port: number, options?: {
+    mockUserToken?: EmulatorMockTokenOptions;
+}): void;
 
 
 ```

.github/CODEOWNERS

@@ -4,6 +4,7 @@
 
 ```ts
 
+import { AppCheckInternalComponentName } from '@firebase/app-check-interop-types';
 import { CompleteFn } from '@firebase/util';
 import { FirebaseApp } from '@firebase/app';
 import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';

.github/ISSUE_TEMPLATE/alpha_bug_report.md

@@ -7,7 +7,7 @@
     "test:ci": "node ../../scripts/run_tests_in_ci.js -s test"
   },
   "devDependencies": {
-    "firebase": "8.4.1",
+    "firebase": "8.4.3",
     "@types/chai": "4.2.14",
     "@types/mocha": "7.0.2",
     "chai": "4.2.0",

common/api-review/database.api.md

@@ -15,7 +15,7 @@
   },
   "devDependencies": {
     "@firebase/app": "0.6.20",
-    "@firebase/firestore": "2.2.4",
+    "@firebase/firestore": "2.2.5",
     "@types/mocha": "7.0.2",
     "gulp": "4.0.2",
     "gulp-filter": "6.0.0",

common/api-review/storage.api.md

@@ -9,7 +9,7 @@
     "test:manual": "mocha --exit"
   },
   "devDependencies": {
-    "firebase": "8.4.1",
+    "firebase": "8.4.3",
     "chai": "4.2.0",
     "chromedriver": "89.0.0",
     "express": "4.17.1",

integration/firebase/package.json

@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@firebase/auth-exp": "0.0.900",
-    "@firebase/auth-types": "0.10.2",
+    "@firebase/auth-types": "0.10.3",
     "@firebase/component": "0.4.1",
     "@firebase/util": "1.0.0",
     "node-fetch": "2.6.1",

integration/firestore/package.json

@@ -32,6 +32,12 @@ export const enum Buffer {
   TOKEN_REFRESH = 30_000
 }
 
+/**
+ * We need to mark this class as internal explicitly to exclude it in the public typings, because
+ * it references AuthInternal which has a circular dependency with UserInternal.
+ *
+ * @internal
+ */
 export class StsTokenManager {
   refreshToken: string | null = null;
   accessToken: string | null = null;

integration/messaging/package.json

@@ -48,6 +48,12 @@ export interface ConfigInternal extends Config {
   clientPlatform: ClientPlatform;
 }
 
+/**
+ * UserInternal and AuthInternal reference each other, so both of them are included in the public typings.
+ * In order to exclude them, we mark them as internal explicitly.
+ *
+ * @internal
+ */
 export interface AuthInternal extends Auth {
   currentUser: User | null;
   emulatorConfig: EmulatorConfig | null;

packages-exp/auth-compat-exp/package.json

@@ -79,6 +79,12 @@ export interface EventManager {
   unregisterConsumer(authEventConsumer: AuthEventConsumer): void;
 }
 
+/**
+ * We need to mark this interface as internal explicitly to exclude it in the public typings, because
+ * it references AuthInternal which has a circular dependency with UserInternal.
+ *
+ * @internal
+ */
 export interface PopupRedirectResolverInternal extends PopupRedirectResolver {
   // Whether or not to initialize the event manager early
   _shouldInitProactively: boolean;

packages-exp/auth-exp/src/core/user/token_manager.ts

@@ -52,6 +52,12 @@ export interface UserParameters {
   lastLoginAt?: string | null;
 }
 
+/**
+ * UserInternal and AuthInternal reference each other, so both of them are included in the public typings.
+ * In order to exclude them, we mark them as internal explicitly.
+ *
+ * @internal
+ */
 export interface UserInternal extends User {
   displayName: string | null;
   email: string | null;

packages-exp/auth-exp/src/model/auth.ts

@@ -32,6 +32,12 @@ export const _JSLOAD_CALLBACK = jsHelpers._generateCallbackName('rcb');
 const NETWORK_TIMEOUT_DELAY = new Delay(30000, 60000);
 const RECAPTCHA_BASE = 'https://www.google.com/recaptcha/api.js?';
 
+/**
+ * We need to mark this interface as internal explicitly to exclude it in the public typings, because
+ * it references AuthInternal which has a circular dependency with UserInternal.
+ *
+ * @internal
+ */
 export interface ReCaptchaLoader {
   load(auth: AuthInternal, hl?: string): Promise<Recaptcha>;
   clearedOneInstance(): void;

packages-exp/auth-exp/src/model/popup_redirect.ts

@@ -52,10 +52,6 @@
       "node": "./functions/dist/index.cjs.js",
       "default": "./functions/dist/index.esm.js"
     },
-    "./installations": {
-      "node": "./installations/dist/index.cjs.js",
-      "default": "./installations/dist/index.esm.js"
-    },
     "./messaging": {
       "node": "./messaging/dist/index.cjs.js",
       "default": "./messaging/dist/index.esm.js"
@@ -96,10 +92,6 @@
       "node": "./compat/functions/dist/index.cjs.js",
       "default": "./compat/functions/dist/index.esm.js"
     },
-    "./compat/installations": {
-      "node": "./compat/installations/dist/index.cjs.js",
-      "default": "./compat/installations/dist/index.esm.js"
-    },
     "./compat/messaging": {
       "node": "./compat/messaging/dist/index.cjs.js",
       "default": "./compat/messaging/dist/index.esm.js"
@@ -137,11 +129,11 @@
     "@firebase/app-compat": "0.0.900",
     "@firebase/auth-exp": "0.0.900",
     "@firebase/auth-compat": "0.0.900",
-    "@firebase/database": "0.9.10",
+    "@firebase/database": "0.9.12",
     "@firebase/functions-exp": "0.0.900",
     "@firebase/functions-compat": "0.0.900",
-    "@firebase/firestore": "2.2.4",
-    "@firebase/storage": "0.5.0",
+    "@firebase/firestore": "2.2.5",
+    "@firebase/storage": "0.5.1",
     "@firebase/performance-exp": "0.0.900",
     "@firebase/performance-compat": "0.0.900",
     "@firebase/remote-config-exp": "0.0.900",

packages-exp/auth-exp/src/model/user.ts

@@ -24,8 +24,8 @@ import {
   MessagePayload,
   deleteToken,
   getToken,
-  onMessage,
-  onBackgroundMessage
+  onBackgroundMessage,
+  onMessage
 } from '@firebase/messaging-exp';
 import { NextFn, Observer, Unsubscribe } from '@firebase/util';
 
@@ -46,6 +46,47 @@ export interface MessagingCompat {
   ): Unsubscribe;
 }
 
+export function isSupported(): boolean {
+  if (self && 'ServiceWorkerGlobalScope' in self) {
+    // Running in ServiceWorker context
+    return isSwSupported();
+  } else {
+    // Assume we are in the window context.
+    return isWindowSupported();
+  }
+}
+
+/**
+ * Checks to see if the required APIs exist.
+ */
+function isWindowSupported(): boolean {
+  return (
+    'indexedDB' in window &&
+    indexedDB !== null &&
+    navigator.cookieEnabled &&
+    'serviceWorker' in navigator &&
+    'PushManager' in window &&
+    'Notification' in window &&
+    'fetch' in window &&
+    ServiceWorkerRegistration.prototype.hasOwnProperty('showNotification') &&
+    PushSubscription.prototype.hasOwnProperty('getKey')
+  );
+}
+
+/**
+ * Checks to see if the required APIs exist within SW Context.
+ */
+function isSwSupported(): boolean {
+  return (
+    'indexedDB' in self &&
+    indexedDB !== null &&
+    'PushManager' in self &&
+    'Notification' in self &&
+    ServiceWorkerRegistration.prototype.hasOwnProperty('showNotification') &&
+    PushSubscription.prototype.hasOwnProperty('getKey')
+  );
+}
+
 export class MessagingCompatImpl implements MessagingCompat, _FirebaseService {
   swRegistration?: ServiceWorkerRegistration;
   vapidKey?: string;

packages-exp/auth-exp/src/platform_browser/recaptcha/recaptcha_loader.ts

@@ -0,0 +1,3 @@
+# @firebase/app-check-interop-types
+
+**This package is not intended for direct usage, and should only be used via the officially supported [firebase](https://www.npmjs.com/package/firebase) package.**

packages-exp/firebase-exp/package.json

@@ -0,0 +1,47 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export interface FirebaseAppCheckInternal {
+  // Get the current AttestationToken. Attaches to the most recent in-flight request if one
+  // is present. Returns null if no token is present and no token requests are in-flight.
+  getToken(forceRefresh?: boolean): Promise<AppCheckTokenResult>;
+
+  // Registers a listener to changes in the token state. There can be more than one listener
+  // registered at the same time for one or more FirebaseAppAttestation instances. The
+  // listeners call back on the UI thread whenever the current token associated with this
+  // FirebaseAppAttestation changes.
+  addTokenListener(listener: AppCheckTokenListener): void;
+
+  // Unregisters a listener to changes in the token state.
+  removeTokenListener(listener: AppCheckTokenListener): void;
+}
+
+type AppCheckTokenListener = (token: AppCheckTokenResult) => void;
+
+// If the error field is defined, the token field will be populated with a dummy token
+interface AppCheckTokenResult {
+  readonly token: string;
+  readonly error?: Error;
+}
+
+export type AppCheckInternalComponentName = 'app-check-internal';
+
+declare module '@firebase/component' {
+  interface NameServiceMapping {
+    'app-check-internal': FirebaseAppCheckInternal;
+  }
+}

packages-exp/messaging-compat/src/messaging-compat.ts

@@ -0,0 +1,26 @@
+{
+  "name": "@firebase/app-check-interop-types",
+  "private": true,
+  "version": "0.1.0",
+  "description": "@firebase/app-check-interop-types Types",
+  "author": "Firebase <[email protected]> (https://firebase.google.com/)",
+  "license": "Apache-2.0",
+  "scripts": {
+    "test": "tsc",
+    "test:ci": "node ../../scripts/run_tests_in_ci.js"
+  },
+  "files": [
+    "index.d.ts"
+  ],
+  "repository": {
+    "directory": "packages/app-check-interop-types",
+    "type": "git",
+    "url": "https://github.com/firebase/firebase-js-sdk.git"
+  },
+  "bugs": {
+    "url": "https://github.com/firebase/firebase-js-sdk/issues"
+  },
+  "devDependencies": {
+    "typescript": "4.2.2"
+  }
+}