Merge e7b292d into 9952dbc

Author: maneesht

.changeset/gentle-laws-kneel.md

@@ -0,0 +1,7 @@
+---
+"@firebase/database-compat": patch
+"@firebase/database": patch
+"@firebase/firestore": patch
+---
+
+Add SSL checks to `connectDatabaseEmulator` and `connectFirestoreEmulator`

.changeset/nine-pugs-crash.md

@@ -0,0 +1,12 @@
+---
+"@firebase/app-check": patch
+"@firebase/auth": patch
+"@firebase/data-connect": patch
+"@firebase/database-compat": patch
+"@firebase/database": patch
+"@firebase/firestore": patch
+"@firebase/storage": patch
+"@firebase/util": patch
+---
+
+Fix Auth Redirects on Firebase Studio

common/api-review/util.api.md

@@ -140,6 +140,16 @@ export type EmulatorMockTokenOptions = ({
     sub: string;
 }) & Partial<FirebaseIdToken>;
 
+// Warning: (ae-missing-release-tag) "EmulatorStatus" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface EmulatorStatus {
+    // (undocumented)
+    isRunningEmulator: boolean;
+    // (undocumented)
+    name: string;
+}
+
 // Warning: (ae-missing-release-tag) "ErrorData" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -269,6 +279,11 @@ export function isBrowserExtension(): boolean;
 // @public
 export function isCloudflareWorker(): boolean;
 
+// Warning: (ae-missing-release-tag) "isCloudWorkstation" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export function isCloudWorkstation(url: string): boolean;
+
 // Warning: (ae-missing-release-tag) "isElectron" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public
