@viasoftbr/shared-ui 0.0.7-1 → 0.0.7-3

package/dist/index.js

@@ -2872,19 +2872,24 @@ function formatAxiosError(err) {
   return err instanceof Error ? err : new Error(String(err));
 }
 var fetchApi = {
-  getJson: async (path, params, headers) => {
+  getJson: async (path, params, headersOrOptions) => {
     try {
-      const response = await (path.includes("/auth") ? authApi : api).get(path.replace("/auth", ""), { params, headers });
+      const requestOptions = normalizeRequestOptions(params, headersOrOptions);
+      const response = await (path.includes("/auth") ? authApi : api).get(path.replace("/auth", ""), {
+        params: withTokenQueryParams(requestOptions),
+        headers: requestOptions.headers
+      });
       return response.data;
     } catch (e10) {
       throw formatAxiosError(e10);
     }
   },
-  getText: async (path, params, headers) => {
+  getText: async (path, params, headersOrOptions) => {
     try {
+      const requestOptions = normalizeRequestOptions(params, headersOrOptions);
       const response = await (path.includes("/auth") ? authApi : api).get(path.replace("/auth", ""), {
-        params,
-        headers,
+        params: withTokenQueryParams(requestOptions),
+        headers: requestOptions.headers,
         responseType: "text"
       });
       return response.data;
@@ -2892,65 +2897,104 @@ var fetchApi = {
       throw formatAxiosError(e10);
     }
   },
-  getVoid: async (path, params, headers) => {
+  getVoid: async (path, params, headersOrOptions) => {
     try {
-      await (path.includes("/auth") ? authApi : api).get(path.replace("/auth", ""), { params, headers });
+      const requestOptions = normalizeRequestOptions(params, headersOrOptions);
+      await (path.includes("/auth") ? authApi : api).get(path.replace("/auth", ""), {
+        params: withTokenQueryParams(requestOptions),
+        headers: requestOptions.headers
+      });
     } catch (e10) {
       throw formatAxiosError(e10);
     }
   },
-  postJson: async (path, payload, headers) => {
+  postJson: async (path, payload, headersOrOptions) => {
     try {
-      const response = await (path.includes("/auth") ? authApi : api).post(path.replace("/auth", ""), payload, { headers });
+      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)
+      });
       return response.data;
     } catch (e10) {
       throw formatAxiosError(e10);
     }
   },
-  patchJson: async (path, payload, headers) => {
+  patchJson: async (path, payload, headersOrOptions) => {
     try {
-      const response = await (path.includes("/auth") ? authApi : api).patch(path.replace("/auth", ""), payload, { headers });
+      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)
+      });
       return response.data;
     } catch (e10) {
       throw formatAxiosError(e10);
     }
   },
-  putJson: async (path, payload, headers) => {
+  putJson: async (path, payload, headersOrOptions) => {
     try {
-      const response = await (path.includes("/auth") ? authApi : api).put(path.replace("/auth", ""), payload, { headers });
+      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)
+      });
       return response.data;
     } catch (e10) {
       throw formatAxiosError(e10);
     }
   },
