Skip to content

Commit 81ee516

Browse files
committed
Fixed removal of database emulatortokenprovider
1 parent ed9123d commit 81ee516

File tree

3 files changed

+24
-35
lines changed

3 files changed

+24
-35
lines changed

common/api-review/data-connect.api.md

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -104,20 +104,6 @@ export interface DataConnectTransport {
104104
// @public (undocumented)
105105
export type DataSource = typeof SOURCE_CACHE | typeof SOURCE_SERVER;
106106

107-
// @public (undocumented)
108-
export class EmulatorTokenProvider implements AuthTokenProvider {
109-
constructor(accessToken: string);
110-
// (undocumented)
111-
addTokenChangeListener(listener: AuthTokenListener): void;
112-
// (undocumented)
113-
getToken(forceRefresh: boolean): Promise<FirebaseAuthTokenData>;
114-
// (undocumented)
115-
notifyForInvalidToken(): void;
116-
static OWNER: string;
117-
// (undocumented)
118-
removeTokenChangeListener(listener: (token: string | null) => void): void;
119-
}
120-
121107
// @public (undocumented)
122108
export function executeMutation<Data, Variables>(mutationRef: MutationRef<Data, Variables>): MutationPromise<Data, Variables>;
123109

packages/data-connect/src/core/FirebaseAuthProvider.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -78,25 +78,4 @@ export class FirebaseAuthProvider implements AuthTokenProvider {
7878
.then(auth => auth.removeAuthTokenListener(listener));
7979
}
8080
}
81-
export class EmulatorTokenProvider implements AuthTokenProvider {
82-
/** A string that is treated as an admin access token by the RTDB emulator. Used by Admin SDK. */
83-
static OWNER = 'owner';
8481

85-
constructor(private accessToken: string) {}
86-
87-
getToken(forceRefresh: boolean): Promise<FirebaseAuthTokenData> {
88-
return Promise.resolve({
89-
accessToken: this.accessToken
90-
});
91-
}
92-
93-
addTokenChangeListener(listener: AuthTokenListener): void {
94-
// Invoke the listener immediately to match the behavior in Firebase Auth
95-
// (see packages/auth/src/auth.js#L1807)
96-
listener(this.accessToken);
97-
}
98-
99-
removeTokenChangeListener(listener: (token: string | null) => void): void {}
100-
101-
notifyForInvalidToken(): void {}
102-
}

packages/database/src/core/AuthTokenProvider.ts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,3 +120,27 @@ export class FirebaseAuthTokenProvider implements AuthTokenProvider {
120120
warn(errorMessage);
121121
}
122122
}
123+
124+
/* AuthTokenProvider that supplies a constant token. Used by Admin SDK or mockUserToken with emulators. */
125+
export class EmulatorTokenProvider implements AuthTokenProvider {
126+
/** A string that is treated as an admin access token by the RTDB emulator. Used by Admin SDK. */
127+
static OWNER = 'owner';
128+
129+
constructor(private accessToken: string) {}
130+
131+
getToken(forceRefresh: boolean): Promise<FirebaseAuthTokenData> {
132+
return Promise.resolve({
133+
accessToken: this.accessToken
134+
});
135+
}
136+
137+
addTokenChangeListener(listener: (token: string | null) => void): void {
138+
// Invoke the listener immediately to match the behavior in Firebase Auth
139+
// (see packages/auth/src/auth.js#L1807)
140+
listener(this.accessToken);
141+
}
142+
143+
removeTokenChangeListener(listener: (token: string | null) => void): void {}
144+
145+
notifyForInvalidToken(): void {}
146+
}

0 commit comments

Comments
 (0)