App field

Author: mmermerkaya

packages/messaging-types/index.d.ts

@@ -24,9 +24,7 @@ import {
   CompleteFn
 } from '@firebase/util';
 
-export class FirebaseMessaging {
-  private constructor(app: FirebaseApp);
-  readonly app: FirebaseApp;
+export interface FirebaseMessaging {
   // TODO: remove the token parameter and just delete the token that matches
   // this app if it exists.
   deleteToken(token: string): Promise<boolean>;

packages/messaging/src/controllers/sw-controller.ts

@@ -30,20 +30,17 @@ import { Unsubscribe } from '@firebase/util';
 import { sleep } from '../helpers/sleep';
 import { FirebaseApp } from '@firebase/app-types';
 import { isConsoleMessage } from '../helpers/is-console-message';
+import { FirebaseService } from '@firebase/app-types/private';
 
 // Let TS know that this is a service worker
 declare const self: ServiceWorkerGlobalScope;
 
 export type BgMessageHandler = (payload: MessagePayload) => unknown;
 
-export class SwController implements FirebaseMessaging {
+export class SwController implements FirebaseMessaging, FirebaseService {
   private vapidKey: string | null = null;
   private bgMessageHandler: BgMessageHandler | null = null;
 
-  get app(): FirebaseApp {
-    return this.firebaseDependencies.app;
-  }
-
   constructor(
     private readonly firebaseDependencies: FirebaseInternalDependencies
   ) {
@@ -58,6 +55,10 @@ export class SwController implements FirebaseMessaging {
     });
   }
 
+  get app(): FirebaseApp {
+    return this.firebaseDependencies.app;
+  }
+
   /**
    * Calling setBackgroundMessageHandler will opt in to some specific
    * behaviours.

packages/messaging/src/controllers/window-controller.ts

@@ -33,8 +33,9 @@ import {
 import { FirebaseApp } from '@firebase/app-types';
 import { ConsoleMessageData } from '../interfaces/message-payload';
 import { isConsoleMessage } from '../helpers/is-console-message';
+import { FirebaseService } from '@firebase/app-types/private';
 
-export class WindowController implements FirebaseMessaging {
+export class WindowController implements FirebaseMessaging, FirebaseService {
   private vapidKey: string | null = null;
   private swRegistration?: ServiceWorkerRegistration;
   private onMessageCallback: NextFn<object> | null = null;

packages/messaging/src/index.ts

@@ -17,7 +17,10 @@
 
 import firebase from '@firebase/app';
 import '@firebase/installations';
-import { _FirebaseNamespace } from '@firebase/app-types/private';
+import {
+  _FirebaseNamespace,
+  FirebaseService
+} from '@firebase/app-types/private';
 import { FirebaseMessaging } from '@firebase/messaging-types';
 import {
   Component,
@@ -31,7 +34,9 @@ import { WindowController } from './controllers/window-controller';
 import { SwController } from './controllers/sw-controller';
 
 const MESSAGING_NAME = 'messaging';
-function factoryMethod(container: ComponentContainer): FirebaseMessaging {
+function factoryMethod(
+  container: ComponentContainer
+): FirebaseService & FirebaseMessaging {
   // Dependencies.
   const app = container.getProvider('app').getImmediate();
   const appConfig = extractAppConfig(app);