Addressed comments

Author: maneesht

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

@@ -59,7 +59,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!');
@@ -84,10 +85,9 @@ export function dcFetch<T, U>(
     headers,
     signal
   };
-  if (isCloudWorkstation(url)) {
+  if (isCloudWorkstation(url) && _isUsingEmulator) {
     fetchOptions.credentials = 'include';
   }
-  logDebug(`Making request out to ${url} with body: ${bodyStr}`);
 
   return connectFetch(url, fetchOptions)
     .catch(err => {

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;

packages/database/src/api/Database.ts

@@ -90,17 +90,17 @@ function repoManagerApplyEmulatorSettings(
   tokenProvider?: AuthTokenProvider
 ): void {
   let ssl = false;
-  let finalHost = hostAndPort;
-  if (/^https:\/\//.test(finalHost)) {
+  let host = hostAndPort;
+  if (/^https:\/\//.test(host)) {
     ssl = true;
-    finalHost = finalHost.substring(8);
+    host = host.substring(8);
   }
-  if (/^wss:\/\//.test(finalHost)) {
+  if (/^wss:\/\//.test(host)) {
     ssl = true;
-    finalHost = finalHost.substring(6);
+    host = host.substring(6);
   }
   repo.repoInfo_ = new RepoInfo(
-    finalHost,
+    host,
     /* secure= */ ssl,
     repo.repoInfo_.namespace,
     repo.repoInfo_.webSocketOnly,

packages/util/src/url.ts

@@ -1,3 +1,20 @@
-export function isCloudWorkstation(url: string) {
-  return url.endsWith('cloudworkstations.dev');
-}
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export function isCloudWorkstation(url: string): boolean {
+  return url.endsWith('.cloudworkstations.dev');
+}