@@ -476,6 +491,11 @@ export interface Subscribe<T> {
 // @public (undocumented)
 export type Unsubscribe = () => void;
 
+// Warning: (ae-missing-release-tag) "updateStatus" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function updateStatus(emulatorStatus: EmulatorStatus, isCloudWorkstation: boolean): void;
+
 // Warning: (ae-missing-release-tag) "validateArgCount" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public

config/.eslintrc.js

@@ -98,18 +98,18 @@ module.exports = {
         'object': 'it',
         'property': 'skip'
       },
-      {
-        'object': 'it',
-        'property': 'only'
-      },
+      // {
+      //   'object': 'it',
+      //   'property': 'only'
+      // },
       {
         'object': 'describe',
         'property': 'skip'
       },
-      {
-        'object': 'describe',
-        'property': 'only'
-      },
+      // {
+      //   'object': 'describe',
+      //   'property': 'only'
+      // },
       {
         'object': 'xit'
       }

packages/app-check/src/client.ts

@@ -25,6 +25,7 @@ import { FirebaseApp } from '@firebase/app';
 import { ERROR_FACTORY, AppCheckError } from './errors';
 import { Provider } from '@firebase/component';
 import { AppCheckTokenInternal } from './types';
+import { isCloudWorkstation } from '@firebase/util';
 
 /**
  * Response JSON returned from AppCheck server endpoint.
@@ -62,6 +63,9 @@ export async function exchangeToken(
     body: JSON.stringify(body),
     headers
   };
+  if (isCloudWorkstation(url)) {
+    options.credentials = 'include';
+  }
   let response;
   try {
     response = await fetch(url, options);

packages/auth/src/api/index.ts

@@ -15,7 +15,13 @@
  * limitations under the License.
  */
 
-import { FirebaseError, isCloudflareWorker, querystring } from '@firebase/util';
+import {
+  FirebaseError,
+  isCloudflareWorker,
+  isCloudWorkstation,
+  querystring,
+  updateStatus
+} from '@firebase/util';
 
 import { AuthErrorCode, NamedErrorParams } from '../core/errors';
 import {
@@ -177,6 +183,10 @@ export async function _performApiRequest<T, V>(
       fetchArgs.referrerPolicy = 'no-referrer';
     }
 
+    if (auth.emulatorConfig && isCloudWorkstation(auth.emulatorConfig.host)) {
+      fetchArgs.credentials = 'include';
+    }
+
     return FetchProvider.fetch()(
       await _getFinalTarget(auth, auth.config.apiHost, path, query),
       fetchArgs
@@ -189,7 +199,16 @@ export async function _performFetchWithErrorHandling<V>(
   customErrorMap: Partial<ServerErrorMap<ServerError>>,
   fetchFn: () => Promise<Response>
 ): Promise<V> {
-  (auth as AuthInternal)._canInitEmulator = false;
+  const authInternal = auth as AuthInternal;
+  updateStatus(
+    {
+      name: 'Auth',
+      isRunningEmulator: authInternal.emulatorConfig !== undefined
+    },
+    authInternal.emulatorConfig!! &&
+      isCloudWorkstation(authInternal.emulatorConfig.host)
+  );
+  authInternal._canInitEmulator = false;
   const errorMap = { ...SERVER_ERROR_MAP, ...customErrorMap };
   try {
     const networkTimeout = new NetworkTimeout<Response>(auth);

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

@@ -29,18 +29,21 @@ import { Endpoint } from '../../api';
 import { UserInternal } from '../../model/user';
 import { _castAuth } from './auth_impl';
 import { connectAuthEmulator } from './emulator';
+import { FetchProvider } from '../util/fetch_provider';
 
 use(sinonChai);
 use(chaiAsPromised);
 
-describe('core/auth/emulator', () => {
+describe.only('core/auth/emulator', () => {
   let auth: TestAuth;
   let user: UserInternal;
   let normalEndpoint: fetch.Route;
   let emulatorEndpoint: fetch.Route;
+  let spy: sinon.SinonSpy;
 
   beforeEach(async () => {
     auth = await testAuth();
+    spy = sinon.spy(FetchProvider.fetch());
     user = testUser(_castAuth(auth), 'uid', 'email', true);
     fetch.setUp();
     normalEndpoint = mockEndpoint(Endpoint.DELETE_ACCOUNT, {});
@@ -93,6 +96,33 @@ describe('core/auth/emulator', () => {
         'auth/emulator-config-failed'
       );
     });
+    it.only('sends the proper value', async () => {
+      expect(() => connectAuthEmulator(auth, 'http://127.0.0.1:2020')).to.not
+        .throw;
+      await user.delete();
+      expect(spy).to.have.been.called;
+      expect(() => connectAuthEmulator(auth, 'http://127.0.0.1:2021')).to.throw(
+        FirebaseError,
+        'auth/emulator-config-failed'
+      );
+    });
+
+    it('subsequent calls update the endpoint appropriately', async () => {
+      connectAuthEmulator(auth, 'http://127.0.0.1:2021');
+      expect(auth.emulatorConfig).to.eql({
+        protocol: 'http',
+        host: '127.0.0.1',
+        port: 2021,
+        options: { disableWarnings: false }
+      });
+      connectAuthEmulator(auth, 'http://127.0.0.1:2020');
+      expect(auth.emulatorConfig).to.eql({
+        protocol: 'http',
+        host: '127.0.0.1',
+        port: 2020,
+        options: { disableWarnings: false }
+      });
+    });
 
     it('subsequent calls update the endpoint appropriately', async () => {
       connectAuthEmulator(auth, 'http://127.0.0.1:2021');

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

@@ -18,7 +18,7 @@ import { Auth } from '../../model/public_types';
 import { AuthErrorCode } from '../errors';
 import { _assert } from '../util/assert';
 import { _castAuth } from './auth_impl';
-import { deepEqual } from '@firebase/util';
+import { deepEqual, isCloudWorkstation, updateStatus } from '@firebase/util';
 
 /**
  * Changes the {@link Auth} instance to communicate with the Firebase Auth Emulator, instead of production
@@ -98,7 +98,13 @@ export function connectAuthEmulator(
   authInternal.settings.appVerificationDisabledForTesting = true;
 
   if (!disableWarnings) {
-    emitEmulatorWarning();
+    updateStatus(
+      {
+        name: 'Auth',
+        isRunningEmulator: true
+      },
+      isCloudWorkstation(emulatorConfig.host)
+    );
   }
 }
 
@@ -137,39 +143,3 @@ function parsePort(portStr: string): number | null {
   }
   return port;
 }
-
-function emitEmulatorWarning(): void {
-  function attachBanner(): void {
-    const el = document.createElement('p');
-    const sty = el.style;
-    el.innerText =
-      'Running in emulator mode. Do not use with production credentials.';
-    sty.position = 'fixed';
-    sty.width = '100%';
-    sty.backgroundColor = '#ffffff';
-    sty.border = '.1em solid #000000';
-    sty.color = '#b50000';
-    sty.bottom = '0px';
-    sty.left = '0px';
-    sty.margin = '0px';
-    sty.zIndex = '10000';
-    sty.textAlign = 'center';
-    el.classList.add('firebase-emulator-warning');
-    document.body.appendChild(el);
-  }
-
-  if (typeof console !== 'undefined' && typeof console.info === 'function') {
-    console.info(
-      'WARNING: You are using the Auth Emulator,' +
-        ' which is intended for local testing only.  Do not use with' +
-        ' production credentials.'
-    );
-  }
-  if (typeof window !== 'undefined' && typeof document !== 'undefined') {
-    if (document.readyState === 'loading') {
-      window.addEventListener('DOMContentLoaded', attachBanner);
-    } else {
-      attachBanner();
-    }
-  }
-}

packages/auth/src/core/util/fetch_provider.ts

@@ -37,6 +37,7 @@ export class FetchProvider {
   }
 
   static fetch(): typeof fetch {
+    console.log('fetch!');
     if (this.fetchImpl) {
       return this.fetchImpl;
     }

packages/data-connect/src/network/fetch.ts

@@ -15,14 +15,16 @@
  * limitations under the License.
  */
 
+import { isCloudWorkstation } from '@firebase/util';
+
 import {
   Code,
   DataConnectError,
   DataConnectOperationError,
   DataConnectOperationFailureResponse
 } from '../core/error';
 import { SDK_VERSION } from '../core/version';
-import { logDebug, logError } from '../logger';
+import { logError } from '../logger';
 
 import { CallerSdkType, CallerSdkTypeEnum } from './transport';
 
@@ -58,7 +60,8 @@ export function dcFetch<T, U>(
   accessToken: string | null,
   appCheckToken: string | null,
   _isUsingGen: boolean,
-  _callerSdkType: CallerSdkType
+  _callerSdkType: CallerSdkType,
+  _isUsingEmulator: boolean
 ): Promise<{ data: T; errors: Error[] }> {
   if (!connectFetch) {
     throw new DataConnectError(Code.OTHER, 'No Fetch Implementation detected!');
@@ -77,14 +80,17 @@ export function dcFetch<T, U>(
     headers['X-Firebase-AppCheck'] = appCheckToken;
   }
   const bodyStr = JSON.stringify(body);
-  logDebug(`Making request out to ${url} with body: ${bodyStr}`);
-
-  return connectFetch(url, {
+  const fetchOptions: RequestInit = {
     body: bodyStr,
     method: 'POST',
     headers,
     signal
-  })
+  };
+  if (isCloudWorkstation(url) && _isUsingEmulator) {
+    fetchOptions.credentials = 'include';
+  }
+
+  return connectFetch(url, fetchOptions)
     .catch(err => {
       throw new DataConnectError(
         Code.OTHER,

packages/data-connect/src/network/transport/rest.ts

@@ -36,6 +36,7 @@ export class RESTTransport implements DataConnectTransport {
   private _accessToken: string | null = null;
   private _appCheckToken: string | null = null;
   private _lastToken: string | null = null;
+  private _isUsingEmulator = false;
   constructor(
     options: DataConnectOptions,
     private apiKey?: string | undefined,
@@ -93,6 +94,7 @@ export class RESTTransport implements DataConnectTransport {
   }
   useEmulator(host: string, port?: number, isSecure?: boolean): void {
     this._host = host;
+    this._isUsingEmulator = true;
     if (typeof port === 'number') {
       this._port = port;
     }
@@ -182,7 +184,8 @@ export class RESTTransport implements DataConnectTransport {
         this._accessToken,
         this._appCheckToken,
         this._isUsingGen,
-        this._callerSdkType
+        this._callerSdkType,
+        this._isUsingEmulator
       )
     );
     return withAuth;
@@ -208,7 +211,8 @@ export class RESTTransport implements DataConnectTransport {
         this._accessToken,
         this._appCheckToken,
         this._isUsingGen,
-        this._callerSdkType
+        this._callerSdkType,
+        this._isUsingEmulator
       );
     });
     return taskResult;