From 4196fab2c5b46e416f283419c1c7a4e55d11401d Mon Sep 17 00:00:00 2001
From: Mertcan Mermerkaya <mertcan@google.com>
Date: Wed, 9 May 2018 13:10:20 +0100
Subject: [PATCH] Fix messaging being optional and isSupported type definitions

Fixes firebase.messaging() method being optional in TS types.

Modifies isSupported so it is a namespace export and not a property on the factory function, which is not actually exported.
---
 packages/firebase/index.d.ts          | 11 ++++-------
 packages/messaging/index.ts           | 21 +++++++--------------
 packages/messaging/test/index.test.ts | 14 +++++++++-----
 3 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/packages/firebase/index.d.ts b/packages/firebase/index.d.ts
index b551d344acc..58fa21d933b 100644
--- a/packages/firebase/index.d.ts
+++ b/packages/firebase/index.d.ts
@@ -107,7 +107,7 @@ declare namespace firebase {
 
   function initializeApp(options: Object, name?: string): firebase.app.App;
 
-  const messaging: firebase.messaging.MessagingFactory;
+  function messaging(app?: firebase.app.App): firebase.messaging.Messaging;
 
   function storage(app?: firebase.app.App): firebase.storage.Storage;
 
@@ -121,7 +121,7 @@ declare namespace firebase.app {
     auth(): firebase.auth.Auth;
     database(): firebase.database.Database;
     delete(): Promise<any>;
-    messaging: firebase.messaging.MessagingFactory;
+    messaging(): firebase.messaging.Messaging;
     name: string;
     options: Object;
     storage(url?: string): firebase.storage.Storage;
@@ -549,11 +549,6 @@ declare namespace firebase.database.ServerValue {
 }
 
 declare namespace firebase.messaging {
-  interface MessagingFactory {
-    (app?: firebase.app.App): Messaging;
-    isSupported(): boolean;
-  }
-
   interface Messaging {
     deleteToken(token: string): Promise<boolean>;
     getToken(): Promise<string | null>;
@@ -574,6 +569,8 @@ declare namespace firebase.messaging {
     useServiceWorker(registration: ServiceWorkerRegistration): void;
     usePublicVapidKey(b64PublicKey: string): void;
   }
+
+  function isSupported(): boolean;
 }
 
 declare namespace firebase.storage {
diff --git a/packages/messaging/index.ts b/packages/messaging/index.ts
index 7f1bac3e981..633ec446b7d 100644
--- a/packages/messaging/index.ts
+++ b/packages/messaging/index.ts
@@ -19,21 +19,16 @@ import {
   _FirebaseNamespace,
   FirebaseServiceFactory
 } from '@firebase/app-types/private';
+import { FirebaseMessaging } from '@firebase/messaging-types';
 
 import { SwController } from './src/controllers/sw-controller';
 import { WindowController } from './src/controllers/window-controller';
 import { ERROR_CODES, errorFactory } from './src/models/errors';
 
-import * as types from '@firebase/messaging-types';
-
-export interface MessagingServiceFactory extends FirebaseServiceFactory {
-  isSupported?(): boolean;
-}
-
 export function registerMessaging(instance: _FirebaseNamespace): void {
   const messagingName = 'messaging';
 
-  const factoryMethod: MessagingServiceFactory = app => {
+  const factoryMethod: FirebaseServiceFactory = app => {
     if (!isSupported()) {
       throw errorFactory.create(ERROR_CODES.UNSUPPORTED_BROWSER);
     }
@@ -46,11 +41,9 @@ export function registerMessaging(instance: _FirebaseNamespace): void {
       return new WindowController(app);
     }
   };
-  factoryMethod.isSupported = isSupported;
 
   const namespaceExports = {
-    // no-inline
-    Messaging: WindowController
+    isSupported
   };
 
   instance.INTERNAL.registerService(
@@ -67,13 +60,13 @@ registerMessaging(firebase as _FirebaseNamespace);
  */
 declare module '@firebase/app-types' {
   interface FirebaseNamespace {
-    messaging?: {
-      (app?: FirebaseApp): types.FirebaseMessaging;
-      Messaging: typeof types.FirebaseMessaging;
+    messaging: {
+      (app?: FirebaseApp): FirebaseMessaging;
+      isSupported(): boolean;
     };
   }
   interface FirebaseApp {
-    messaging?(): types.FirebaseMessaging;
+    messaging(): FirebaseMessaging;
   }
 }
 
diff --git a/packages/messaging/test/index.test.ts b/packages/messaging/test/index.test.ts
index 7ca70b7159c..ac599e8f735 100644
--- a/packages/messaging/test/index.test.ts
+++ b/packages/messaging/test/index.test.ts
@@ -18,9 +18,12 @@ import { expect } from 'chai';
 import { sandbox, SinonSandbox, SinonStub } from 'sinon';
 
 import { FirebaseApp } from '@firebase/app-types';
-import { _FirebaseNamespace } from '@firebase/app-types/private';
+import {
+  _FirebaseNamespace,
+  FirebaseServiceFactory
+} from '@firebase/app-types/private';
 
-import { MessagingServiceFactory, registerMessaging } from '../index';
+import { registerMessaging } from '../index';
 import { ERROR_CODES } from '../src/models/errors';
 
 import { SwController } from '../src/controllers/sw-controller';
@@ -52,7 +55,7 @@ describe('Firebase Messaging > registerMessaging', () => {
   });
 
   describe('factoryMethod', () => {
-    let factoryMethod: MessagingServiceFactory;
+    let factoryMethod: FirebaseServiceFactory;
     let fakeApp: FirebaseApp;
 
     beforeEach(() => {
@@ -65,8 +68,9 @@ describe('Firebase Messaging > registerMessaging', () => {
     });
 
     describe('isSupported', () => {
-      it('is a static method on factoryMethod', () => {
-        expect(factoryMethod.isSupported).to.be.a('function');
+      it('is a namespace export', () => {
+        const namespaceExports = registerService.getCall(0).args[2];
+        expect(namespaceExports.isSupported).to.be.a('function');
       });
     });