Fixed fromUrl

Author: maneesht

packages/functions/src/callable.test.ts

@@ -37,7 +37,11 @@ import {
   AppCheckInternalComponentName
 } from '@firebase/app-check-interop-types';
 import { makeFakeApp, createTestService } from '../test/utils';
-import { FunctionsService, httpsCallable } from './service';
+import {
+  FunctionsService,
+  httpsCallable,
+  httpsCallableFromURL
+} from './service';
 import { FUNCTIONS_TYPE } from './constants';
 import { FunctionsError } from './error';
 
@@ -526,6 +530,7 @@ describe('Firebase Functions > Stream', () => {
     expect(options.credentials).to.equal(undefined);
     expect(options.headers['Accept']).to.equal('text/event-stream');
   });
+
   it('calls cloud workstations with credentials', async () => {
     const authMock: FirebaseAuthInternal = {
       getToken: async () => ({ accessToken: 'auth-token' })
@@ -589,6 +594,69 @@ describe('Firebase Functions > Stream', () => {
     expect(options.credentials).to.equal('include');
   });
 
+  it.only('calls streamFromURL cloud workstations with credentials', async () => {
+    const authMock: FirebaseAuthInternal = {
+      getToken: async () => ({ accessToken: 'auth-token' })
+    } as unknown as FirebaseAuthInternal;
+    const authProvider = new Provider<FirebaseAuthInternalName>(
+      'auth-internal',
+      new ComponentContainer('test')
+    );
+    authProvider.setComponent(
+      new Component('auth-internal', () => authMock, ComponentType.PRIVATE)
+    );
+    const appCheckMock: FirebaseAppCheckInternal = {
+      getToken: async () => ({ token: 'app-check-token' })
+    } as unknown as FirebaseAppCheckInternal;
+    const appCheckProvider = new Provider<AppCheckInternalComponentName>(
+      'app-check-internal',
+      new ComponentContainer('test')
+    );
+    appCheckProvider.setComponent(
+      new Component(
+        'app-check-internal',
+        () => appCheckMock,
+        ComponentType.PRIVATE
+      )
+    );
+
+    const functions = createTestService(
+      app,
+      region,
+      authProvider,
+      undefined,
+      appCheckProvider
+    );
+    functions.emulatorOrigin = 'test.cloudworkstations.dev';
+    const mockFetch = sinon.stub(functions, 'fetchImpl' as any);
+
+    const mockResponse = new ReadableStream({
+      start(controller) {
+        controller.enqueue(
+          new TextEncoder().encode('data: {"result":"Success"}\n')
+        );
+        controller.close();
+      }
+    });
+
+    mockFetch.resolves({
+      body: mockResponse,
+      headers: new Headers({ 'Content-Type': 'text/event-stream' }),
+      status: 200,
+      statusText: 'OK'
+    } as Response);
+
+    const func = httpsCallableFromURL<Record<string, any>, string, string>(
+      functions,
+      'stream'
+    );
+    await func.stream({});
+
+    expect(mockFetch.calledOnce).to.be.true;
+    const [_, options] = mockFetch.firstCall.args;
+    expect(options.credentials).to.equal('include');
+  });
+
   it('aborts during initial fetch', async () => {
     const controller = new AbortController();
 

packages/functions/src/service.ts

@@ -245,18 +245,27 @@ export function httpsCallableFromURL<
   return callable as HttpsCallable<RequestData, ResponseData, StreamData>;
 }
 
+function getCredentials(functionsInstance: FunctionsService) {
+  return functionsInstance.emulatorOrigin &&
+    isCloudWorkstation(functionsInstance.emulatorOrigin)
+    ? 'include'
+    : undefined;
+}
+
 /**
  * Does an HTTP POST and returns the completed response.
  * @param url The url to post to.
  * @param body The JSON body of the post.
  * @param headers The HTTP headers to include in the request.
+ * @param functionsInstance functions instance that is calling postJSON
  * @return A Promise that will succeed when the request finishes.
  */
 async function postJSON(
   url: string,
   body: unknown,
   headers: { [key: string]: string },
-  fetchImpl: typeof fetch
+  fetchImpl: typeof fetch,
+  functionsInstance: FunctionsService
 ): Promise<HttpResponse> {
   headers['Content-Type'] = 'application/json';
 
@@ -265,7 +274,8 @@ async function postJSON(
     response = await fetchImpl(url, {
       method: 'POST',
       body: JSON.stringify(body),
-      headers
+      headers,
+      credentials: getCredentials(functionsInstance)
     });
   } catch (e) {
     // This could be an unhandled error on the backend, or it could be a
@@ -353,7 +363,13 @@ async function callAtURL(
 
   const failAfterHandle = failAfter(timeout);
   const response = await Promise.race([
-    postJSON(url, body, headers, functionsInstance.fetchImpl),
+    postJSON(
+      url,
+      body,
+      headers,
+      functionsInstance.fetchImpl,
+      functionsInstance
+    ),
     failAfterHandle.promise,
     functionsInstance.cancelAllRequests
   ]);
@@ -440,11 +456,7 @@ async function streamAtURL(
       body: JSON.stringify(body),
       headers,
       signal: options?.signal,
-      credentials:
-        functionsInstance.emulatorOrigin &&
-        isCloudWorkstation(functionsInstance.emulatorOrigin)
-          ? 'include'
-          : undefined
+      credentials: getCredentials(functionsInstance)
     });
   } catch (e) {
     if (e instanceof Error && e.name === 'AbortError') {