fixed some code around credentials

Author: Code-Hex

src/client.ts

@@ -1,7 +1,7 @@
 import { version } from '../package.json';
 import type { ApiSettings } from './api-requests';
 import type { Credential } from './credential';
-import { type EmulatorEnv } from './emulator';
+import { useEmulator, type EmulatorEnv } from './emulator';
 import { AppErrorCodes, FirebaseAppError } from './errors';
 
 /**
@@ -60,7 +60,10 @@ export class BaseClient {
     private retryConfig: RetryConfig = defaultRetryConfig()
   ) {}
 
-  private async getToken(): Promise<string> {
+  private async getToken(env?: EmulatorEnv): Promise<string> {
+    if (useEmulator(env)) {
+      return 'owner';
+    }
     const result = await this.credential.getAccessToken();
     return result.access_token;
   }
@@ -71,7 +74,7 @@ export class BaseClient {
       const requestValidator = apiSettings.getRequestValidator();
       requestValidator(requestData);
     }
-    const token = await this.getToken();
+    const token = await this.getToken(env);
     const method = apiSettings.getHttpMethod();
     const signal = AbortSignal.timeout(25000); // 25s
     return await this.fetchWithRetry<T>(fullUrl, {

src/credential.ts

@@ -37,18 +37,6 @@ export interface Credential {
   getAccessToken(): Promise<GoogleOAuthAccessToken>;
 }
 
-/**
- * Implementation of Credential that uses with emulator.
- */
-export class EmulatorCredential implements Credential {
-  public async getAccessToken(): Promise<GoogleOAuthAccessToken> {
-    return {
-      access_token: 'owner',
-      expires_in: 90 * 3600 * 3600,
-    };
-  }
-}
-
 const GOOGLE_TOKEN_AUDIENCE = 'https://accounts.google.com/o/oauth2/token';
 const GOOGLE_AUTH_TOKEN_HOST = 'accounts.google.com';
 const GOOGLE_AUTH_TOKEN_PATH = '/o/oauth2/token';

src/index.ts

@@ -3,7 +3,7 @@ import type { Credential } from './credential';
 import type { KeyStorer } from './key-store';
 import { WorkersKVStore } from './key-store';
 
-export { type Credential, ServiceAccountCredential, EmulatorCredential } from './credential';
+export { type Credential, ServiceAccountCredential } from './credential';
 export { emulatorHost, useEmulator } from './emulator';
 export type { KeyStorer };
 export type { EmulatorEnv } from './emulator';

tests/auth.test.ts

@@ -1,9 +1,14 @@
 import { describe, expect, it } from 'vitest';
 import { BaseAuth } from '../src/auth';
-import { EmulatorCredential } from '../src/credential';
 import { FirebaseAuthError } from '../src/errors';
 import type { EmulatorEnv, KeyStorer } from './../src/index';
-import { EmulatedSigner, FirebaseTokenGenerator, projectId, signInWithCustomToken } from './firebase-utils';
+import {
+  EmulatedSigner,
+  FirebaseTokenGenerator,
+  NopCredential,
+  projectId,
+  signInWithCustomToken,
+} from './firebase-utils';
 
 const env: EmulatorEnv = {
   FIREBASE_AUTH_EMULATOR_HOST: 'localhost:9099',
@@ -25,7 +30,7 @@ describe('createSessionCookie()', () => {
 
   it('creates a valid Firebase session cookie', async () => {
     const keyStorer = new InMemoryKeyStorer('cache-key');
-    const auth = new BaseAuth(projectId, keyStorer, new EmulatorCredential());
+    const auth = new BaseAuth(projectId, keyStorer, new NopCredential());
 
     const signer = new EmulatedSigner();
     const tokenGenerator = new FirebaseTokenGenerator(signer);
@@ -63,7 +68,7 @@ describe('createSessionCookie()', () => {
   describe('verifySessionCookie()', () => {
     const uid = sessionCookieUids[0];
     const keyStorer = new InMemoryKeyStorer('cache-key');
-    const auth = new BaseAuth(projectId, keyStorer, new EmulatorCredential());
+    const auth = new BaseAuth(projectId, keyStorer, new NopCredential());
     it('fails when called with an invalid session cookie', async () => {
       await expect(auth.verifySessionCookie('invalid-token')).rejects.toThrowError(FirebaseAuthError);
     });

tests/client.test.ts

@@ -4,6 +4,7 @@ import { BaseClient, buildApiUrl } from '../src/client';
 import type { EmulatorEnv } from '../src/emulator';
 import { FirebaseAppError } from '../src/errors';
 import { fetchMock } from './fetch';
+import { NopCredential } from './firebase-utils';
 
 describe('buildApiUrl', () => {
   it('should build correct url for production environment', () => {
@@ -55,7 +56,7 @@ describe('BaseClient', () => {
       })
       .reply(200, JSON.stringify(want));
 
-    const client = new TestClient(projectid);
+    const client = new TestClient(projectid, new NopCredential());
     const res = await client.fetch<{ data: string }>(apiSettings, {});
 
     expect(res).toEqual(want);
@@ -80,7 +81,7 @@ describe('BaseClient', () => {
       })
       .reply(200, JSON.stringify(want));
 
-    const client = new TestClient(projectid, {
+    const client = new TestClient(projectid, new NopCredential(), {
       maxRetries: 4,
       statusCodes: [503],
       maxDelayInMillis: 1000,
@@ -102,7 +103,7 @@ describe('BaseClient', () => {
       .reply(503, JSON.stringify(errorResponse))
       .times(5);
 
-    const client = new TestClient(projectid, {
+    const client = new TestClient(projectid, new NopCredential(), {
       maxRetries: 4,
       statusCodes: [503],
       maxDelayInMillis: 1000,

tests/firebase-utils.ts

@@ -1,4 +1,6 @@
+import type { Credential } from '../src';
 import { encodeBase64Url } from '../src/base64';
+import type { GoogleOAuthAccessToken } from '../src/credential';
 import type { EmulatorEnv } from '../src/emulator';
 import { emulatorHost } from '../src/emulator';
 import { AuthClientErrorCode, FirebaseAuthError } from '../src/errors';
@@ -262,3 +264,12 @@ export async function signInWithCustomToken(
   const json = await res.json();
   return json as signInWithCustomTokenResponse;
 }
+
+export class NopCredential implements Credential {
+  getAccessToken(): Promise<GoogleOAuthAccessToken> {
+    return Promise.resolve({
+      access_token: 'owner',
+      expires_in: 9 * 3600,
+    });
+  }
+}