Fixed removal of database emulatortokenprovider

firebase · May 9, 2024 · 81ee516 · 81ee516
1 parent ed9123d
commit 81ee516
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 35 deletions.
diff --git a/common/api-review/data-connect.api.md b/common/api-review/data-connect.api.md
@@ -104,20 +104,6 @@ export interface DataConnectTransport {
 // @public (undocumented)
 export type DataSource = typeof SOURCE_CACHE | typeof SOURCE_SERVER;
 
-// @public (undocumented)
-export class EmulatorTokenProvider implements AuthTokenProvider {
-    constructor(accessToken: string);
-    // (undocumented)
-    addTokenChangeListener(listener: AuthTokenListener): void;
-    // (undocumented)
-    getToken(forceRefresh: boolean): Promise<FirebaseAuthTokenData>;
-    // (undocumented)
-    notifyForInvalidToken(): void;
-    static OWNER: string;
-    // (undocumented)
-    removeTokenChangeListener(listener: (token: string | null) => void): void;
-}
-
 // @public (undocumented)
 export function executeMutation<Data, Variables>(mutationRef: MutationRef<Data, Variables>): MutationPromise<Data, Variables>;
 

diff --git a/packages/data-connect/src/core/FirebaseAuthProvider.ts b/packages/data-connect/src/core/FirebaseAuthProvider.ts
@@ -78,25 +78,4 @@ export class FirebaseAuthProvider implements AuthTokenProvider {
       .then(auth => auth.removeAuthTokenListener(listener));
   }
 }
-export class EmulatorTokenProvider implements AuthTokenProvider {
-  /** A string that is treated as an admin access token by the RTDB emulator. Used by Admin SDK. */
-  static OWNER = 'owner';
 
-  constructor(private accessToken: string) {}
-
-  getToken(forceRefresh: boolean): Promise<FirebaseAuthTokenData> {
-    return Promise.resolve({
-      accessToken: this.accessToken
-    });
-  }
-
-  addTokenChangeListener(listener: AuthTokenListener): void {
-    // Invoke the listener immediately to match the behavior in Firebase Auth
-    // (see packages/auth/src/auth.js#L1807)
-    listener(this.accessToken);
-  }
-
-  removeTokenChangeListener(listener: (token: string | null) => void): void {}
-
-  notifyForInvalidToken(): void {}
-}
diff --git a/packages/database/src/core/AuthTokenProvider.ts b/packages/database/src/core/AuthTokenProvider.ts
@@ -120,3 +120,27 @@ export class FirebaseAuthTokenProvider implements AuthTokenProvider {
     warn(errorMessage);
   }
 }
+
+/* AuthTokenProvider that supplies a constant token. Used by Admin SDK or mockUserToken with emulators. */
+export class EmulatorTokenProvider implements AuthTokenProvider {
+  /** A string that is treated as an admin access token by the RTDB emulator. Used by Admin SDK. */
+  static OWNER = 'owner';
+
+  constructor(private accessToken: string) {}
+
+  getToken(forceRefresh: boolean): Promise<FirebaseAuthTokenData> {
+    return Promise.resolve({
+      accessToken: this.accessToken
+    });
+  }
+
+  addTokenChangeListener(listener: (token: string | null) => void): void {
+    // Invoke the listener immediately to match the behavior in Firebase Auth
+    // (see packages/auth/src/auth.js#L1807)
+    listener(this.accessToken);
+  }
+
+  removeTokenChangeListener(listener: (token: string | null) => void): void {}
+
+  notifyForInvalidToken(): void {}
+}