Change public methods to accept public interface

Author: ChaoqunCHEN

packages-exp/installations-exp/src/api/delete-installations.ts

@@ -20,11 +20,12 @@ import { remove, update } from '../helpers/idb-manager';
 import { RequestStatus } from '../interfaces/installation-entry';
 import { ERROR_FACTORY, ErrorCode } from '../util/errors';
 import { FirebaseInstallationsImpl } from '../interfaces/installation-impl';
+import { FirebaseInstallations } from '@firebase/installations-types-exp';
 
 export async function deleteInstallations(
-  installations: FirebaseInstallationsImpl
+  installations: FirebaseInstallations
 ): Promise<void> {
-  const { appConfig } = installations;
+  const { appConfig } = installations as FirebaseInstallationsImpl;
 
   const entry = await update(appConfig, oldEntry => {
     if (oldEntry && oldEntry.registrationStatus === RequestStatus.NOT_STARTED) {

packages-exp/installations-exp/src/api/get-id.ts

@@ -18,20 +18,22 @@
 import { getInstallationEntry } from '../helpers/get-installation-entry';
 import { refreshAuthToken } from '../helpers/refresh-auth-token';
 import { FirebaseInstallationsImpl } from '../interfaces/installation-impl';
+import { FirebaseInstallations } from '@firebase/installations-types-exp';
 
 export async function getId(
-  installations: FirebaseInstallationsImpl
+  installations: FirebaseInstallations
 ): Promise<string> {
+  const installationsImpl = installations as FirebaseInstallationsImpl;
   const { installationEntry, registrationPromise } = await getInstallationEntry(
-    installations.appConfig
+    installationsImpl.appConfig
   );
 
   if (registrationPromise) {
     registrationPromise.catch(console.error);
   } else {
     // If the installation is already registered, update the authentication
     // token if needed.
-    refreshAuthToken(installations).catch(console.error);
+    refreshAuthToken(installationsImpl).catch(console.error);
   }
 
   return installationEntry.fid;

packages-exp/installations-exp/src/api/get-token.ts

@@ -21,16 +21,18 @@ import {
   FirebaseInstallationsImpl,
   AppConfig
 } from '../interfaces/installation-impl';
+import { FirebaseInstallations } from '@firebase/installations-types-exp';
 
 export async function getToken(
-  installations: FirebaseInstallationsImpl,
+  installations: FirebaseInstallations,
   forceRefresh = false
 ): Promise<string> {
-  await completeInstallationRegistration(installations.appConfig);
+  const installationsImpl = installations as FirebaseInstallationsImpl;
+  await completeInstallationRegistration(installationsImpl.appConfig);
 
   // At this point we either have a Registered Installation in the DB, or we've
   // already thrown an error.
-  const authToken = await refreshAuthToken(installations, forceRefresh);
+  const authToken = await refreshAuthToken(installationsImpl, forceRefresh);
   return authToken.token;
 }
 

packages-exp/installations-exp/src/api/on-id-change.ts

@@ -17,6 +17,7 @@
 
 import { addCallback, removeCallback } from '../helpers/fid-changed';
 import { FirebaseInstallationsImpl } from '../interfaces/installation-impl';
+import { FirebaseInstallations } from '@firebase/installations-types-exp';
 
 export type IdChangeCallbackFn = (installationId: string) => void;
 export type IdChangeUnsubscribeFn = () => void;
@@ -26,11 +27,12 @@ export type IdChangeUnsubscribeFn = () => void;
  * Returns an unsubscribe function that will remove the callback when called.
  */
 export function onIdChange(
-  { appConfig }: FirebaseInstallationsImpl,
+  installations: FirebaseInstallations,
   callback: IdChangeCallbackFn
 ): IdChangeUnsubscribeFn {
-  addCallback(appConfig, callback);
+  const { appConfig } = installations as FirebaseInstallationsImpl;
 
+  addCallback(appConfig, callback);
   return () => {
     removeCallback(appConfig, callback);
   };

packages-exp/installations-exp/src/functions/config.ts

@@ -23,12 +23,13 @@ import {
   InstanceFactory,
   ComponentContainer
 } from '@firebase/component';
-import { deleteInstallations, getId, getToken } from '../api/index';
+import { getId, getToken } from '../api/index';
 import { FirebaseInstallationsInternal } from '@firebase/installations-types-exp';
 import { FirebaseInstallationsImpl } from '../interfaces/installation-impl';
 import { extractAppConfig } from '../helpers/extract-app-config';
 
 const INSTALLATIONS_NAME = 'installations-exp';
+const INSTALLATIONS_NAME_INTERNAL = 'installations-exp-internal';
 
 const publicFactory: InstanceFactory<'installations-exp'> = (
   container: ComponentContainer
@@ -42,7 +43,7 @@ const publicFactory: InstanceFactory<'installations-exp'> = (
     app,
     appConfig,
     platformLoggerProvider,
-    _delete: () => deleteInstallations(installationsImpl)
+    _delete: () => Promise.resolve()
   };
   return installationsImpl;
 };
@@ -52,15 +53,11 @@ const internalFactory: InstanceFactory<'installations-exp-internal'> = (
 ) => {
   const app = container.getProvider('app-exp').getImmediate();
   // Internal FIS instance relies on public FIS instance.
-  const installationsImpl = _getProvider(
-    app,
-    INSTALLATIONS_NAME
-  ).getImmediate();
+  const installations = _getProvider(app, INSTALLATIONS_NAME).getImmediate();
 
   const installationsInternal: FirebaseInstallationsInternal = {
-    getId: () => getId(installationsImpl),
-    getToken: (forceRefresh?: boolean) =>
-      getToken(installationsImpl, forceRefresh)
+    getId: () => getId(installations),
+    getToken: (forceRefresh?: boolean) => getToken(installations, forceRefresh)
   };
   return installationsInternal;
 };
@@ -70,6 +67,10 @@ export function registerInstallations(): void {
     new Component(INSTALLATIONS_NAME, publicFactory, ComponentType.PUBLIC)
   );
   _registerComponent(
-    new Component(INSTALLATIONS_NAME, internalFactory, ComponentType.PRIVATE)
+    new Component(
+      INSTALLATIONS_NAME_INTERNAL,
+      internalFactory,
+      ComponentType.PRIVATE
+    )
   );
 }

packages-exp/installations-types-exp/index.d.ts

@@ -37,7 +37,7 @@ export interface FirebaseInstallationsInternal {
 
 declare module '@firebase/component' {
   interface NameServiceMapping {
-    'installations-exp': FirebaseInstallationsImpl;
+    'installations-exp': FirebaseInstallations;
     'installations-exp-internal': FirebaseInstallationsInternal;
   }
 }