Merge branch 'master' into release

Author: hsubox76

.changeset/empty-falcons-sit.md

@@ -0,0 +1,9 @@
+---
+'@firebase/app': patch
+'@firebase/installations': patch
+'@firebase/installations-compat': patch
+'@firebase/messaging': patch
+'@firebase/util': minor
+---
+
+Remove idb dependency and replace with our own code.

.changeset/neat-olives-punch.md

@@ -0,0 +1,6 @@
+---
+"@firebase/auth-compat": patch
+"@firebase/auth": patch
+---
+
+Heartbeat

.changeset/polite-donkeys-divide.md

@@ -0,0 +1,5 @@
+---
+'@firebase/app-check': patch
+---
+
+Update platform logging to use new endpoint.

.changeset/proud-otters-tap.md

@@ -0,0 +1,5 @@
+---
+'@firebase/installations': patch
+---
+
+Update platform logging code to send to new endpoint.

.changeset/sweet-pumas-dance.md

@@ -0,0 +1,5 @@
+---
+'@firebase/app': patch
+---
+
+Fix heartbeat controller to ensure not sending more than one a day.

packages/app-check/src/client.test.ts

@@ -19,7 +19,7 @@ import '../test/setup';
 import { expect } from 'chai';
 import { stub, SinonStub, useFakeTimers } from 'sinon';
 import { FirebaseApp } from '@firebase/app';
-import { getFakeApp, getFakePlatformLoggingProvider } from '../test/util';
+import { getFakeApp, getFakeHeartbeatServiceProvider } from '../test/util';
 import {
  getExchangeRecaptchaV3TokenRequest,
  exchangeToken,
@@ -86,7 +86,7 @@ describe('client', () => {
 
  const response = await exchangeToken(
  getExchangeRecaptchaV3TokenRequest(app, 'fake-custom-token'),
- getFakePlatformLoggingProvider('a/1.2.3 fire-app-check/2.3.4')
+ getFakeHeartbeatServiceProvider('a/1.2.3 fire-app-check/2.3.4')
  );
 
  expect(
@@ -114,7 +114,7 @@ describe('client', () => {
  try {
  await exchangeToken(
  getExchangeRecaptchaV3TokenRequest(app, 'fake-custom-token'),
- getFakePlatformLoggingProvider()
+ getFakeHeartbeatServiceProvider()
  );
  } catch (e) {
  expect(e).instanceOf(FirebaseError);
@@ -143,7 +143,7 @@ describe('client', () => {
  try {
  await exchangeToken(
  getExchangeRecaptchaV3TokenRequest(app, 'fake-custom-token'),
- getFakePlatformLoggingProvider()
+ getFakeHeartbeatServiceProvider()
  );
  } catch (e) {
  expect(e).instanceOf(FirebaseError);
@@ -171,7 +171,7 @@ describe('client', () => {
  try {
  await exchangeToken(
  getExchangeRecaptchaV3TokenRequest(app, 'fake-custom-token'),
- getFakePlatformLoggingProvider()
+ getFakeHeartbeatServiceProvider()
  );
  } catch (e) {
  expect(e).instanceOf(FirebaseError);
@@ -205,7 +205,7 @@ describe('client', () => {
  try {
  await exchangeToken(
  getExchangeRecaptchaV3TokenRequest(app, 'fake-custom-token'),
- getFakePlatformLoggingProvider()
+ getFakeHeartbeatServiceProvider()
  );
  } catch (e) {
  expect(e).instanceOf(FirebaseError);

packages/app-check/src/client.ts

@@ -42,17 +42,20 @@ interface AppCheckRequest {
 
 export async function exchangeToken(
  { url, body }: AppCheckRequest,
- platformLoggerProvider: Provider<'platform-logger'>
+ heartbeatServiceProvider: Provider<'heartbeat'>
 ): Promise<AppCheckTokenInternal> {
  const headers: HeadersInit = {
  'Content-Type': 'application/json'
  };
- // If platform logger exists, add the platform info string to the header.
- const platformLogger = platformLoggerProvider.getImmediate({
+ // If heartbeat service exists, add heartbeat header string to the header.
+ const heartbeatService = heartbeatServiceProvider.getImmediate({
  optional: true
  });
- if (platformLogger) {
- headers['X-Firebase-Client'] = platformLogger.getPlatformInfoString();
+ if (heartbeatService) {
+ const heartbeatsHeader = await heartbeatService.getHeartbeatsHeader();
+ if (heartbeatsHeader) {
+ headers['X-Firebase-Client'] = heartbeatsHeader;
+ }
  }
  const options: RequestInit = {
  method: 'POST',

packages/app-check/src/factory.ts

@@ -32,7 +32,7 @@ import { getState } from './state';
 export class AppCheckService implements AppCheck, _FirebaseService {
  constructor(
  public app: FirebaseApp,
- public platformLoggerProvider: Provider<'platform-logger'>
+ public heartbeatServiceProvider: Provider<'heartbeat'>
  ) {}
  _delete(): Promise<void> {
  const { tokenObservers } = getState(this.app);
@@ -45,9 +45,9 @@ export class AppCheckService implements AppCheck, _FirebaseService {
 
 export function factory(
  app: FirebaseApp,
- platformLoggerProvider: Provider<'platform-logger'>
+ heartbeatServiceProvider: Provider<'heartbeat'>
 ): AppCheckService {
- return new AppCheckService(app, platformLoggerProvider);
+ return new AppCheckService(app, heartbeatServiceProvider);
 }
 
 export function internalFactory(

packages/app-check/src/index.ts

@@ -48,8 +48,8 @@ function registerAppCheck(): void {
  container => {
  // getImmediate for FirebaseApp will always succeed
  const app = container.getProvider('app').getImmediate();
- const platformLoggerProvider = container.getProvider('platform-logger');
- return factory(app, platformLoggerProvider);
+ const heartbeatServiceProvider = container.getProvider('heartbeat');
+ return factory(app, heartbeatServiceProvider);
  },
  ComponentType.PUBLIC
  )

packages/app-check/src/internal-api.ts

@@ -106,7 +106,7 @@ export async function getToken(
  if (!state.exchangeTokenPromise) {
  state.exchangeTokenPromise = exchangeToken(
  getExchangeDebugTokenRequest(app, await getDebugToken()),
- appCheck.platformLoggerProvider
+ appCheck.heartbeatServiceProvider
  ).then(token => {
  state.exchangeTokenPromise = undefined;
  return token;