-  deleteJson: async (path, headers) => {
+  deleteJson: async (path, headersOrOptions) => {
     try {
-      const response = await (path.includes("/auth") ? authApi : api).delete(path.replace("/auth", ""), { headers });
+      const requestOptions = normalizeRequestOptions(void 0, headersOrOptions);
+      const response = await (path.includes("/auth") ? authApi : api).delete(path.replace("/auth", ""), {
+        headers: requestOptions.headers,
+        params: withTokenQueryParams(requestOptions)
+      });
       return response.data;
     } catch (e10) {
       throw formatAxiosError(e10);
     }
   },
-  deleteVoid: async (path, headers) => {
+  deleteVoid: async (path, headersOrOptions) => {
     try {
-      await (path.includes("/auth") ? authApi : api).delete(path.replace("/auth", ""), { headers });
+      const requestOptions = normalizeRequestOptions(void 0, headersOrOptions);
+      await (path.includes("/auth") ? authApi : api).delete(path.replace("/auth", ""), {
+        headers: requestOptions.headers,
+        params: withTokenQueryParams(requestOptions)
+      });
     } catch (e10) {
       throw formatAxiosError(e10);
     }
   }
 };
-function buildWsUrl(path = "/") {
+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 origin2.toString();
+    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 `${proto}://${host}${path.startsWith("/") ? path : "/" + path}`;
+    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) {
@@ -2964,17 +3008,41 @@ function extractBearerToken(headers, explicitToken) {
   const match = authHeader.match(/^Bearer\s+(.+)$/i);
   return match ? match[1] : null;
 }
-function appendWsQueryParam(url, key, value) {
+function resolveAuthToken(options = {}) {
+  const explicitToken = options.token ?? options.bearerToken ?? null;
+  const headerToken = extractBearerToken(options.headers, explicitToken);
+  if (headerToken)
+    return headerToken;
+  if (options.includeStoredToken === false)
+    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;
   try {
     const parsed = new URL(
       url,
       typeof window !== "undefined" ? window.location.href : void 0
     );
-    parsed.searchParams.set(key, value);
+    for (const [key, value] of Object.entries(params)) {
+      if (value === void 0 || value === null)
+        continue;
+      parsed.searchParams.set(key, String(value));
+    }
     return parsed.toString();
   } catch {
+    const search = Object.entries(params).filter(([, value]) => value !== void 0 && value !== null).map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`).join("&");
+    if (!search)
+      return url;
     const separator = url.includes("?") ? "&" : "?";
-    return `${url}${separator}${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
+    return `${url}${separator}${search}`;
   }
 }
 function normalizeProtocols(protocols) {
@@ -2982,6 +3050,39 @@ function normalizeProtocols(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 ?? {} }
+    };
+  }
+  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);
   return ffurl;
@@ -2991,9 +3092,14 @@ async function decodeFfurl(ffurl) {
   return settings;
 }
 function subscribeToWebsocket(url, onMessage, options = {}) {
-  const bearerToken = extractBearerToken(options.headers, options.bearerToken);
-  const bearerStrategy = options.bearerStrategy ?? "query";
-  let resolvedUrl = url;
+  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 protocols = normalizeProtocols(options.protocols) ?? [];
   if (options.headers && Object.keys(options.headers).length > 0) {
     console.warn(
@@ -3004,11 +3110,11 @@ function subscribeToWebsocket(url, onMessage, options = {}) {
     if (bearerStrategy === "protocol") {
       protocols.push("bearer", bearerToken);
     } else {
-      resolvedUrl = appendWsQueryParam(
-        url,
-        options.bearerQueryParam ?? "access_token",
-        bearerToken
-      );
+      resolvedUrl = withAccessTokenQuery(resolvedUrl, {
+        token: bearerToken,
+        tokenQueryParam: options.tokenQueryParam ?? options.bearerQueryParam,
+        includeStoredToken: false
+      });
     }
   }
   const socket = protocols.length > 0 ? new WebSocket(resolvedUrl, protocols) : new WebSocket(resolvedUrl);
@@ -41353,7 +41459,8 @@ export {
   useAuth,
   useAvailableSubservices,
   useSettings,
-  userService
+  userService,
+  withAccessTokenQuery
 };
 /*! Bundled license information:
 

package/dist/services/api.d.ts

@@ -1,5 +1,12 @@
 import { ProtocolSettings } from '../types/protocol';
-import { WebSocketSubscribeOptions } from '../types/websocket';
+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;
+}
 export declare const api: import("axios").AxiosInstance;
 export declare const authApi: import("axios").AxiosInstance;
 export declare function getAccessToken(): string | null;
@@ -8,16 +15,18 @@ 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?: 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>;
+    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>;
 };
-export declare function buildWsUrl(path?: string): string;
+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,7 +44,8 @@ __export(services_exports, {
   setAccessToken: () => setAccessToken,
   setRefreshToken: () => setRefreshToken,
   subscribeToWebsocket: () => subscribeToWebsocket,
-  userService: () => userService
+  userService: () => userService,
+  withAccessTokenQuery: () => withAccessTokenQuery
 });
 module.exports = __toCommonJS(services_exports);
 
@@ -2806,19 +2807,24 @@ function formatAxiosError(err) {
   return err instanceof Error ? err : new Error(String(err));
 }
 var fetchApi = {
-  getJson: async (path, params, headers) => {
+  getJson: async (path, params, headersOrOptions) => {
     try {
-      const response = await (path.includes("/auth") ? authApi : api).get(path.replace("/auth", ""), { params, headers });
+      const requestOptions = normalizeRequestOptions(params, headersOrOptions);
+      const response = await (path.includes("/auth") ? authApi : api).get(path.replace("/auth", ""), {
+        params: withTokenQueryParams(requestOptions),
+        headers: requestOptions.headers
+      });
       return response.data;
     } catch (e) {
       throw formatAxiosError(e);
     }
   },
-  getText: async (path, params, headers) => {
+  getText: async (path, params, headersOrOptions) => {
     try {
+      const requestOptions = normalizeRequestOptions(params, headersOrOptions);
       const response = await (path.includes("/auth") ? authApi : api).get(path.replace("/auth", ""), {
-        params,
-        headers,
+        params: withTokenQueryParams(requestOptions),
+        headers: requestOptions.headers,
         responseType: "text"
       });
       return response.data;
@@ -2826,65 +2832,104 @@ var fetchApi = {
       throw formatAxiosError(e);
     }
   },
-  getVoid: async (path, params, headers) => {
+  getVoid: async (path, params, headersOrOptions) => {
     try {
-      await (path.includes("/auth") ? authApi : api).get(path.replace("/auth", ""), { params, headers });
+      const requestOptions = normalizeRequestOptions(params, headersOrOptions);
+      await (path.includes("/auth") ? authApi : api).get(path.replace("/auth", ""), {
+        params: withTokenQueryParams(requestOptions),
+        headers: requestOptions.headers
+      });
     } catch (e) {
       throw formatAxiosError(e);
     }
   },
-  postJson: async (path, payload, headers) => {
+  postJson: async (path, payload, headersOrOptions) => {
     try {
-      const response = await (path.includes("/auth") ? authApi : api).post(path.replace("/auth", ""), payload, { headers });
+      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)
+      });
       return response.data;
     } catch (e) {
       throw formatAxiosError(e);
     }
   },
-  patchJson: async (path, payload, headers) => {
+  patchJson: async (path, payload, headersOrOptions) => {
     try {
-      const response = await (path.includes("/auth") ? authApi : api).patch(path.replace("/auth", ""), payload, { headers });
+      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)
+      });
       return response.data;
     } catch (e) {
       throw formatAxiosError(e);
     }
   },
-  putJson: async (path, payload, headers) => {
+  putJson: async (path, payload, headersOrOptions) => {
     try {
-      const response = await (path.includes("/auth") ? authApi : api).put(path.replace("/auth", ""), payload, { headers });
+      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)
+      });
       return response.data;
     } catch (e) {
       throw formatAxiosError(e);
     }
   },
-  deleteJson: async (path, headers) => {
+  deleteJson: async (path, headersOrOptions) => {
     try {
-      const response = await (path.includes("/auth") ? authApi : api).delete(path.replace("/auth", ""), { headers });
+      const requestOptions = normalizeRequestOptions(void 0, headersOrOptions);
+      const response = await (path.includes("/auth") ? authApi : api).delete(path.replace("/auth", ""), {
+        headers: requestOptions.headers,
+        params: withTokenQueryParams(requestOptions)
+      });
       return response.data;
     } catch (e) {
       throw formatAxiosError(e);
     }
   },
-  deleteVoid: async (path, headers) => {
+  deleteVoid: async (path, headersOrOptions) => {
     try {
-      await (path.includes("/auth") ? authApi : api).delete(path.replace("/auth", ""), { headers });
+      const requestOptions = normalizeRequestOptions(void 0, headersOrOptions);
+      await (path.includes("/auth") ? authApi : api).delete(path.replace("/auth", ""), {
+        headers: requestOptions.headers,
+        params: withTokenQueryParams(requestOptions)
+      });
     } catch (e) {
       throw formatAxiosError(e);
     }
   }
 };
-function buildWsUrl(path = "/") {
+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 origin2.toString();
+    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 `${proto}://${host}${path.startsWith("/") ? path : "/" + path}`;
+    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) {
@@ -2898,17 +2943,41 @@ function extractBearerToken(headers, explicitToken) {
   const match = authHeader.match(/^Bearer\s+(.+)$/i);
   return match ? match[1] : null;
 }
-function appendWsQueryParam(url, key, value) {
+function resolveAuthToken(options = {}) {
+  const explicitToken = options.token ?? options.bearerToken ?? null;
+  const headerToken = extractBearerToken(options.headers, explicitToken);
+  if (headerToken)
+    return headerToken;
+  if (options.includeStoredToken === false)
+    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;
   try {
     const parsed = new URL(
       url,
       typeof window !== "undefined" ? window.location.href : void 0
     );
-    parsed.searchParams.set(key, value);
+    for (const [key, value] of Object.entries(params)) {
+      if (value === void 0 || value === null)
+        continue;
+      parsed.searchParams.set(key, String(value));
+    }
     return parsed.toString();
   } catch {
+    const search = Object.entries(params).filter(([, value]) => value !== void 0 && value !== null).map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`).join("&");
+    if (!search)
+      return url;
     const separator = url.includes("?") ? "&" : "?";
-    return `${url}${separator}${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
+    return `${url}${separator}${search}`;
   }
 }
 function normalizeProtocols(protocols) {
@@ -2916,6 +2985,39 @@ function normalizeProtocols(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 ?? {} }
+    };
+  }
+  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);
   return ffurl;
@@ -2925,9 +3027,14 @@ async function decodeFfurl(ffurl) {
   return settings;
 }
 function subscribeToWebsocket(url, onMessage, options = {}) {
-  const bearerToken = extractBearerToken(options.headers, options.bearerToken);
-  const bearerStrategy = options.bearerStrategy ?? "query";
-  let resolvedUrl = url;
+  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 protocols = normalizeProtocols(options.protocols) ?? [];
   if (options.headers && Object.keys(options.headers).length > 0) {
     console.warn(
@@ -2938,11 +3045,11 @@ function subscribeToWebsocket(url, onMessage, options = {}) {
     if (bearerStrategy === "protocol") {
       protocols.push("bearer", bearerToken);
     } else {
-      resolvedUrl = appendWsQueryParam(
-        url,
-        options.bearerQueryParam ?? "access_token",
-        bearerToken
-      );
+      resolvedUrl = withAccessTokenQuery(resolvedUrl, {
+        token: bearerToken,
+        tokenQueryParam: options.tokenQueryParam ?? options.bearerQueryParam,
+        includeStoredToken: false
+      });
     }
   }
   const socket = protocols.length > 0 ? new WebSocket(resolvedUrl, protocols) : new WebSocket(resolvedUrl);