Merge remote-tracking branch 'origin/main' into mtewani/add-emulator-overlay

Author: maneesht

.changeset/lemon-tomatoes-breathe.md

@@ -0,0 +1,5 @@
+---
+"@firebase/auth": patch
+---
+
+Fix issue where auth port wasn't properly set when setting up cookies in Firebase Studio.

packages/auth/src/core/auth/emulator.test.ts

@@ -29,6 +29,7 @@ import { Endpoint } from '../../api';
 import { UserInternal } from '../../model/user';
 import { _castAuth } from './auth_impl';
 import { connectAuthEmulator } from './emulator';
+import * as Util from '@firebase/util';
 
 use(sinonChai);
 use(chaiAsPromised);
@@ -38,8 +39,10 @@ describe('core/auth/emulator', () => {
   let user: UserInternal;
   let normalEndpoint: fetch.Route;
   let emulatorEndpoint: fetch.Route;
+  let utilStub: sinon.SinonStub;
 
   beforeEach(async () => {
+    utilStub = sinon.stub(Util, 'pingServer');
     auth = await testAuth();
     user = testUser(_castAuth(auth), 'uid', 'email', true);
     fetch.setUp();
@@ -154,6 +157,19 @@ describe('core/auth/emulator', () => {
         );
       }
     });
+    it('calls pingServer with port if specified', () => {
+      connectAuthEmulator(auth, 'https://abc.cloudworkstations.dev:2020');
+      expect(utilStub).to.have.been.calledWith(
+        'https://abc.cloudworkstations.dev:2020'
+      );
+    });
+
+    it('calls pingServer with no port if none specified', () => {
+      connectAuthEmulator(auth, 'https://abc.cloudworkstations.dev');
+      expect(utilStub).to.have.been.calledWith(
+        'https://abc.cloudworkstations.dev'
+      );
+    });
 
     it('logs out a warning to the console', () => {
       sinon.stub(console, 'info');

packages/auth/src/core/auth/emulator.ts

@@ -108,7 +108,7 @@ export function connectAuthEmulator(
 
   // Workaround to get cookies in Firebase Studio
   if (isCloudWorkstation(host)) {
-    void pingServer(`${protocol}//${host}:${port}`);
+    void pingServer(`${protocol}//${host}${portStr}`);
     updateEmulatorBanner('Auth', true);
   }
 }