@viasoftbr/shared-ui 0.0.7-4 → 0.0.7-6

package/dist/index.js

@@ -2872,24 +2872,22 @@ function formatAxiosError(err) {
   return err instanceof Error ? err : new Error(String(err));
 }
 var fetchApi = {
-  getJson: async (path, params, headersOrOptions) => {
+  getJson: async (path, params, headers) => {
     try {
-      const requestOptions = normalizeRequestOptions(params, headersOrOptions);
       const response = await (path.includes("/auth") ? authApi : api).get(path.replace("/auth", ""), {
-        params: withTokenQueryParams(requestOptions),
-        headers: requestOptions.headers
+        params,
+        headers
       });
       return response.data;
     } catch (e10) {
       throw formatAxiosError(e10);
     }
   },
-  getText: async (path, params, headersOrOptions) => {
+  getText: async (path, params, headers) => {
     try {
-      const requestOptions = normalizeRequestOptions(params, headersOrOptions);
       const response = await (path.includes("/auth") ? authApi : api).get(path.replace("/auth", ""), {
-        params: withTokenQueryParams(requestOptions),
-        headers: requestOptions.headers,
+        params,
+        headers,
         responseType: "text"
       });
       return response.data;
@@ -2897,106 +2895,61 @@ var fetchApi = {
       throw formatAxiosError(e10);
     }
   },
-  getVoid: async (path, params, headersOrOptions) => {
+  getVoid: async (path, params, headers) => {
     try {
-      const requestOptions = normalizeRequestOptions(params, headersOrOptions);
-      await (path.includes("/auth") ? authApi : api).get(path.replace("/auth", ""), {
-        params: withTokenQueryParams(requestOptions),
-        headers: requestOptions.headers
-      });
+      await (path.includes("/auth") ? authApi : api).get(path.replace("/auth", ""), { params, headers });
     } catch (e10) {
       throw formatAxiosError(e10);
     }
   },
-  postJson: async (path, payload, headersOrOptions) => {
+  postJson: async (path, payload, headers) => {
     try {
-      const requestOptions = normalizeRequestOptions(void 0, headersOrOptions);
       const response = await (path.includes("/auth") ? authApi : api).post(path.replace("/auth", ""), payload, {
-        headers: requestOptions.headers,
-        params: withTokenQueryParams(requestOptions)
+        headers
       });
       return response.data;
     } catch (e10) {
       throw formatAxiosError(e10);
     }
   },
-  patchJson: async (path, payload, headersOrOptions) => {
+  patchJson: async (path, payload, headers) => {
     try {
-      const requestOptions = normalizeRequestOptions(void 0, headersOrOptions);
       const response = await (path.includes("/auth") ? authApi : api).patch(path.replace("/auth", ""), payload, {
-        headers: requestOptions.headers,
-        params: withTokenQueryParams(requestOptions)
+        headers
       });
       return response.data;
     } catch (e10) {
       throw formatAxiosError(e10);
     }
   },
-  putJson: async (path, payload, headersOrOptions) => {
+  putJson: async (path, payload, headers) => {
     try {
-      const requestOptions = normalizeRequestOptions(void 0, headersOrOptions);
       const response = await (path.includes("/auth") ? authApi : api).put(path.replace("/auth", ""), payload, {
-        headers: requestOptions.headers,
-        params: withTokenQueryParams(requestOptions)
+        headers
       });
       return response.data;
     } catch (e10) {
       throw formatAxiosError(e10);
     }
   },
-  deleteJson: async (path, headersOrOptions) => {
+  deleteJson: async (path, headers) => {
     try {
-      const requestOptions = normalizeRequestOptions(void 0, headersOrOptions);
       const response = await (path.includes("/auth") ? authApi : api).delete(path.replace("/auth", ""), {
-        headers: requestOptions.headers,
-        params: withTokenQueryParams(requestOptions)
+        headers
       });
       return response.data;
     } catch (e10) {
       throw formatAxiosError(e10);
     }
   },
-  deleteVoid: async (path, headersOrOptions) => {
+  deleteVoid: async (path, headers) => {
     try {
-      const requestOptions = normalizeRequestOptions(void 0, headersOrOptions);
-      await (path.includes("/auth") ? authApi : api).delete(path.replace("/auth", ""), {
-        headers: requestOptions.headers,
-        params: withTokenQueryParams(requestOptions)
-      });
+      await (path.includes("/auth") ? authApi : api).delete(path.replace("/auth", ""), { headers });
     } catch (e10) {
       throw formatAxiosError(e10);
     }
   }
 };
-function buildWsUrl(path = "/", options = {}) {
-  try {
-    const origin2 = new URL(apiOrigin);
-    origin2.protocol = origin2.protocol === "https:" ? "wss:" : "ws:";
-    if (!path.startsWith("/"))
-      path = "/" + path;
-    origin2.pathname = path;
-    return withAccessTokenQuery(origin2.toString(), {
-      headers: options.headers,
-      params: options.query,
-      token: options.token ?? options.bearerToken,
-      tokenQueryParam: options.tokenQueryParam ?? options.bearerQueryParam,
-      includeStoredToken: options.includeStoredToken
-    });
-  } catch (e10) {
-    const proto = apiOrigin.startsWith("https") ? "wss" : "ws";
-    const host = apiOrigin.replace(/^https?:\/\//, "").replace(/\/$/, "");
-    return withAccessTokenQuery(
-      `${proto}://${host}${path.startsWith("/") ? path : "/" + path}`,
-      {
-        headers: options.headers,
-        params: options.query,
-        token: options.token ?? options.bearerToken,
-        tokenQueryParam: options.tokenQueryParam ?? options.bearerQueryParam,
-        includeStoredToken: options.includeStoredToken
-      }
-    );
-  }
-}
 function extractBearerToken(headers, explicitToken) {
   if (explicitToken)
     return explicitToken;
@@ -3008,7 +2961,7 @@ function extractBearerToken(headers, explicitToken) {
   const match = authHeader.match(/^Bearer\s+(.+)$/i);
   return match ? match[1] : null;
 }
-function resolveAuthToken(options = {}) {
+function resolveWebSocketToken(options = {}) {
   const explicitToken = options.token ?? options.bearerToken ?? null;
   const headerToken = extractBearerToken(options.headers, explicitToken);
   if (headerToken)
@@ -3017,12 +2970,6 @@ function resolveAuthToken(options = {}) {
     return null;
   return getAccessToken();
 }
-function mergeQueryParams(params, key, value) {
-  const nextParams = { ...params ?? {} };
-  if (key && value)
-    nextParams[key] = value;
-  return Object.keys(nextParams).length > 0 ? nextParams : void 0;
-}
 function appendQueryParams(url, params) {
   if (!params || Object.keys(params).length === 0)
     return url;
@@ -3045,43 +2992,32 @@ function appendQueryParams(url, params) {
     return `${url}${separator}${search}`;
   }
 }
+function withWebSocketTokenQuery(url, options) {
+  const token = resolveWebSocketToken(options);
+  const params = { ...options.query ?? {} };
+  if (token) {
+    params[options.tokenQueryParam ?? options.bearerQueryParam ?? "token"] = token;
+  }
+  return appendQueryParams(url, params);
+}
 function normalizeProtocols(protocols) {
   if (!protocols)
     return void 0;
   return Array.isArray(protocols) ? protocols.filter(Boolean) : [protocols];
 }
-function normalizeRequestOptions(params, headersOrOptions) {
-  const maybeOptions = headersOrOptions;
-  const hasOptionShape = Boolean(
-    maybeOptions && ("headers" in maybeOptions || "params" in maybeOptions || "sendTokenInQuery" in maybeOptions || "token" in maybeOptions || "tokenQueryParam" in maybeOptions || "includeStoredToken" in maybeOptions)
-  );
-  if (hasOptionShape) {
-    return {
-      ...maybeOptions,
-      params: { ...params ?? {}, ...maybeOptions?.params ?? {} }
-    };
+function buildWsUrl(path = "/", options = {}) {
+  try {
+    const origin2 = new URL(apiOrigin);
+    origin2.protocol = origin2.protocol === "https:" ? "wss:" : "ws:";
+    if (!path.startsWith("/"))
+      path = "/" + path;
+    origin2.pathname = path;
+    return withWebSocketTokenQuery(origin2.toString(), options);
+  } catch (e10) {
+    const proto = apiOrigin.startsWith("https") ? "wss" : "ws";
+    const host = apiOrigin.replace(/^https?:\/\//, "").replace(/\/$/, "");
+    return withWebSocketTokenQuery(`${proto}://${host}${path.startsWith("/") ? path : "/" + path}`, options);
   }
-  return {
-    params,
-    headers: headersOrOptions
-  };
-}
-function withTokenQueryParams(options) {
-  if (!options.sendTokenInQuery)
-    return options.params;
-  const token = resolveAuthToken(options);
-  return mergeQueryParams(
-    options.params,
-    options.tokenQueryParam ?? "access_token",
-    token
-  );
-}
-function withAccessTokenQuery(url, options = {}) {
-  const token = resolveAuthToken(options);
-  return appendQueryParams(
-    url,
-    mergeQueryParams(options.params, options.tokenQueryParam ?? "access_token", token)
-  );
 }
 async function encodeFfurl(settings) {
   const { ffurl } = await fetchApi.postJson("/auth/protocols/ffurl/encode", settings);
@@ -3092,30 +3028,18 @@ async function decodeFfurl(ffurl) {
   return settings;
 }
 function subscribeToWebsocket(url, onMessage, options = {}) {
-  const bearerToken = resolveAuthToken({
-    headers: options.headers,
-    token: options.token,
-    bearerToken: options.bearerToken,
-    includeStoredToken: options.includeStoredToken
-  });
-  const bearerStrategy = options.tokenTransport ?? options.bearerStrategy ?? "query";
-  let resolvedUrl = appendQueryParams(url, options.query);
+  const tokenTransport = options.tokenTransport ?? options.bearerStrategy ?? "query";
   const protocols = normalizeProtocols(options.protocols) ?? [];
   if (options.headers && Object.keys(options.headers).length > 0) {
     console.warn(
       "WebSocket connections in browsers do not support custom HTTP headers. shared-ui will derive bearer auth from Authorization and forward it using query string or subprotocol."
     );
   }
-  if (bearerToken) {
-    if (bearerStrategy === "protocol") {
-      protocols.push("bearer", bearerToken);
-    } else {
-      resolvedUrl = withAccessTokenQuery(resolvedUrl, {
-        token: bearerToken,
-        tokenQueryParam: options.tokenQueryParam ?? options.bearerQueryParam,
-        includeStoredToken: false
-      });
-    }
+  let resolvedUrl = tokenTransport === "query" ? withWebSocketTokenQuery(url, options) : appendQueryParams(url, options.query);
+  if (tokenTransport === "protocol") {
+    const token = resolveWebSocketToken(options);
+    if (token)
+      protocols.push("bearer", token);
   }
   const socket = protocols.length > 0 ? new WebSocket(resolvedUrl, protocols) : new WebSocket(resolvedUrl);
   socket.onmessage = (event) => {
@@ -41459,8 +41383,7 @@ export {
   useAuth,
   useAvailableSubservices,
   useSettings,
-  userService,
-  withAccessTokenQuery
+  userService
 };
 /*! Bundled license information:
 

package/dist/services/api.d.ts

@@ -1,12 +1,5 @@
 import { ProtocolSettings } from '../types/protocol';
-import { AuthTokenQueryOptions, WebSocketSubscribeOptions } from '../types/websocket';
-type QueryParamValue = string | number | boolean | null | undefined;
-type QueryParams = Record<string, QueryParamValue>;
-interface RequestOptions extends AuthTokenQueryOptions {
-    headers?: Record<string, string>;
-    params?: QueryParams;
-    sendTokenInQuery?: boolean;
-}
+import { WebSocketSubscribeOptions } from '../types/websocket';
 export declare const api: import("axios").AxiosInstance;
 export declare const authApi: import("axios").AxiosInstance;
 export declare function getAccessToken(): string | null;
@@ -15,18 +8,16 @@ export declare function getRefreshToken(): string | null;
 export declare function setRefreshToken(token: string | null): void;
 export declare function clearTokens(): void;
 export declare const fetchApi: {
-    getJson: <T>(path: string, params?: QueryParams, headersOrOptions?: Record<string, string> | RequestOptions) => Promise<T>;
-    getText: (path: string, params?: QueryParams, headersOrOptions?: Record<string, string> | RequestOptions) => Promise<string>;
-    getVoid: (path: string, params?: QueryParams, headersOrOptions?: Record<string, string> | RequestOptions) => Promise<void>;
-    postJson: <T>(path: string, payload?: any, headersOrOptions?: Record<string, string> | RequestOptions) => Promise<T>;
-    patchJson: <T>(path: string, payload?: any, headersOrOptions?: Record<string, string> | RequestOptions) => Promise<T>;
-    putJson: <T>(path: string, payload?: any, headersOrOptions?: Record<string, string> | RequestOptions) => Promise<T>;
-    deleteJson: <T>(path: string, headersOrOptions?: Record<string, string> | RequestOptions) => Promise<T>;
-    deleteVoid: (path: string, headersOrOptions?: Record<string, string> | RequestOptions) => Promise<void>;
+    getJson: <T>(path: string, params?: Record<string, any>, headers?: Record<string, string>) => Promise<T>;
+    getText: (path: string, params?: Record<string, any>, headers?: Record<string, string>) => Promise<string>;
+    getVoid: (path: string, params?: Record<string, any>, headers?: Record<string, string>) => Promise<void>;
+    postJson: <T>(path: string, payload?: any, headers?: Record<string, string>) => Promise<T>;
+    patchJson: <T>(path: string, payload?: any, headers?: Record<string, string>) => Promise<T>;
+    putJson: <T>(path: string, payload?: any, headers?: Record<string, string>) => Promise<T>;
+    deleteJson: <T>(path: string, headers?: Record<string, string>) => Promise<T>;
+    deleteVoid: (path: string, headers?: Record<string, string>) => Promise<void>;
 };
 export declare function buildWsUrl(path?: string, options?: Omit<WebSocketSubscribeOptions, 'protocols'>): string;
-export declare function withAccessTokenQuery(url: string, options?: Pick<RequestOptions, 'headers' | 'params' | 'token' | 'tokenQueryParam' | 'includeStoredToken'>): string;
 export declare function encodeFfurl(settings: ProtocolSettings): Promise<string>;
 export declare function decodeFfurl(ffurl: string): Promise<ProtocolSettings>;
 export declare function subscribeToWebsocket(url: string, onMessage: (data: any) => void, options?: WebSocketSubscribeOptions): () => void;
-export {};

package/dist/services.cjs

@@ -44,8 +44,7 @@ __export(services_exports, {
   setAccessToken: () => setAccessToken,
   setRefreshToken: () => setRefreshToken,
   subscribeToWebsocket: () => subscribeToWebsocket,
-  userService: () => userService,
-  withAccessTokenQuery: () => withAccessTokenQuery
+  userService: () => userService
 });
 module.exports = __toCommonJS(services_exports);
 
@@ -2807,24 +2806,22 @@ function formatAxiosError(err) {
   return err instanceof Error ? err : new Error(String(err));
 }
 var fetchApi = {
-  getJson: async (path, params, headersOrOptions) => {
+  getJson: async (path, params, headers) => {
     try {
-      const requestOptions = normalizeRequestOptions(params, headersOrOptions);
       const response = await (path.includes("/auth") ? authApi : api).get(path.replace("/auth", ""), {
-        params: withTokenQueryParams(requestOptions),
-        headers: requestOptions.headers
+        params,
+        headers
       });
       return response.data;
     } catch (e) {
       throw formatAxiosError(e);
     }
   },
-  getText: async (path, params, headersOrOptions) => {
+  getText: async (path, params, headers) => {
     try {
-      const requestOptions = normalizeRequestOptions(params, headersOrOptions);
       const response = await (path.includes("/auth") ? authApi : api).get(path.replace("/auth", ""), {
-        params: withTokenQueryParams(requestOptions),
-        headers: requestOptions.headers,
+        params,
+        headers,
         responseType: "text"
       });
       return response.data;
@@ -2832,106 +2829,61 @@ var fetchApi = {
       throw formatAxiosError(e);
     }
   },
-  getVoid: async (path, params, headersOrOptions) => {
+  getVoid: async (path, params, headers) => {
     try {
-      const requestOptions = normalizeRequestOptions(params, headersOrOptions);
-      await (path.includes("/auth") ? authApi : api).get(path.replace("/auth", ""), {
-        params: withTokenQueryParams(requestOptions),
-        headers: requestOptions.headers
-      });
+      await (path.includes("/auth") ? authApi : api).get(path.replace("/auth", ""), { params, headers });
     } catch (e) {
       throw formatAxiosError(e);
     }
   },
-  postJson: async (path, payload, headersOrOptions) => {
+  postJson: async (path, payload, headers) => {
     try {
-      const requestOptions = normalizeRequestOptions(void 0, headersOrOptions);
       const response = await (path.includes("/auth") ? authApi : api).post(path.replace("/auth", ""), payload, {
-        headers: requestOptions.headers,
-        params: withTokenQueryParams(requestOptions)
+        headers
       });
       return response.data;
     } catch (e) {
       throw formatAxiosError(e);
     }
   },
-  patchJson: async (path, payload, headersOrOptions) => {
+  patchJson: async (path, payload, headers) => {
     try {
-      const requestOptions = normalizeRequestOptions(void 0, headersOrOptions);
       const response = await (path.includes("/auth") ? authApi : api).patch(path.replace("/auth", ""), payload, {
-        headers: requestOptions.headers,
-        params: withTokenQueryParams(requestOptions)
+        headers
       });
       return response.data;
     } catch (e) {
       throw formatAxiosError(e);
     }
   },
-  putJson: async (path, payload, headersOrOptions) => {
+  putJson: async (path, payload, headers) => {
     try {
-      const requestOptions = normalizeRequestOptions(void 0, headersOrOptions);
       const response = await (path.includes("/auth") ? authApi : api).put(path.replace("/auth", ""), payload, {
-        headers: requestOptions.headers,
-        params: withTokenQueryParams(requestOptions)
+        headers
       });
       return response.data;
     } catch (e) {
       throw formatAxiosError(e);
     }
   },
-  deleteJson: async (path, headersOrOptions) => {
+  deleteJson: async (path, headers) => {
     try {
-      const requestOptions = normalizeRequestOptions(void 0, headersOrOptions);
       const response = await (path.includes("/auth") ? authApi : api).delete(path.replace("/auth", ""), {
-        headers: requestOptions.headers,
-        params: withTokenQueryParams(requestOptions)
+        headers
       });
       return response.data;
     } catch (e) {
       throw formatAxiosError(e);
     }
   },
-  deleteVoid: async (path, headersOrOptions) => {
+  deleteVoid: async (path, headers) => {
     try {
-      const requestOptions = normalizeRequestOptions(void 0, headersOrOptions);
-      await (path.includes("/auth") ? authApi : api).delete(path.replace("/auth", ""), {
-        headers: requestOptions.headers,
-        params: withTokenQueryParams(requestOptions)
-      });
+      await (path.includes("/auth") ? authApi : api).delete(path.replace("/auth", ""), { headers });
     } catch (e) {
       throw formatAxiosError(e);
     }
   }
 };
-function buildWsUrl(path = "/", options = {}) {
-  try {
-    const origin2 = new URL(apiOrigin);
-    origin2.protocol = origin2.protocol === "https:" ? "wss:" : "ws:";
-    if (!path.startsWith("/"))
-      path = "/" + path;
-    origin2.pathname = path;
-    return withAccessTokenQuery(origin2.toString(), {
-      headers: options.headers,
-      params: options.query,
-      token: options.token ?? options.bearerToken,
-      tokenQueryParam: options.tokenQueryParam ?? options.bearerQueryParam,
-      includeStoredToken: options.includeStoredToken
-    });
-  } catch (e) {
-    const proto = apiOrigin.startsWith("https") ? "wss" : "ws";
-    const host = apiOrigin.replace(/^https?:\/\//, "").replace(/\/$/, "");
-    return withAccessTokenQuery(
-      `${proto}://${host}${path.startsWith("/") ? path : "/" + path}`,
-      {
-        headers: options.headers,
-        params: options.query,
-        token: options.token ?? options.bearerToken,
-        tokenQueryParam: options.tokenQueryParam ?? options.bearerQueryParam,
-        includeStoredToken: options.includeStoredToken
-      }
-    );
-  }
-}
 function extractBearerToken(headers, explicitToken) {
   if (explicitToken)
     return explicitToken;
@@ -2943,7 +2895,7 @@ function extractBearerToken(headers, explicitToken) {
   const match = authHeader.match(/^Bearer\s+(.+)$/i);
   return match ? match[1] : null;
 }
-function resolveAuthToken(options = {}) {
+function resolveWebSocketToken(options = {}) {
   const explicitToken = options.token ?? options.bearerToken ?? null;
   const headerToken = extractBearerToken(options.headers, explicitToken);
   if (headerToken)
@@ -2952,12 +2904,6 @@ function resolveAuthToken(options = {}) {
     return null;
   return getAccessToken();
 }
-function mergeQueryParams(params, key, value) {
-  const nextParams = { ...params ?? {} };
-  if (key && value)
-    nextParams[key] = value;
-  return Object.keys(nextParams).length > 0 ? nextParams : void 0;
-}
 function appendQueryParams(url, params) {
   if (!params || Object.keys(params).length === 0)
     return url;
@@ -2980,43 +2926,32 @@ function appendQueryParams(url, params) {
     return `${url}${separator}${search}`;
   }
 }
+function withWebSocketTokenQuery(url, options) {
+  const token = resolveWebSocketToken(options);
+  const params = { ...options.query ?? {} };
+  if (token) {
+    params[options.tokenQueryParam ?? options.bearerQueryParam ?? "token"] = token;
+  }
+  return appendQueryParams(url, params);
+}
 function normalizeProtocols(protocols) {
   if (!protocols)
     return void 0;
   return Array.isArray(protocols) ? protocols.filter(Boolean) : [protocols];
 }
-function normalizeRequestOptions(params, headersOrOptions) {
-  const maybeOptions = headersOrOptions;
-  const hasOptionShape = Boolean(
-    maybeOptions && ("headers" in maybeOptions || "params" in maybeOptions || "sendTokenInQuery" in maybeOptions || "token" in maybeOptions || "tokenQueryParam" in maybeOptions || "includeStoredToken" in maybeOptions)
-  );
-  if (hasOptionShape) {
-    return {
-      ...maybeOptions,
-      params: { ...params ?? {}, ...maybeOptions?.params ?? {} }
-    };
+function buildWsUrl(path = "/", options = {}) {
+  try {
+    const origin2 = new URL(apiOrigin);
+    origin2.protocol = origin2.protocol === "https:" ? "wss:" : "ws:";
+    if (!path.startsWith("/"))
+      path = "/" + path;
+    origin2.pathname = path;
+    return withWebSocketTokenQuery(origin2.toString(), options);
+  } catch (e) {
+    const proto = apiOrigin.startsWith("https") ? "wss" : "ws";
+    const host = apiOrigin.replace(/^https?:\/\//, "").replace(/\/$/, "");
+    return withWebSocketTokenQuery(`${proto}://${host}${path.startsWith("/") ? path : "/" + path}`, options);
   }
-  return {
-    params,
-    headers: headersOrOptions
-  };
-}
-function withTokenQueryParams(options) {
-  if (!options.sendTokenInQuery)
-    return options.params;
-  const token = resolveAuthToken(options);
-  return mergeQueryParams(
-    options.params,
-    options.tokenQueryParam ?? "access_token",
-    token
-  );
-}
-function withAccessTokenQuery(url, options = {}) {
-  const token = resolveAuthToken(options);
-  return appendQueryParams(
-    url,
-    mergeQueryParams(options.params, options.tokenQueryParam ?? "access_token", token)
-  );
 }
 async function encodeFfurl(settings) {
   const { ffurl } = await fetchApi.postJson("/auth/protocols/ffurl/encode", settings);
@@ -3027,30 +2962,18 @@ async function decodeFfurl(ffurl) {
   return settings;
 }
 function subscribeToWebsocket(url, onMessage, options = {}) {
-  const bearerToken = resolveAuthToken({
-    headers: options.headers,
-    token: options.token,
-    bearerToken: options.bearerToken,
-    includeStoredToken: options.includeStoredToken
-  });
-  const bearerStrategy = options.tokenTransport ?? options.bearerStrategy ?? "query";
-  let resolvedUrl = appendQueryParams(url, options.query);
+  const tokenTransport = options.tokenTransport ?? options.bearerStrategy ?? "query";
   const protocols = normalizeProtocols(options.protocols) ?? [];
   if (options.headers && Object.keys(options.headers).length > 0) {
     console.warn(
       "WebSocket connections in browsers do not support custom HTTP headers. shared-ui will derive bearer auth from Authorization and forward it using query string or subprotocol."
     );
   }
-  if (bearerToken) {
-    if (bearerStrategy === "protocol") {
-      protocols.push("bearer", bearerToken);
-    } else {
-      resolvedUrl = withAccessTokenQuery(resolvedUrl, {
-        token: bearerToken,
-        tokenQueryParam: options.tokenQueryParam ?? options.bearerQueryParam,
-        includeStoredToken: false
-      });
-    }
+  let resolvedUrl = tokenTransport === "query" ? withWebSocketTokenQuery(url, options) : appendQueryParams(url, options.query);
+  if (tokenTransport === "protocol") {
+    const token = resolveWebSocketToken(options);
+    if (token)
+      protocols.push("bearer", token);
   }
   const socket = protocols.length > 0 ? new WebSocket(resolvedUrl, protocols) : new WebSocket(resolvedUrl);
   socket.onmessage = (event) => {