@connectedxm/client 0.0.61 → 0.0.78

package/dist/index.mjs

@@ -1,6 +1,8 @@
 // src/ConnectedXMProvider.tsx
 import React from "react";
-import { QueryClientProvider } from "@tanstack/react-query";
+import {
+  QueryClientProvider
+} from "@tanstack/react-query";
 var ConnectedXMClientContext = React.createContext({});
 var ConnectedXMProvider = ({
   queryClient,
@@ -8,30 +10,15 @@ var ConnectedXMProvider = ({
   ...state
 }) => {
   const [ssr, setSSR] = React.useState(true);
-  const [token, setToken] = React.useState();
-  const [executeAs, setExecuteAs] = React.useState();
   React.useEffect(() => {
     setSSR(false);
   }, []);
   const render = () => {
-    return /* @__PURE__ */ React.createElement(
-      ConnectedXMClientContext.Provider,
-      {
-        value: {
-          ...state,
-          token,
-          setToken,
-          executeAs,
-          setExecuteAs
-        }
-      },
-      children
-    );
+    return /* @__PURE__ */ React.createElement(ConnectedXMClientContext.Provider, { value: state }, children);
   };
   if (ssr)
     return /* @__PURE__ */ React.createElement(QueryClientProvider, { client: queryClient }, render());
-  else
-    return render();
+  return render();
 };
 
 // src/hooks/useConnectedXM.ts
@@ -44,36 +31,6 @@ var useConnectedXM = () => {
   return context;
 };
 
-// src/hooks/useClientAPI.ts
-import axios from "axios";
-var getClientAPI = (apiUrl, organizationId, token, executeAs, locale) => {
-  return axios.create({
-    baseURL: apiUrl,
-    headers: {
-      authorization: token,
-      organization: organizationId,
-      executeAs,
-      locale
-    }
-  });
-};
-var useClientAPI = (locale) => {
-  const {
-    apiUrl,
-    token,
-    organizationId,
-    executeAs,
-    locale: _locale
-  } = useConnectedXM();
-  return getClientAPI(
-    apiUrl,
-    organizationId,
-    token,
-    executeAs,
-    locale || _locale
-  );
-};
-
 // src/interfaces.ts
 var RegistrationStatus = /* @__PURE__ */ ((RegistrationStatus2) => {
   RegistrationStatus2["registered"] = "registered";
@@ -331,10 +288,10 @@ var AppendInfiniteQuery = (queryClient, key, newData) => {
 };
 
 // src/utilities/GetErrorMessage.ts
-import axios2 from "axios";
+import axios from "axios";
 var GetErrorMessage = (error, fallback = "Something went wrong") => {
   let message = fallback;
-  if (axios2.isAxiosError(error)) {
+  if (axios.isAxiosError(error)) {
     message = error.response?.data?.message || message;
   } else {
     message = error.message;
@@ -358,25 +315,33 @@ var GetBaseSingleQueryKeys = (locale) => {
   return [locale];
 };
 var useConnectedSingleQuery = (queryKeys, queryFn, options) => {
-  const { locale, onModuleForbidden, onNotAuthorized, onNotFound } = useConnectedXM();
-  const clientApi = useClientAPI(locale);
+  const {
+    locale,
+    onModuleForbidden,
+    onNotAuthorized,
+    onNotFound,
+    apiUrl,
+    organizationId,
+    getToken,
+    getExecuteAs
+  } = useConnectedXM();
   return useQuery({
     staleTime: 60 * 1e3,
     // 60 Seconds
     retry: (failureCount, error) => {
       if (error.response?.status === 404) {
         if (onNotFound)
-          onNotFound(error);
+          onNotFound(error, queryKeys);
         return false;
       }
       if (error.response?.status === 403) {
         if (onModuleForbidden)
-          onModuleForbidden(error);
+          onModuleForbidden(error, queryKeys);
         return false;
       }
       if (error.response?.status === 401) {
         if (onNotAuthorized)
-          onNotAuthorized(error);
+          onNotAuthorized(error, queryKeys);
         return false;
       }
       if (failureCount < 3)
@@ -386,7 +351,13 @@ var useConnectedSingleQuery = (queryKeys, queryFn, options) => {
     ...options,
     queryKey: [...queryKeys, ...GetBaseSingleQueryKeys(locale)],
     queryFn: () => queryFn({
-      clientApi
+      clientApiParams: {
+        apiUrl,
+        organizationId,
+        getToken,
+        getExecuteAs,
+        locale
+      }
     })
   });
 };
@@ -463,8 +434,7 @@ var CacheIndividualQueries = (page, queryClient, queryKeyFn, locale = "en", item
 
 // src/queries/useConnectedInfiniteQuery.ts
 import {
-  useInfiniteQuery,
-  useQueryClient
+  useInfiniteQuery
 } from "@tanstack/react-query";
 var GetBaseInfiniteQueryKeys = (locale, search = "") => {
   return [locale, search];
@@ -476,9 +446,16 @@ var setFirstPageData = (response) => {
   };
 };
 var useConnectedInfiniteQuery = (queryKeys, queryFn, params = {}, options) => {
-  const { locale, onModuleForbidden, onNotAuthorized, onNotFound } = useConnectedXM();
-  const queryClient = useQueryClient();
-  const clientApi = useClientAPI(locale);
+  const {
+    locale,
+    onModuleForbidden,
+    onNotAuthorized,
+    onNotFound,
+    apiUrl,
+    getToken,
+    organizationId,
+    getExecuteAs
+  } = useConnectedXM();
   const getNextPageParam = (lastPage, allPages) => {
     if (lastPage.data.length === params.pageSize) {
       return allPages.length + 1;
@@ -491,17 +468,17 @@ var useConnectedInfiniteQuery = (queryKeys, queryFn, params = {}, options) => {
     retry: (failureCount, error) => {
       if (error.response?.status === 404) {
         if (onNotFound)
-          onNotFound(error);
+          onNotFound(error, queryKeys);
         return false;
       }
       if (error.response?.status === 403) {
         if (onModuleForbidden)
-          onModuleForbidden(error);
+          onModuleForbidden(error, queryKeys);
         return false;
       }
       if (error.response?.status === 401) {
         if (onNotAuthorized)
-          onNotAuthorized(error);
+          onNotAuthorized(error, queryKeys);
         return false;
       }
       if (failureCount < 3)
@@ -513,12 +490,34 @@ var useConnectedInfiniteQuery = (queryKeys, queryFn, params = {}, options) => {
       ...queryKeys,
       ...GetBaseInfiniteQueryKeys(params?.locale || locale, params?.search)
     ],
-    queryFn: ({ pageParam }) => queryFn({ ...params, pageSize: params.pageSize || 25, locale: params.locale || locale, pageParam, queryClient, clientApi }),
+    queryFn: ({ pageParam }) => queryFn({ ...params, pageSize: params.pageSize || 25, locale: params.locale || locale, pageParam, clientApiParams: {
+      apiUrl,
+      getToken,
+      organizationId,
+      getExecuteAs,
+      locale
+    } }),
     initialPageParam: 1,
     getNextPageParam
   });
 };
 
+// src/ClientAPI.ts
+import axios2 from "axios";
+var GetClientAPI = async (params) => {
+  const token = await params.getToken();
+  const executeAs = params.getExecuteAs ? await params.getExecuteAs() : void 0;
+  return axios2.create({
+    baseURL: params.apiUrl,
+    headers: {
+      organization: params.organizationId,
+      locale: params.locale,
+      authorization: token,
+      executeAs
+    }
+  });
+};
+
 // src/queries/accounts/useGetAccounts.ts
 var ACCOUNTS_QUERY_KEY = () => ["ACCOUNTS"];
 var SET_ACCOUNTS_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
@@ -535,9 +534,10 @@ var GetAccounts = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/accounts`, {
     params: {
       pageSize: pageSize || void 0,
@@ -556,14 +556,12 @@ var GetAccounts = async ({
   return data;
 };
 var useGetAccounts = (params = {}, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedInfiniteQuery(
     ACCOUNTS_QUERY_KEY(),
     (params2) => GetAccounts({ ...params2 }),
     params,
     {
-      ...options,
-      enabled: !!token && (options?.enabled ?? true)
+      ...options
     }
   );
 };
@@ -584,19 +582,19 @@ var SET_ACCOUNT_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) =>
 };
 var GetAccount = async ({
   accountId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/accounts/${accountId}`);
   return data;
 };
-var useGetAccount = (accountId, options = {}) => {
-  const { token } = useConnectedXM();
+var useGetAccount = (accountId = "", options = {}) => {
   return useConnectedSingleQuery(
     ACCOUNT_QUERY_KEY(accountId),
     (_params) => GetAccount({ accountId, ..._params }),
     {
       ...options,
-      enabled: !!token && !!accountId && (options?.enabled ?? true)
+      enabled: !!accountId && (options?.enabled ?? true)
     }
   );
 };
@@ -618,9 +616,10 @@ var GetActivities = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/activities`, {
     params: {
       page: pageParam || void 0,
@@ -640,13 +639,12 @@ var GetActivities = async ({
   return data;
 };
 var useGetActivities = (params = {}, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedInfiniteQuery(
     ACTIVITIES_QUERY_KEY(),
     (params2) => GetActivities(params2),
     params,
     {
-      enabled: !!token && (options?.enabled ?? true)
+      ...options
     }
   );
 };
@@ -667,19 +665,19 @@ var SET_ACTIVITY_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) =
 };
 var GetActivity = async ({
   activityId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/activities/${activityId}`);
   return data;
 };
-var useGetActivity = (activityId, options = {}) => {
-  const { token } = useConnectedXM();
+var useGetActivity = (activityId = "", options = {}) => {
   return useConnectedSingleQuery(
     ACTIVITY_QUERY_KEY(activityId),
     (params) => GetActivity({ activityId: activityId || "unknown", ...params }),
     {
       ...options,
-      enabled: !!token && !!activityId && (options?.enabled ?? true)
+      enabled: !!activityId && (options?.enabled ?? true)
     }
   );
 };
@@ -705,9 +703,10 @@ var GetAccountActivities = async ({
   search,
   accountId,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/accounts/${accountId}/activities`, {
     params: {
       page: pageParam || void 0,
@@ -726,15 +725,14 @@ var GetAccountActivities = async ({
   }
   return data;
 };
-var useGetAccountActivities = (accountId, params = {}, options = {}) => {
-  const { token } = useConnectedXM();
+var useGetAccountActivities = (accountId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     ACCOUNT_ACTIVITIES_QUERY_KEY(accountId),
     (params2) => GetAccountActivities({ accountId, ...params2 }),
     params,
     {
       ...options,
-      enabled: !!token && !!accountId
+      enabled: !!accountId
     }
   );
 };
@@ -752,19 +750,19 @@ var SET_ACCOUNT_BY_SHARE_CODE_QUERY_DATA = (client, keyParams, response, baseKey
 };
 var GetAccountByShareCode = async ({
   shareCode,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/accounts/shareCode/${shareCode}`);
   return data;
 };
-var useGetAccountByShareCode = (shareCode, options = {}) => {
-  const { token } = useConnectedXM();
+var useGetAccountByShareCode = (shareCode = "", options = {}) => {
   return useConnectedSingleQuery(
     ACCOUNT_BY_SHARE_CODE_QUERY_KEY(shareCode),
     (params) => GetAccountByShareCode({ shareCode: shareCode || "unknown", ...params }),
     {
       ...options,
-      enabled: !!token && !!shareCode && (options?.enabled ?? true),
+      enabled: !!shareCode && (options?.enabled ?? true),
       retry: false
     }
   );
@@ -788,7 +786,7 @@ var GetCommunities = async ({
   search,
   privateCommunities,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
   if (privateCommunities) {
@@ -798,6 +796,7 @@ var GetCommunities = async ({
       data: []
     };
   }
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/communities`, {
     params: {
       page: pageParam || void 0,
@@ -843,12 +842,13 @@ var SET_COMMUNITY_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"],
 };
 var GetCommunity = async ({
   communityId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/communities/${communityId}`);
   return data;
 };
-var useGetCommunity = (communityId, options = {}) => {
+var useGetCommunity = (communityId = "", options = {}) => {
   return useConnectedSingleQuery(
     COMMUNITY_QUERY_KEY(communityId),
     (params) => GetCommunity({ communityId, ...params }),
@@ -880,9 +880,10 @@ var GetAccountCommunities = async ({
   search,
   accountId,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/accounts/${accountId}/communities`, {
     params: {
       page: pageParam || void 0,
@@ -901,15 +902,14 @@ var GetAccountCommunities = async ({
   }
   return data;
 };
-var useGetAccountCommunities = (accountId, params = {}, options = {}) => {
-  const { token } = useConnectedXM();
+var useGetAccountCommunities = (accountId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     ACCOUNT_COMMUNITIES_QUERY_KEY(accountId),
     (params2) => GetAccountCommunities({ accountId, ...params2 }),
     params,
     {
       ...options,
-      enabled: !!token && !!accountId && (options?.enabled ?? true)
+      enabled: !!accountId && (options?.enabled ?? true)
     }
   );
 };
@@ -935,9 +935,10 @@ var GetAccountFollowers = async ({
   search,
   accountId,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/accounts/${accountId}/followers`, {
     params: {
       page: pageParam || void 0,
@@ -956,15 +957,14 @@ var GetAccountFollowers = async ({
   }
   return data;
 };
-var useGetAccountFollowers = (accountId, params = {}, options = {}) => {
-  const { token } = useConnectedXM();
+var useGetAccountFollowers = (accountId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     ACCOUNT_FOLLOWERS_QUERY_KEY(accountId),
     (params2) => GetAccountFollowers({ accountId, ...params2 }),
     params,
     {
       ...options,
-      enabled: !!token && !!accountId && (options?.enabled ?? true)
+      enabled: !!accountId && (options?.enabled ?? true)
     }
   );
 };
@@ -990,9 +990,10 @@ var GetAccountFollowings = async ({
   search,
   accountId,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/accounts/${accountId}/following`, {
     params: {
       page: pageParam || void 0,
@@ -1011,15 +1012,14 @@ var GetAccountFollowings = async ({
   }
   return data;
 };
-var useGetAccountFollowings = (accountId, params = {}, options = {}) => {
-  const { token } = useConnectedXM();
+var useGetAccountFollowings = (accountId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     ACCOUNT_FOLLOWINGS_QUERY_KEY(accountId),
     (params2) => GetAccountFollowings({ accountId, ...params2 }),
     params,
     {
       ...options,
-      enabled: !!token && !!accountId && (options?.enabled ?? true)
+      enabled: !!accountId && (options?.enabled ?? true)
     }
   );
 };
@@ -1045,9 +1045,10 @@ var GetActivityComments = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/activities/${activityId}/comments`, {
     params: {
       page: pageParam || void 0,
@@ -1066,14 +1067,13 @@ var GetActivityComments = async ({
   }
   return data;
 };
-var useGetActivityComments = (activityId, params = {}, options = {}) => {
-  const { token } = useConnectedXM();
+var useGetActivityComments = (activityId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     ACTIVITY_COMMENTS_QUERY_KEY(activityId),
     (params2) => GetActivityComments({ activityId, ...params2 }),
     params,
     {
-      enabled: !!token && !!activityId && (options?.enabled ?? true)
+      enabled: !!activityId && (options?.enabled ?? true)
     }
   );
 };
@@ -1093,8 +1093,9 @@ var SET_ADVERTISEMENT_QUERY_DATA = (client, keyParams, response, baseKeys = ["en
   );
 };
 var GetAdvertisement = async ({
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/advertisement`);
   return data;
 };
@@ -1125,8 +1126,9 @@ var GetBenefits = async ({
   pageSize,
   orderBy,
   search,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/benefits`, {
     params: {
       page: pageParam || void 0,
@@ -1138,14 +1140,12 @@ var GetBenefits = async ({
   return data;
 };
 var useGetBenefits = (params = {}, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedInfiniteQuery(
     BENEFITS_QUERY_KEY(),
     (params2) => GetBenefits(params2),
     params,
     {
-      ...options,
-      enabled: !!token && (options?.enabled ?? true)
+      ...options
     }
   );
 };
@@ -1168,9 +1168,10 @@ var GetCommunityActivities = async ({
   search,
   communityId,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(
     `/communities/${communityId}/activities`,
     {
@@ -1192,15 +1193,14 @@ var GetCommunityActivities = async ({
   }
   return data;
 };
-var useGetCommunityActivities = (communityId, params = {}, options = {}) => {
-  const { token } = useConnectedXM();
+var useGetCommunityActivities = (communityId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     COMMUNITY_ACTIVITIES_QUERY_KEY(communityId),
     (params2) => GetCommunityActivities({ communityId, ...params2 }),
     params,
     {
       ...options,
-      enabled: !!token && !!communityId && (options?.enabled ?? true)
+      enabled: !!communityId && (options?.enabled ?? true)
     }
   );
 };
@@ -1222,8 +1222,9 @@ var GetCommunityAnnouncements = async ({
   pageSize,
   orderBy,
   search,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(
     `/communities/${communityId}/announcements`,
     {
@@ -1237,15 +1238,14 @@ var GetCommunityAnnouncements = async ({
   );
   return data;
 };
-var useGetCommunityAnnouncements = (communityId, params = {}, options = {}) => {
-  const { token } = useConnectedXM();
+var useGetCommunityAnnouncements = (communityId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     COMMUNITY_ANNOUNCEMENTS_QUERY_KEY(communityId),
     (params2) => GetCommunityAnnouncements({ communityId, ...params2 }),
     params,
     {
       ...options,
-      enabled: !!token && !!communityId && (options?.enabled ?? true)
+      enabled: !!communityId && (options?.enabled ?? true)
     }
   );
 };
@@ -1274,9 +1274,10 @@ var GetEvents = async ({
   search,
   past,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/events`, {
     params: {
       page: pageParam || void 0,
@@ -1318,12 +1319,13 @@ var SET_EVENT_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
 };
 var GetEvent = async ({
   eventId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/events/${eventId}`);
   return data;
 };
-var useGetEvent = (eventId, options = {}) => {
+var useGetEvent = (eventId = "", options = {}) => {
   return useConnectedSingleQuery(
     EVENT_QUERY_KEY(eventId),
     (params) => GetEvent({ eventId, ...params }),
@@ -1357,9 +1359,10 @@ var GetCommunityEvents = async ({
   communityId,
   past,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/communities/${communityId}/events`, {
     params: {
       page: pageParam || void 0,
@@ -1379,7 +1382,7 @@ var GetCommunityEvents = async ({
   }
   return data;
 };
-var useGetCommunityEvents = (communityId, past = false, params = {}, options = {}) => {
+var useGetCommunityEvents = (communityId = "", past = false, params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     COMMUNITY_EVENTS_QUERY_KEY(communityId, past),
     (params2) => GetCommunityEvents({ communityId, past, ...params2 }),
@@ -1411,8 +1414,9 @@ var GetCommunityMembers = async ({
   orderBy,
   search,
   communityId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/communities/${communityId}/members`, {
     params: {
       page: pageParam || void 0,
@@ -1423,15 +1427,14 @@ var GetCommunityMembers = async ({
   });
   return data;
 };
-var useGetCommunityMembers = (communityId, params = {}, options = {}) => {
-  const { token } = useConnectedXM();
+var useGetCommunityMembers = (communityId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     COMMUNITY_MEMBERS_QUERY_KEY(communityId),
     (params2) => GetCommunityMembers({ communityId, ...params2 }),
     params,
     {
       ...options,
-      enabled: !!token && !!communityId && (options?.enabled ?? true)
+      enabled: !!communityId && (options?.enabled ?? true)
     }
   );
 };
@@ -1453,8 +1456,9 @@ var GetCommunityModerators = async ({
   orderBy,
   search,
   communityId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(
     `/communities/${communityId}/moderators`,
     {
@@ -1468,15 +1472,14 @@ var GetCommunityModerators = async ({
   );
   return data;
 };
-var useGetCommunityModerators = (communityId, params = {}, options = {}) => {
-  const { token } = useConnectedXM();
+var useGetCommunityModerators = (communityId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     COMMUNITY_MODERATORS_QUERY_KEY(communityId),
     (params2) => GetCommunityModerators({ communityId, ...params2 }),
     params,
     {
       ...options,
-      enabled: !!token && !!communityId && (options?.enabled ?? true)
+      enabled: !!communityId && (options?.enabled ?? true)
     }
   );
 };
@@ -1497,8 +1500,9 @@ var GetSponsors = async ({
   pageSize,
   orderBy,
   search,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/sponsors`, {
     params: {
       page: pageParam || void 0,
@@ -1534,12 +1538,13 @@ var SET_SPONSOR_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) =>
 };
 var GetSponsor = async ({
   accountId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/sponsors/${accountId}`);
   return data;
 };
-var useGetSponsor = (accountId, options = {}) => {
+var useGetSponsor = (accountId = "", options = {}) => {
   return useConnectedSingleQuery_default(
     SPONSOR_QUERY_KEY(accountId),
     (params) => GetSponsor({ accountId, ...params }),
@@ -1571,9 +1576,10 @@ var GetCommunitySponsors = async ({
   search,
   communityId,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/communities/${communityId}/sponsors`, {
     params: {
       page: pageParam || void 0,
@@ -1592,7 +1598,7 @@ var GetCommunitySponsors = async ({
   }
   return data;
 };
-var useGetCommunitySponsors = (communityId, params = {}, options = {}) => {
+var useGetCommunitySponsors = (communityId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     COMMUNITY_SPONSORS_QUERY_KEY(communityId),
     (params2) => GetCommunitySponsors({ communityId, ...params2 }),
@@ -1621,9 +1627,10 @@ var GetContents = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/contents`, {
     params: {
       page: pageParam || void 0,
@@ -1667,12 +1674,13 @@ var SET_CONTENT_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) =>
 };
 var GetContent = async ({
   contentId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/contents/${contentId}`);
   return data;
 };
-var useGetContent = (contentId, options = {}) => {
+var useGetContent = (contentId = "", options = {}) => {
   return useConnectedSingleQuery_default(
     CONTENT_QUERY_KEY(contentId),
     (params) => GetContent({ contentId: contentId || "", ...params }),
@@ -1704,9 +1712,10 @@ var GetContentActivities = async ({
   search,
   contentId,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/contents/${contentId}/activities`, {
     params: {
       page: pageParam || void 0,
@@ -1725,15 +1734,14 @@ var GetContentActivities = async ({
   }
   return data;
 };
-var useGetContentActivities = (contentId, params = {}, options = {}) => {
-  const { token } = useConnectedXM();
+var useGetContentActivities = (contentId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     CONTENT_ACTIVITIES_QUERY_KEY(contentId),
     (params2) => GetContentActivities({ contentId, ...params2 }),
     params,
     {
       ...options,
-      enabled: !!token && !!contentId && (options.enabled ?? true)
+      enabled: !!contentId && (options.enabled ?? true)
     }
   );
 };
@@ -1755,9 +1763,10 @@ var GetContentTypes = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/contentTypes`, {
     params: {
       page: pageParam || void 0,
@@ -1801,12 +1810,13 @@ var SET_CONTENT_TYPE_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"
 };
 var GetContentType = async ({
   contentTypeId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/contentTypes/${contentTypeId}`);
   return data;
 };
-var useGetContentType = (contentTypeId, options = {}) => {
+var useGetContentType = (contentTypeId = "", options = {}) => {
   return useConnectedSingleQuery_default(
     CONTENT_TYPE_QUERY_KEY(contentTypeId),
     (params) => GetContentType({ contentTypeId: contentTypeId || "", ...params }),
@@ -1835,9 +1845,10 @@ var GetContentTypeContents = async ({
   search,
   contentTypeId,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(
     `/contentTypes/${contentTypeId}/contents`,
     {
@@ -1859,7 +1870,7 @@ var GetContentTypeContents = async ({
   }
   return data;
 };
-var useGetContentTypeContents = (contentTypeId, params = {}, options = {}) => {
+var useGetContentTypeContents = (contentTypeId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     CONTENT_TYPE_CONTENTS_QUERY_KEY(contentTypeId),
     (params2) => GetContentTypeContents({ ...params2, contentTypeId: contentTypeId || "" }),
@@ -1892,9 +1903,10 @@ var GetEventActivities = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/events/${eventId}/activities`, {
     params: {
       page: pageParam || void 0,
@@ -1913,15 +1925,14 @@ var GetEventActivities = async ({
   }
   return data;
 };
-var useGetEventActivities = (eventId, params = {}, options = {}) => {
-  const { token } = useConnectedXM();
+var useGetEventActivities = (eventId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     EVENT_ACTIVITIES_QUERY_KEY(eventId),
     (params2) => GetEventActivities({ eventId, ...params2 }),
     params,
     {
       ...options,
-      enabled: !!token && !!eventId
+      enabled: !!eventId
     }
   );
 };
@@ -1947,9 +1958,10 @@ var GetEventFaqSections = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/events/${eventId}/faqs`, {
     params: {
       page: pageParam || void 0,
@@ -1968,7 +1980,7 @@ var GetEventFaqSections = async ({
   }
   return data;
 };
-var useGetEventFaqSections = (eventId, params = {}, options = {}) => {
+var useGetEventFaqSections = (eventId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     EVENT_FAQ_SECTIONS_QUERY_KEY(eventId),
     (params2) => GetEventFaqSections({ eventId, ...params2 }),
@@ -1994,12 +2006,13 @@ var SET_EVENT_FAQ_SECTION_QUERY_DATA = (client, keyParams, response, baseKeys =
 var GetEventFAQSection = async ({
   eventId,
   sectionId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/events/${eventId}/faqs/${sectionId}`);
   return data;
 };
-var useGetEventFAQSection = (eventId, sectionId, options = {}) => {
+var useGetEventFAQSection = (eventId = "", sectionId = "", options = {}) => {
   return useConnectedSingleQuery(
     EVENT_FAQ_SECTION_QUERY_KEY(eventId, sectionId),
     (params) => GetEventFAQSection({ eventId, sectionId, ...params }),
@@ -2032,9 +2045,10 @@ var GetEventFaqs = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(
     `/events/${eventId}/faqs/${sectionId}/questions`,
     {
@@ -2056,7 +2070,7 @@ var GetEventFaqs = async ({
   }
   return data;
 };
-var useGetEventFaqs = (eventId, sectionId, params = {}, options = {}) => {
+var useGetEventFaqs = (eventId = "", sectionId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     EVENT_FAQ_SECTION_QUESTIONS_QUERY_KEY(eventId, sectionId),
     (params2) => GetEventFaqs({ eventId, sectionId, ...params2 }),
@@ -2086,14 +2100,15 @@ var GetEventFAQSectionQuestion = async ({
   eventId,
   sectionId,
   questionId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(
     `/events/${eventId}/faqs/${sectionId}/questions/${questionId}`
   );
   return data;
 };
-var useGetEventFAQSectionQuestion = (eventId, sectionId, questionId, options = {}) => {
+var useGetEventFAQSectionQuestion = (eventId = "", sectionId = "", questionId = "", options = {}) => {
   return useConnectedSingleQuery(
     EVENT_FAQ_SECTION_QUESTION_QUERY_KEY(eventId, sectionId, questionId),
     (params) => GetEventFAQSectionQuestion({ eventId, sectionId, questionId, ...params }),
@@ -2125,9 +2140,10 @@ var GetEventPages = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/events/${eventId}/pages`, {
     params: {
       page: pageParam || void 0,
@@ -2146,7 +2162,7 @@ var GetEventPages = async ({
   }
   return data;
 };
-var useGetEventPages = (eventId, params = {}, options = {}) => {
+var useGetEventPages = (eventId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     EVENT_PAGES_QUERY_KEY(eventId),
     (params2) => GetEventPages({ eventId, ...params2 }),
@@ -2172,12 +2188,13 @@ var SET_EVENT_PAGE_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"])
 var GetEventPage = async ({
   eventId,
   pageId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/events/${eventId}/pages/${pageId}`);
   return data;
 };
-var useGetEventPage = (eventId, pageId, options = {}) => {
+var useGetEventPage = (eventId = "", pageId, options = {}) => {
   return useConnectedSingleQuery(
     EVENT_PAGE_QUERY_KEY(eventId, pageId),
     (params) => GetEventPage({ eventId, pageId, ...params }),
@@ -2197,8 +2214,9 @@ var GetEventQuestionSearchValues = async ({
   pageSize,
   orderBy,
   search,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(
     `/events/${eventId}/questions/${questionId}/values`,
     {
@@ -2212,7 +2230,7 @@ var GetEventQuestionSearchValues = async ({
   );
   return data;
 };
-var useGetEventQuestionSearchValues = (eventId, questionId, params = {}, options = {}) => {
+var useGetEventQuestionSearchValues = (eventId = "", questionId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     EVENT_QUESTION_VALUES_QUERY_KEY(eventId, questionId),
     (params2) => GetEventQuestionSearchValues({
@@ -2249,9 +2267,10 @@ var GetEventRegistrants = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/events/${eventId}/registrants`, {
     params: {
       page: pageParam || void 0,
@@ -2270,15 +2289,14 @@ var GetEventRegistrants = async ({
   }
   return data;
 };
-var useGetEventRegistrants = (eventId, params = {}, options = {}) => {
-  const { token } = useConnectedXM();
+var useGetEventRegistrants = (eventId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     EVENT_REGISTRANTS_QUERY_KEY(eventId),
     (params2) => GetEventRegistrants({ eventId, ...params2 }),
     params,
     {
       ...options,
-      enabled: !!token && !!eventId && (options?.enabled ?? true)
+      enabled: !!eventId && (options?.enabled ?? true)
     }
   );
 };
@@ -2304,9 +2322,10 @@ var GetEventSessions = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/events/${eventId}/sessions`, {
     params: {
       page: pageParam || void 0,
@@ -2325,7 +2344,7 @@ var GetEventSessions = async ({
   }
   return data;
 };
-var useGetEventSessions = (eventId, params = {}, options = {}) => {
+var useGetEventSessions = (eventId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     EVENT_SESSIONS_QUERY_KEY(eventId),
     (params2) => GetEventSessions({ eventId, ...params2 }),
@@ -2351,14 +2370,15 @@ var SET_EVENT_SESSION_QUERY_DATA = (client, keyParams, response, baseKeys = ["en
 var GetEventSession = async ({
   eventId,
   sessionId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(
     `/events/${eventId}/sessions/${sessionId}`
   );
   return data;
 };
-var useGetEventSession = (eventId, sessionId, options = {}) => {
+var useGetEventSession = (eventId = "", sessionId = "", options = {}) => {
   return useConnectedSingleQuery(
     EVENT_SESSION_QUERY_KEY(eventId, sessionId),
     (params) => GetEventSession({ eventId, sessionId, ...params }),
@@ -2390,9 +2410,10 @@ var GetEventSpeakers = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/events/${eventId}/speakers`, {
     params: {
       page: pageParam || void 0,
@@ -2411,7 +2432,7 @@ var GetEventSpeakers = async ({
   }
   return data;
 };
-var useGetEventSpeakers = (eventId, params = {}, options = {}) => {
+var useGetEventSpeakers = (eventId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     EVENT_SPEAKERS_QUERY_KEY(eventId),
     (params2) => GetEventSpeakers({ eventId, ...params2 }),
@@ -2437,14 +2458,15 @@ var SET_EVENT_SPEAKER_QUERY_DATA = (client, keyParams, response, baseKeys = ["en
 var GetEventSpeaker = async ({
   eventId,
   speakerId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(
     `/events/${eventId}/speakers/${speakerId}`
   );
   return data;
 };
-var useGetEventSpeaker = (eventId, speakerId, options = {}) => {
+var useGetEventSpeaker = (eventId = "", speakerId = "", options = {}) => {
   return useConnectedSingleQuery(
     EVENT_SPEAKER_QUERY_KEY(eventId, speakerId),
     (params) => GetEventSpeaker({ eventId, speakerId, ...params }),
@@ -2475,8 +2497,9 @@ var GetEventTickets = async ({
   pageSize,
   orderBy,
   search,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/events/${eventId}/tickets`, {
     params: {
       page: pageParam || void 0,
@@ -2487,7 +2510,7 @@ var GetEventTickets = async ({
   });
   return data;
 };
-var useGetEventTickets = (eventId, params = {}, options = {}) => {
+var useGetEventTickets = (eventId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     EVENT_TICKETS_QUERY_KEY(eventId),
     (params2) => GetEventTickets({ eventId, ...params2 }),
@@ -2520,9 +2543,10 @@ var GetEventSponsors = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/events/${eventId}/sponsors`, {
     params: {
       page: pageParam || void 0,
@@ -2541,7 +2565,7 @@ var GetEventSponsors = async ({
   }
   return data;
 };
-var useGetEventSponsors = (eventId, params = {}, options = {}) => {
+var useGetEventSponsors = (eventId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     EVENT_TICKETS_QUERY_KEY(eventId),
     (params2) => GetEventSponsors({ eventId, ...params2 }),
@@ -2572,9 +2596,10 @@ var GetFeaturedEvents = async ({
   pageSize,
   orderBy,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/events/featured`, {
     params: {
       page: pageParam || void 0,
@@ -2604,8 +2629,9 @@ var useGetFeaturedEvents = (params = {}, options = {}) => {
 // src/queries/organization/useGetOrganization.ts
 var ORGANIZATION_QUERY_KEY = () => ["ORGANIZATION"];
 var GetOrganization = async ({
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/organization`);
   return data;
 };
@@ -2623,8 +2649,9 @@ var ORGANIZATION_EXPLORE_QUERY_KEY = () => [
   "ORGANIZATION"
 ];
 var GetOrganizationExplore = async ({
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/organization/explore`);
   return data;
 };
@@ -2653,8 +2680,9 @@ var SET_ORGANIZATION_PAGE_QUERY_DATA = (queryClient, keyParams, response, baseKe
 };
 var GetOrganizationPage = async ({
   type,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/organization/pages/${type}`);
   return data;
 };
@@ -2675,8 +2703,9 @@ var ORGANIZATION_SUBSCRIPTIONS_QUERY_KEY = () => [
   "SUBSCRIPTIONS"
 ];
 var GetOrganizationSubscriptionProducts = async ({
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/organization/subscriptions`);
   return data;
 };
@@ -2695,8 +2724,9 @@ var ORGANIZATION_PAYMENT_INTEGRATION_QUERY_KEY = () => [
   "PAYMENT_INTEGRATION"
 ];
 var GetOrganizationPaymentIntegration = async ({
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/organization/payment-integration`);
   return data;
 };
@@ -2725,9 +2755,10 @@ var GetSelfChatChannels = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/chat/channels`, {
     params: {
       page: pageParam || void 0,
@@ -2753,14 +2784,12 @@ var GetSelfChatChannels = async ({
   return data;
 };
 var useGetSelfChatChannels = (params = {}, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedInfiniteQuery(
     SELF_CHAT_CHANNELS_QUERY_KEY(),
     (params2) => GetSelfChatChannels(params2),
     params,
     {
-      ...options,
-      enabled: !!token && (options?.enabled ?? true)
+      ...options
     }
   );
 };
@@ -2781,13 +2810,13 @@ var SET_SELF_CHAT_CHANNEL_QUERY_DATA = (client, keyParams, response, baseKeys =
 };
 var GetSelfChatChannel = async ({
   channelId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/chat/channels/${channelId}`);
   return data;
 };
 var useGetSelfChatChannel = (channelId, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedSingleQuery(
     SELF_CHAT_CHANNEL_QUERY_KEY(channelId),
     (params) => GetSelfChatChannel({
@@ -2797,7 +2826,7 @@ var useGetSelfChatChannel = (channelId, options = {}) => {
     {
       staleTime: Infinity,
       ...options,
-      enabled: !!token && !!channelId && (options?.enabled ?? true)
+      enabled: !!channelId && (options?.enabled ?? true)
     }
   );
 };
@@ -2819,8 +2848,9 @@ var GetSelfChatChannelMembers = async ({
   pageSize,
   orderBy,
   search,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(
     `/self/chat/channels/${channelId}/members`,
     {
@@ -2835,14 +2865,13 @@ var GetSelfChatChannelMembers = async ({
   return data;
 };
 var useGetSelfChatChannelMembers = (channelId, params = {}, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedInfiniteQuery(
     SELF_CHAT_CHANNEL_MEMBERS_QUERY_KEY(channelId),
     (params2) => GetSelfChatChannelMembers({ ...params2, channelId }),
     params,
     {
       ...options,
-      enabled: !!token && !!channelId && (options?.enabled ?? true)
+      enabled: !!channelId && (options?.enabled ?? true)
     }
   );
 };
@@ -2865,8 +2894,9 @@ var GetSelfChatChannelMessages = async ({
   orderBy,
   search,
   queryClient,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(
     `/self/chat/channels/${channelId}/messages`,
     {
@@ -2890,14 +2920,13 @@ var GetSelfChatChannelMessages = async ({
   return data;
 };
 var useGetSelfChatChannelMessages = (channelId, params = {}, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedInfiniteQuery(
     SELF_CHAT_CHANNEL_MESSAGES_QUERY_KEY(channelId),
     (params2) => GetSelfChatChannelMessages({ ...params2, channelId }),
     params,
     {
       ...options,
-      enabled: !!token && !!channelId && (options?.enabled ?? true)
+      enabled: !!channelId && (options?.enabled ?? true)
     }
   );
 };
@@ -2917,20 +2946,21 @@ var SET_SELF_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
 };
 var GetSelf = async ({
   authenticated,
-  clientApi
+  clientApiParams
 }) => {
-  if (authenticated)
-    clientApi.defaults.headers.delete["executeAs"];
+  const clientApi = await GetClientAPI({
+    ...clientApiParams,
+    getExecuteAs: authenticated ? void 0 : clientApiParams.getExecuteAs
+  });
   const { data } = await clientApi.get(`/self`);
   return data;
 };
 var useGetSelf = (authenticated, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedSingleQuery(
     SELF_QUERY_KEY(authenticated),
     (params) => GetSelf({ authenticated, ...params }),
     {
-      enabled: !!token && (options?.enabled ?? true)
+      ...options
     }
   );
 };
@@ -2951,8 +2981,9 @@ var GetSelfEventRegistration = async ({
   ticket,
   quantity,
   coupon,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/events/${eventId}/registration`, {
     params: {
       ticket: ticket || void 0,
@@ -2963,7 +2994,6 @@ var GetSelfEventRegistration = async ({
   return data;
 };
 var useGetSelfEventRegistration = (eventId, ticket, quantity, coupon, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedSingleQuery_default(
     SELF_EVENT_REGISTRATION_QUERY_KEY(eventId),
     (params) => GetSelfEventRegistration({
@@ -2978,7 +3008,7 @@ var useGetSelfEventRegistration = (eventId, ticket, quantity, coupon, options =
       staleTime: Infinity,
       refetchOnMount: false,
       ...options,
-      enabled: !!token && !!eventId && (options?.enabled ?? true)
+      enabled: !!eventId && (options?.enabled ?? true)
     }
   );
 };
@@ -2992,15 +3022,15 @@ var SELF_EVENT_REGISTRATION_CHECKOUT_QUERY_KEY = (eventId, registrationId) => [
 var GetSelfEventRegistrationCheckout = async ({
   eventId,
   registrationId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(
     `/self/events/${eventId}/registration/${registrationId}/draft/checkout`
   );
   return data;
 };
 var useGetSelfEventRegistrationCheckout = (eventId, registrationId = "", options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedSingleQuery_default(
     SELF_EVENT_REGISTRATION_CHECKOUT_QUERY_KEY(eventId, registrationId),
     (params) => GetSelfEventRegistrationCheckout({ eventId, registrationId, ...params }),
@@ -3009,7 +3039,7 @@ var useGetSelfEventRegistrationCheckout = (eventId, registrationId = "", options
       retry: false,
       retryOnMount: false,
       ...options,
-      enabled: !!token && !!eventId && !!registrationId
+      enabled: !!eventId && !!registrationId
     }
   );
 };
@@ -3029,9 +3059,10 @@ var GetSelfSubscriptions = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/subscriptions`, {
     params: {
       page: pageParam || void 0,
@@ -3052,14 +3083,12 @@ var GetSelfSubscriptions = async ({
   return data;
 };
 var useGetSelfSubscriptions = (status, params = {}, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedInfiniteQuery(
     SELF_SUBSCRIPTIONS_QUERY_KEY(status),
     (params2) => GetSelfSubscriptions({ status, ...params2 }),
     params,
     {
-      ...options,
-      enabled: !!token
+      ...options
     }
   );
 };
@@ -3068,19 +3097,19 @@ var useGetSelfSubscriptions = (status, params = {}, options = {}) => {
 var SELF_SUBSCRIPTION_QUERY_KEY = (subscriptionId) => [...SELF_SUBSCRIPTIONS_QUERY_KEY(), subscriptionId];
 var GetSelfSubcription = async ({
   subscriptionId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/subscriptions/${subscriptionId}`);
   return data;
 };
 var useGetSelfSubcription = (subscriptionId = "", options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedSingleQuery(
     SELF_SUBSCRIPTION_QUERY_KEY(subscriptionId),
     (params) => GetSelfSubcription({ subscriptionId, ...params }),
     {
       ...options,
-      enabled: !!token && !!subscriptionId
+      enabled: !!subscriptionId
     }
   );
 };
@@ -3093,8 +3122,9 @@ var GetSelfSubscriptionPayments = async ({
   pageSize,
   orderBy,
   search,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(
     `/self/subscriptions/${subscriptionId}/payments`,
     {
@@ -3109,14 +3139,12 @@ var GetSelfSubscriptionPayments = async ({
   return data;
 };
 var useGetSelfSubscriptionPayments = (subscriptionId, params = {}, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedInfiniteQuery(
     SELF_SUBSCRIPTION_PAYMENTS_QUERY_KEY(subscriptionId),
     (params2) => GetSelfSubscriptionPayments({ ...params2, subscriptionId }),
     params,
     {
-      ...options,
-      enabled: !!token
+      ...options
     }
   );
 };
@@ -3132,9 +3160,10 @@ var GetSelfActivities = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/activities`, {
     params: {
       page: pageParam || void 0,
@@ -3154,14 +3183,13 @@ var GetSelfActivities = async ({
   return data;
 };
 var useGetSelfActivities = (params = {}, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedInfiniteQuery(
     SELF_ACTIVITIES_QUERY_KEY(),
     (params2) => GetSelfActivities({ ...params2 }),
     params,
     {
       ...options,
-      enabled: !!token && (options.enabled ?? true)
+      enabled: options.enabled ?? true
     }
   );
 };
@@ -3170,19 +3198,19 @@ var useGetSelfActivities = (params = {}, options = {}) => {
 var SELF_ANNOUNCEMENT_QUERY_KEY = (announcementId) => [...SELF_QUERY_KEY(), "ANNOUNCEMENT", announcementId];
 var GetSelfAnnouncement = async ({
   announcementId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/announcements/${announcementId}`);
   return data;
 };
 var useGetSelfAnnouncement = (announcementId, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedSingleQuery(
     SELF_ANNOUNCEMENT_QUERY_KEY(announcementId),
     (params) => GetSelfAnnouncement({ announcementId, ...params }),
     {
       ...options,
-      enabled: !!token && !!announcementId && (options?.enabled ?? true)
+      enabled: !!announcementId && (options?.enabled ?? true)
     }
   );
 };
@@ -3197,8 +3225,9 @@ var GetSelfCommunityMemberships = async ({
   pageSize,
   orderBy,
   search,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/communities`, {
     params: {
       page: pageParam || void 0,
@@ -3210,14 +3239,12 @@ var GetSelfCommunityMemberships = async ({
   return data;
 };
 var useGetSelfCommunityMemberships = (params = {}, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedInfiniteQuery(
     SELF_COMMUNITY_MEMBERSHIPS_QUERY_KEY(),
     (params2) => GetSelfCommunityMemberships({ ...params2 }),
     params,
     {
-      ...options,
-      enabled: !!token && (options?.enabled ?? true)
+      ...options
     }
   );
 };
@@ -3235,21 +3262,21 @@ var SET_SELF_COMMUNITY_MEMBERSHIP_QUERY_DATA = (client, keyParams, response, bas
 };
 var GetSelfCommunityMembership = async ({
   communityId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(
     `/self/communities/${communityId}/membership`
   );
   return data;
 };
 var useGetSelfCommunityMembership = (communityId, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedSingleQuery(
     SELF_COMMUNITY_MEMBERSHIP_QUERY_KEY(communityId),
     (params) => GetSelfCommunityMembership({ communityId, ...params }),
     {
       ...options,
-      enabled: !!token && !!communityId && (options?.enabled ?? true)
+      enabled: !!communityId && (options?.enabled ?? true)
     }
   );
 };
@@ -3265,9 +3292,10 @@ var GetSelfDelegateOf = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/delegateof`, {
     params: {
       page: pageParam || void 0,
@@ -3287,14 +3315,12 @@ var GetSelfDelegateOf = async ({
   return data;
 };
 var useGetSelfDelegateOf = (params = {}, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedInfiniteQuery(
     SELF_DELEGATE_OF_QUERY_KEY(),
     (params2) => GetSelfDelegateOf({ ...params2 }),
     params,
     {
-      ...options,
-      enabled: !!token
+      ...options
     }
   );
 };
@@ -3310,9 +3336,10 @@ var GetSelfDelegates = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/delegates`, {
     params: {
       page: pageParam || void 0,
@@ -3332,14 +3359,12 @@ var GetSelfDelegates = async ({
   return data;
 };
 var useGetSelfDelegates = (params = {}, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedInfiniteQuery(
     SELF_DELEGATES_QUERY_KEY(),
     (params2) => GetSelfDelegates(params2),
     params,
     {
-      ...options,
-      enabled: !!token
+      ...options
     }
   );
 };
@@ -3357,9 +3382,10 @@ var GetSelfEventListings = async ({
   search,
   past,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/events/listings`, {
     params: {
       page: pageParam || void 0,
@@ -3380,14 +3406,12 @@ var GetSelfEventListings = async ({
   return data;
 };
 var useGetSelfEventListings = (past = false, params = {}, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedInfiniteQuery(
     SELF_EVENT_LISTINGS_QUERY_KEY(past),
     (params2) => GetSelfEventListings({ past, ...params2 }),
     params,
     {
-      ...options,
-      enabled: !!token
+      ...options
     }
   );
 };
@@ -3408,19 +3432,19 @@ var SET_SELF_EVENT_LISTING_QUERY_DATA = (client, keyParams, response, baseKeys =
 };
 var GetSelfEventListing = async ({
   eventId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`self/events/listings/${eventId}`);
   return data;
 };
 var useGetSelfEventListing = (eventId, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedSingleQuery(
     SELF_EVENT_LISTING_QUERY_KEY(eventId),
     (params) => GetSelfEventListing({ eventId, ...params }),
     {
       ...options,
-      enabled: !!token && !!eventId && (options?.enabled ?? true)
+      enabled: !!eventId && (options?.enabled ?? true)
     }
   );
 };
@@ -3438,8 +3462,9 @@ var GetSelfEventListingRegistrations = async ({
   orderBy,
   search,
   checkedIn,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(
     `/self/events/listings/${eventId}/registrations`,
     {
@@ -3455,14 +3480,13 @@ var GetSelfEventListingRegistrations = async ({
   return data;
 };
 var useGetSelfEventListingsRegistrations = (eventId, checkedIn = false, params = {}, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedInfiniteQuery(
     SELF_EVENT_LISTING_REGISTRATIONS_QUERY_KEY(eventId, checkedIn),
     (params2) => GetSelfEventListingRegistrations({ eventId, checkedIn, ...params2 }),
     params,
     {
       ...options,
-      enabled: !!token && !!eventId && (options?.enabled ?? true)
+      enabled: !!eventId && (options?.enabled ?? true)
     }
   );
 };
@@ -3480,9 +3504,10 @@ var GetSelfEvents = async ({
   search,
   past,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/events`, {
     params: {
       page: pageParam || void 0,
@@ -3503,14 +3528,13 @@ var GetSelfEvents = async ({
   return data;
 };
 var useGetSelfEvents = (past = false, params = {}, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedInfiniteQuery(
     SELF_EVENTS_QUERY_KEY(past),
     (params2) => GetSelfEvents({ ...params2, past }),
     params,
     {
       ...options,
-      enabled: !!token && (options.enabled ?? true)
+      enabled: options.enabled ?? true
     }
   );
 };
@@ -3528,9 +3552,10 @@ var GetSelfEventSessions = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/events/${eventId}/sessions`, {
     params: {
       eventId: eventId || void 0,
@@ -3551,14 +3576,13 @@ var GetSelfEventSessions = async ({
   return data;
 };
 var useGetSelfEventSessions = (eventId, params = {}, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedInfiniteQuery(
     SELF_EVENT_SESSIONS_QUERY_KEY(eventId),
     (params2) => GetSelfEventSessions({ eventId, ...params2 }),
     params,
     {
       ...options,
-      enabled: !!token && !!eventId && (options.enabled ?? true)
+      enabled: !!eventId && (options.enabled ?? true)
     }
   );
 };
@@ -3574,9 +3598,10 @@ var GetSelfFeed = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/activities/feed`, {
     params: {
       page: pageParam || void 0,
@@ -3596,14 +3621,12 @@ var GetSelfFeed = async ({
   return data;
 };
 var useGetSelfFeed = (params = {}, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedInfiniteQuery(
     SELF_FEED_QUERY_KEY(),
     (params2) => GetSelfFeed(params2),
     params,
     {
-      ...options,
-      enabled: !!token && (options?.enabled ?? true)
+      ...options
     }
   );
 };
@@ -3618,8 +3641,9 @@ var GetSelfInterests = async ({
   pageSize,
   orderBy,
   search,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/interests`, {
     params: {
       page: pageParam || void 0,
@@ -3631,14 +3655,12 @@ var GetSelfInterests = async ({
   return data;
 };
 var useGetSelfInterests = (params = {}, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedInfiniteQuery(
     SELF_INTERESTS_QUERY_KEY(),
     (params2) => GetSelfInterests({ ...params2 }),
     params,
     {
-      ...options,
-      enabled: !!token && (options?.enabled ?? true)
+      ...options
     }
   );
 };
@@ -3649,19 +3671,18 @@ var SELF_PREFERENCES_QUERY_KEY = () => [
   "PREFERENCES"
 ];
 var GetSelfNotificationPreferences = async ({
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/notificationPreferences`);
   return data;
 };
 var useGetSelfNotificationPreferences = (options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedSingleQuery(
     SELF_PREFERENCES_QUERY_KEY(),
     (params) => GetSelfNotificationPreferences({ ...params }),
     {
-      ...options,
-      enabled: !!token && (options?.enabled ?? true)
+      ...options
     }
   );
 };
@@ -3678,8 +3699,9 @@ var GetSelfNotifications = async ({
   orderBy,
   search,
   filters,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/notifications`, {
     params: {
       page: pageParam || void 0,
@@ -3692,15 +3714,13 @@ var GetSelfNotifications = async ({
   return data;
 };
 var useGetSelfNotifications = (filters = "", params = {}, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedInfiniteQuery(
     SELF_NOTIFICATIONS_QUERY_KEY(filters),
     (params2) => GetSelfNotifications({ ...params2, filters }),
     params,
     {
       staleTime: 0,
-      ...options,
-      enabled: !!token && (options?.enabled ?? true)
+      ...options
     }
   );
 };
@@ -3709,8 +3729,9 @@ var useGetSelfNotifications = (filters = "", params = {}, options = {}) => {
 var SELF_NOTIFICATION_COUNT_QUERY_KEY = (filters) => [...SELF_QUERY_KEY(), "NOTIFICATION_COUNT", filters];
 var GetSelfNewNotificationsCount = async ({
   filters,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/notifications/count`, {
     params: {
       filters
@@ -3719,13 +3740,11 @@ var GetSelfNewNotificationsCount = async ({
   return data;
 };
 var useGetSelfNewNotificationsCount = (filters = "", options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedSingleQuery_default(
     SELF_NOTIFICATION_COUNT_QUERY_KEY(filters),
     (params) => GetSelfNewNotificationsCount({ filters, ...params }),
     {
-      ...options,
-      enabled: !!token && (options?.enabled ?? true)
+      ...options
     }
   );
 };
@@ -3741,9 +3760,10 @@ var GetSelfPushDevices = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/push-devices`, {
     params: {
       page: pageParam || void 0,
@@ -3763,14 +3783,12 @@ var GetSelfPushDevices = async ({
   return data;
 };
 var useGetSelfPushDevices = (params = {}, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedInfiniteQuery(
     SELF_PUSH_DEVICES_QUERY_KEY(),
     (params2) => GetSelfPushDevices({ ...params2 }),
     params,
     {
-      ...options,
-      enabled: !!token
+      ...options
     }
   );
 };
@@ -3791,19 +3809,19 @@ var SET_PUSH_DEVICE_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]
 };
 var GetSelfPushDevice = async ({
   pushDeviceId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/push-devices/${pushDeviceId}`);
   return data;
 };
 var useGetSelfPushDevice = (pushDeviceId, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedSingleQuery(
     SELF_PUSH_DEVICE_QUERY_KEY(pushDeviceId),
     (params) => GetSelfPushDevice({ pushDeviceId, ...params }),
     {
       ...options,
-      enabled: !!token && !!pushDeviceId && (options?.enabled ?? true)
+      enabled: !!pushDeviceId && (options?.enabled ?? true)
     }
   );
 };
@@ -3823,9 +3841,10 @@ var GetSelfRecommendations = async ({
   eventId,
   type,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/recommendations`, {
     params: {
       page: pageParam || void 0,
@@ -3847,14 +3866,12 @@ var GetSelfRecommendations = async ({
   return data;
 };
 var useGetSelfRecommendations = (type, eventId = "", params = {}, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedInfiniteQuery(
     SELF_RECOMMENDATIONS_QUERY_KEY(type, eventId),
     (params2) => GetSelfRecommendations({ ...params2, eventId, type }),
     params,
     {
-      ...options,
-      enabled: !!token
+      ...options
     }
   );
 };
@@ -3869,8 +3886,9 @@ var GetSelfTransfers = async ({
   pageSize,
   orderBy,
   search,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/transfers`, {
     params: {
       page: pageParam || void 0,
@@ -3882,14 +3900,12 @@ var GetSelfTransfers = async ({
   return data;
 };
 var useGetSelfTransfers = (params = {}, options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedInfiniteQuery(
     SELF_TRANSFERS_QUERY_KEY(),
     (params2) => GetSelfTransfers({ ...params2 }),
     params,
     {
-      ...options,
-      enabled: !!token && (options?.enabled ?? true)
+      ...options
     }
   );
 };
@@ -3898,19 +3914,19 @@ var useGetSelfTransfers = (params = {}, options = {}) => {
 var SELF_PENDING_TRANSFER_QUERY_KEY = (transferId) => [...SELF_TRANSFERS_QUERY_KEY(), transferId];
 var GetSelfTransfer = async ({
   transferId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/transfers/${transferId}`);
   return data;
 };
 var useGetSelfTransfer = (transferId = "", options = {}) => {
-  const { token } = useConnectedXM();
   return useConnectedSingleQuery(
     SELF_PENDING_TRANSFER_QUERY_KEY(transferId),
     (params) => GetSelfTransfer({ ...params, transferId }),
     {
       ...options,
-      enabled: !!token && !!transferId && (options?.enabled ?? true)
+      enabled: !!transferId && (options?.enabled ?? true)
     }
   );
 };
@@ -3932,9 +3948,10 @@ var GetSeriesList = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/series`, {
     params: {
       page: pageParam || void 0,
@@ -3975,12 +3992,13 @@ var SET_SERIES_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) =>
 };
 var GetSeries = async ({
   seriesId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/series/${seriesId}`);
   return data;
 };
-var useGetSeries = (seriesId, options = {}) => {
+var useGetSeries = (seriesId = "", options = {}) => {
   return useConnectedSingleQuery(
     SERIES_QUERY_KEY(seriesId),
     (params) => GetSeries({ seriesId, ...params }),
@@ -4012,9 +4030,10 @@ var GetSeriesEvents = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/series/${seriesId}/events`, {
     params: {
       page: pageParam || void 0,
@@ -4033,7 +4052,7 @@ var GetSeriesEvents = async ({
   }
   return data;
 };
-var useGetSeriesEvents = (seriesId, params = {}, options = {}) => {
+var useGetSeriesEvents = (seriesId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     SERIES_EVENTS_QUERY_KEY(seriesId),
     (params2) => GetSeriesEvents({ seriesId, ...params2 }),
@@ -4062,9 +4081,10 @@ var GetLevels = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/levels`, {
     params: {
       page: pageParam || void 0,
@@ -4105,12 +4125,13 @@ var SET_LEVEL_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
 };
 var GetLevel = async ({
   levelId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/levels/${levelId}`, {});
   return data;
 };
-var useGetLevel = (levelId, options = {}) => {
+var useGetLevel = (levelId = "", options = {}) => {
   return useConnectedSingleQuery_default(
     LEVEL_QUERY_KEY(levelId),
     (params) => GetLevel({ levelId, ...params }),
@@ -4142,9 +4163,10 @@ var GetLevelSponsors = async ({
   orderBy,
   search,
   queryClient,
-  clientApi,
+  clientApiParams,
   locale
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/levels/${levelId}/accounts`, {
     params: {
       page: pageParam || void 0,
@@ -4163,7 +4185,7 @@ var GetLevelSponsors = async ({
   }
   return data;
 };
-var useGetLevelSponsors = (levelId, params = {}, options = {}) => {
+var useGetLevelSponsors = (levelId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
     LEVEL_SPONSORS_QUERY_KEY(levelId),
     (params2) => GetLevelSponsors({ levelId, ...params2 }),
@@ -4178,18 +4200,23 @@ var useGetLevelSponsors = (levelId, params = {}, options = {}) => {
 // src/mutations/useConnectedMutation.ts
 import {
   useMutation,
-  useQueryClient as useQueryClient2
+  useQueryClient
 } from "@tanstack/react-query";
 var useConnectedMutation = (mutation, params, options) => {
-  const { locale } = useConnectedXM();
-  const queryClient = useQueryClient2();
-  const clientApi = useClientAPI();
+  const { locale, apiUrl, getToken, organizationId, getExecuteAs } = useConnectedXM();
+  const queryClient = useQueryClient();
   return useMutation({
     mutationFn: (data) => mutation({
-      locale: params?.locale || locale,
-      ...data,
       queryClient,
-      clientApi
+      locale: params?.locale || locale,
+      clientApiParams: {
+        apiUrl,
+        getToken,
+        organizationId,
+        getExecuteAs,
+        locale: params?.locale || locale
+      },
+      ...data
     }),
     ...options
   });
@@ -4199,10 +4226,11 @@ var useConnectedMutation_default = useConnectedMutation;
 // src/mutations/accounts/useFollowAccount.ts
 var FollowAccount = async ({
   accountId,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/accounts/${accountId}/follow`
   );
@@ -4222,10 +4250,11 @@ var useFollowAccount = (params = {}, options = {}) => {
 // src/mutations/accounts/useUnfollowAccount.ts
 var UnfollowAccount = async ({
   accountId,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/accounts/${accountId}/unfollow`
   );
@@ -4300,7 +4329,7 @@ var UpdateResharesInfinite = (increment, queryClient, KEY, activityId) => {
 // src/mutations/activities/useDeleteReshare.ts
 var DeleteReshare = async ({
   activityId,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
   if (queryClient) {
@@ -4312,6 +4341,7 @@ var DeleteReshare = async ({
       activityId
     );
   }
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.delete(
     `/self/activities/${activityId}/reshares`
   );
@@ -4379,13 +4409,14 @@ var UpdateLikesInfinite = (increment, queryClient, KEY, activityId) => {
 // src/mutations/activities/useLikeActivity.ts
 var LikeActivity = async ({
   activityId,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
   if (queryClient) {
     UpdateLikesSingle(true, queryClient, ACTIVITY_QUERY_KEY(activityId));
     UpdateLikesInfinite(true, queryClient, ACTIVITIES_QUERY_KEY(), activityId);
   }
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/self/activities/${activityId}/likes`
   );
@@ -4399,7 +4430,7 @@ var useLikeActivity = (params = {}, options = {}) => {
 var ReshareActivity = async ({
   activityId,
   queryClient,
-  clientApi
+  clientApiParams
 }) => {
   if (queryClient) {
     UpdateResharesSingle(true, queryClient, ACTIVITY_QUERY_KEY(activityId));
@@ -4410,6 +4441,7 @@ var ReshareActivity = async ({
       activityId
     );
   }
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/self/activities/${activityId}/reshares`,
     {
@@ -4425,13 +4457,14 @@ var useReshareActivity = (params = {}, options = {}) => {
 // src/mutations/activities/useUnlikeActivity.ts
 var UnlikeActivity = async ({
   activityId,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
   if (queryClient) {
     UpdateLikesSingle(false, queryClient, ACTIVITY_QUERY_KEY(activityId));
     UpdateLikesInfinite(false, queryClient, ACTIVITIES_QUERY_KEY(), activityId);
   }
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.delete(
     `/self/activities/${activityId}/likes`
   );
@@ -4445,9 +4478,10 @@ var useUnlikeActivity = (params = {}, options = {}) => {
 var AddCommunityEvent = async ({
   communityId,
   eventId,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/communityModerator/${communityId}/events/${eventId}`
   );
@@ -4475,9 +4509,10 @@ var CreateCommunityAnnouncement = async ({
   html,
   email,
   push,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/communityModerator/${communityId}/announcements`,
     {
@@ -4504,9 +4539,10 @@ var useCreateCommunityAnnouncement = (params = {}, options = {}) => {
 var RemoveCommunityEvent = async ({
   communityId,
   eventId,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.delete(
     `/communityModerator/${communityId}/events/${eventId}`
   );
@@ -4533,10 +4569,11 @@ var UpdateCommunity = async ({
   description,
   externalUrl,
   base64,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.put(
     `/communityModerator/${communityId}`,
     {
@@ -4563,9 +4600,10 @@ var CompleteEventActivation = async ({
   eventId,
   activationId,
   code,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/events/${eventId}/activations/${activationId}`,
     {
@@ -4585,9 +4623,10 @@ var CreateEventLead = async ({
   eventId,
   purchaseId,
   note,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/events/${eventId}/leads/${purchaseId}`,
     {
@@ -4606,9 +4645,10 @@ var useCreateEventLead = (params = {}, options = {}) => {
 var AddSelfChatChannelMember = async ({
   channelId,
   accountId,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/self/chat/channels/${channelId}/members/${accountId}`
   );
@@ -4627,9 +4667,10 @@ var useAddSelfChatChannelMember = (params = {}, options = {}) => {
 var CreateSelfChatChannel = async ({
   name,
   accountIds,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/self/chat/channels`,
     {
@@ -4653,8 +4694,9 @@ var CreateSelfChatChannelMessage = async ({
   channelId,
   text,
   queryClient,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(`/self/chat/channels/${channelId}/messages`, {
     text
   });
@@ -4669,9 +4711,10 @@ var useCreateSelfChatChannelMessage = (params = {}, options = {}) => {
 // src/mutations/self/chat/useDeleteSelfChatChannel.ts
 var DeleteSelfChatChannel = async ({
   channelId,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.delete(
     `/self/chat/channels/${channelId}`
   );
@@ -4691,9 +4734,10 @@ var useDeleteSelfChatChannel = (params = {}, options = {}) => {
 var DeleteSelfChatChannelMessage = async ({
   channelId,
   messageId,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.delete(
     `/self/chat/channels/${channelId}/messages/${messageId}`
   );
@@ -4711,9 +4755,10 @@ var useDeleteSelfChatChannelMessage = (params = {}, options = {}) => {
 // src/mutations/self/chat/useLeaveSelfChatChannel.ts
 var LeaveSelfChatChannel = async ({
   channelId,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.delete(
     `/self/chat/channels/${channelId}/leave`
   );
@@ -4733,10 +4778,11 @@ var useLeaveSelfChatChannel = (params = {}, options = {}) => {
 var UpdateSelfChatChannelNotifications = async ({
   channelId,
   notifications,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.put(
     `/self/chat/channels/${channelId}/notifications`,
     {
@@ -4759,10 +4805,11 @@ var useUpdateSelfChatChannelNotifications = (params = {}, options = {}) => {
 var RegisterCancelledEventRegistration = async ({
   eventId,
   registrationId,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/self/events/${eventId}/registration/${registrationId}/cancelled/register`
   );
@@ -4794,10 +4841,11 @@ var SelectSelfEventRegistrationCoupon = async ({
   eventId,
   registrationId,
   couponId,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/self/events/${eventId}/registration/${registrationId}/draft/coupon`,
     {
@@ -4837,10 +4885,11 @@ var useSelectSelfEventRegistrationCoupon = (params = {}, options = {}) => {
 var CaptureSelfEventRegistrationPayment = async ({
   eventId,
   registrationId,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/self/events/${eventId}/registration/${registrationId}/draft/capture`
   );
@@ -4860,10 +4909,11 @@ var CreateSelfEventRegistrationGuest = async ({
   eventId,
   registrationId,
   guest,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/self/events/${eventId}/registration/${registrationId}/draft/guests`,
     guest
@@ -4884,10 +4934,11 @@ var DeleteSelfEventRegistrationGuest = async ({
   eventId,
   registrationId,
   guestId,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.delete(
     `/self/events/${eventId}/registration/${registrationId}/draft/guests/${guestId}`
   );
@@ -4906,10 +4957,11 @@ var useDeleteSelfEventRegistrationGuest = (params = {}, options = {}) => {
 var RemoveSelfEventRegistrationCoupon = async ({
   eventId,
   registrationId,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.delete(
     `/self/events/${eventId}/registration/${registrationId}/draft/coupon`
   );
@@ -4946,10 +4998,11 @@ var useRemoveSelfEventRegistrationCoupon = (params = {}, options = {}) => {
 var RemoveSelfEventRegistrationTicket = async ({
   eventId,
   registrationId,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.delete(
     `/self/events/${eventId}/registration/${registrationId}/draft/ticket`
   );
@@ -4987,10 +5040,11 @@ var SelectSelfEventRegistrationTicket = async ({
   eventId,
   registrationId,
   ticketId,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/self/events/${eventId}/registration/${registrationId}/draft/ticket`,
     {
@@ -5026,10 +5080,11 @@ var SubmitSelfEventRegistration = async ({
   eventId,
   registrationId,
   payment,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/self/events/${eventId}/registration/${registrationId}/draft/submit`,
     payment
@@ -5051,10 +5106,11 @@ var UpdateSelfEventRegistrationGuest = async ({
   registrationId,
   guestId,
   guest,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.put(
     `/self/events/${eventId}/registration/${registrationId}/draft/guests/${guestId}`,
     guest
@@ -5078,10 +5134,11 @@ var UpdateSelfEventRegistrationGuestResponseFile = async ({
   guestId,
   dataUrl,
   name,
-  clientApi
+  clientApiParams
 }) => {
   if (!guestId)
     throw new Error("Guest ID is required");
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.put(
     `/self/events/${eventId}/registration/${registrationId}/draft/guests/${guestId}/responses/file`,
     {
@@ -5102,8 +5159,9 @@ var UpdateSelfEventRegistrationGuestResponses = async ({
   registrationId,
   guestId,
   responses,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.put(
     `/self/events/${eventId}/registration/${registrationId}/draft/guests/${guestId}/responses`,
     responses
@@ -5121,8 +5179,9 @@ var UpdateSelfEventRegistrationResponseFile = async ({
   dataUrl,
   name,
   questionId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.put(
     `/self/events/${eventId}/registration/${registrationId}/draft/responses/file`,
     {
@@ -5142,10 +5201,11 @@ var UpdateSelfEventRegistrationResponses = async ({
   eventId,
   registrationId,
   responses,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.put(
     `/self/events/${eventId}/registration/${registrationId}/draft/responses`,
     responses
@@ -5165,10 +5225,11 @@ var useUpdateSelfEventRegistrationResponses = (params = {}, options = {}) => {
 var CancelEventRegistration = async ({
   eventId,
   registrationId,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "env"
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.delete(
     `/self/events/${eventId}/registration/${registrationId}/registered/cancel`
   );
@@ -5200,9 +5261,10 @@ var CancelTransfer = async ({
   transferId,
   eventId,
   registrationId,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.delete(
     `/self/events/${eventId}/registration/${registrationId}/transfer/${transferId}`
   );
@@ -5223,9 +5285,10 @@ var TransferPurchase = async ({
   purchaseId,
   eventId,
   registrationId,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/self/events/${eventId}/registration/${registrationId}/transfer`,
     {
@@ -5250,10 +5313,11 @@ var UpdateSelfEventRegistrationResponse = async ({
   registrationId,
   questionId,
   response,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.put(
     `/self/events/${eventId}/registration/${registrationId}/registered/response`,
     {
@@ -5283,10 +5347,11 @@ var UpdateSelfEventRegistrationGuestResponse = async ({
   questionId,
   guestId,
   response,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.put(
     `/self/events/${eventId}/registration/${registrationId}/registered/guests/${guestId}/response`,
     {
@@ -5312,9 +5377,10 @@ var useUpdateSelfEventRegistrationGuestResponse = (params = {}, options = {}) =>
 // src/mutations/self/subscriptions/useCancelSubscription.ts
 var CancelSubscription = async ({
   subscriptionId,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.delete(
     `/self/subscriptions/${subscriptionId}`
   );
@@ -5336,8 +5402,9 @@ var useCancelSubscription = (params = {}, options = {}) => {
 var CreateSubscription = async ({
   productId,
   priceId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post("/self/subscriptions", {
     productId,
     priceId,
@@ -5353,9 +5420,10 @@ var useCreateSubscription = (params = {}, options = {}) => {
 var UpdateSubscriptionPaymentMethod = async ({
   subscriptionId,
   paymentMethodId,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.put(
     `/self/subscriptions/${subscriptionId}/payment-method`,
     {
@@ -5376,9 +5444,10 @@ var useUpdateSubscriptionPaymentMethod = (params = {}, options = {}) => {
 // src/mutations/self/useAcceptTransfer.ts
 var AcceptTransfer = async ({
   transferId,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/self/transfers/${transferId}`
   );
@@ -5394,9 +5463,10 @@ var useAcceptTransfer = (params = {}, options = {}) => {
 // src/mutations/self/useAddSelfDelegate.ts
 var AddSelfDelegate = async ({
   email,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/self/delegates`,
     {
@@ -5416,10 +5486,11 @@ var useAddSelfDelegate = (params = {}, options = {}) => {
 var AddSelfEventListingSession = async ({
   eventId,
   session,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/self/events/listings/${eventId}/sessions`,
     {
@@ -5468,10 +5539,11 @@ var useAddSelfEventListingSession = (params = {}, options = {}) => {
 var AddSelfEventListingSpeaker = async ({
   eventId,
   speaker,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/self/events/listings/${eventId}/speakers`,
     {
@@ -5520,7 +5592,7 @@ var useAddSelfEventListingSpeaker = (params = {}, options = {}) => {
 var AddSelfEventListingSponsor = async ({
   eventId,
   sponsor,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
@@ -5554,6 +5626,7 @@ var AddSelfEventListingSponsor = async ({
       }
     );
   }
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/self/events/listings/${eventId}/sponsors`,
     {
@@ -5570,9 +5643,10 @@ var useAddSelfEventListingSponsor = (params = {}, options = {}) => {
 var AddSelfEventSession = async ({
   eventId,
   sessionId,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/self/events/${eventId}/sessions/${sessionId}`
   );
@@ -5595,10 +5669,11 @@ var CreateSelfEventListing = async ({
   sponsorIds,
   speakers,
   sessions,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   let data;
   if (communityId) {
     data = (await clientApi.post(
@@ -5646,9 +5721,10 @@ var useCreateSelfEventListing = (params = {}, options = {}) => {
 
 // src/mutations/self/useDeleteSelf.ts
 var DeleteSelf = async ({
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.delete(`/self`);
   if (queryClient && data.status === "ok") {
     queryClient.clear();
@@ -5662,9 +5738,10 @@ var useDeleteSelf = (params = {}, options = {}) => {
 // src/mutations/self/useDeleteSelfPushDevice.ts
 var DeleteSelfPushDevice = async ({
   pushDeviceId,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.delete(
     `/self/push-devices/${pushDeviceId}`
   );
@@ -5682,9 +5759,10 @@ var useDeleteSelfPushDevice = (params = {}, options = {}) => {
 // src/mutations/self/useRejectTransfer.ts
 var RejectTransfer = async ({
   transferId,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.delete(
     `/self/transfers/${transferId}`
   );
@@ -5702,9 +5780,10 @@ var useRejectTransfer = (params = {}, options = {}) => {
 // src/mutations/self/useRemoveSelfDelegate.ts
 var RemoveSelfDelegate = async ({
   accountId,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.delete(
     `/self/delegates/${accountId}`
   );
@@ -5721,7 +5800,7 @@ var useRemoveSelfDelegate = (params = {}, options = {}) => {
 var RemoveSelfEventListingSession = async ({
   eventId,
   sessionId,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
@@ -5755,6 +5834,7 @@ var RemoveSelfEventListingSession = async ({
       }
     );
   }
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.delete(
     `/self/events/listings/${eventId}/sessions/${sessionId}`
   );
@@ -5768,7 +5848,7 @@ var useRemoveSelfEventListingSession = (params = {}, options = {}) => {
 var RemoveSelfEventListingSpeaker = async ({
   eventId,
   speakerId,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
@@ -5802,6 +5882,7 @@ var RemoveSelfEventListingSpeaker = async ({
       }
     );
   }
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.delete(
     `/self/events/listings/${eventId}/speakers/${speakerId}`
   );
@@ -5815,7 +5896,7 @@ var useRemoveSelfEventListingSpeaker = (params = {}, options = {}) => {
 var RemoveSelfEventListingSponsor = async ({
   eventId,
   sponsorId,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
@@ -5849,6 +5930,7 @@ var RemoveSelfEventListingSponsor = async ({
       }
     );
   }
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.delete(
     `/self/events/listings/${eventId}/sponsors/${sponsorId}`
   );
@@ -5862,9 +5944,10 @@ var useRemoveSelfEventListingSponsor = (params = {}, options = {}) => {
 var RemoveSelfEventSession = async ({
   eventId,
   sessionId,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.delete(
     `/self/events/${eventId}/sessions/${sessionId}`
   );
@@ -5883,9 +5966,10 @@ var useRemoveSelfEventSession = (params = {}, options = {}) => {
 var SelfCheckinRegistration = async ({
   accountId,
   eventId,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/self/events/listings/${eventId}/registrations/${accountId}`
   );
@@ -5969,7 +6053,7 @@ var SelfCreateActivity = async ({
   activity,
   base64Image,
   videoUri,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
@@ -5987,6 +6071,7 @@ var SelfCreateActivity = async ({
       );
     }
   }
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/self/activities`,
     {
@@ -6047,9 +6132,10 @@ var useSelfCreateActivity = (params = {}, options = {}) => {
 // src/mutations/self/useSelfDeleteActivity.ts
 var DeleteActivity = async ({
   activityId,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.delete(
     `/self/activities/${activityId}`
   );
@@ -6065,9 +6151,10 @@ var useDeleteActivity = (params = {}, options = {}) => {
 // src/mutations/self/useSelfJoinCommunity.ts
 var SelfJoinCommunity = async ({
   communityId,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(`/self/communities/${communityId}`);
   if (queryClient && data.status === "ok") {
     queryClient.invalidateQueries({
@@ -6092,9 +6179,10 @@ var useSelfJoinCommunity = (params = {}, options = {}) => {
 // src/mutations/self/useSelfLeaveCommunity.ts
 var SelfLeaveCommunity = async ({
   communityId,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.delete(
     `/self/communities/${communityId}`
   );
@@ -6122,7 +6210,7 @@ var useSelfLeaveCommunity = (params = {}, options = {}) => {
 var SelfUpdateCommunityMembership = async ({
   communityId,
   membership,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
@@ -6140,6 +6228,7 @@ var SelfUpdateCommunityMembership = async ({
       }
     );
   }
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.put(`/self/communities/${communityId}`, membership);
   return data;
 };
@@ -6149,10 +6238,11 @@ var useSelfUpdateCommunityMembership = (params = {}, options = {}) => {
 
 // src/mutations/self/useUpdateSelf.ts
 var UpdateSelf = async ({
-  clientApi,
+  clientApiParams,
   queryClient,
   ...params
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.put(
     `/self`,
     params
@@ -6171,10 +6261,11 @@ var UpdateSelfEventListing = async ({
   eventId,
   event,
   base64,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.put(
     `/self/events/listings/${eventId}`,
     {
@@ -6207,10 +6298,11 @@ var UpdateSelfEventListingSession = async ({
   eventId,
   session,
   sessionId,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.put(
     `/self/events/listings/${eventId}/sessions/${sessionId}`,
     {
@@ -6259,10 +6351,11 @@ var UpdateSelfEventListingSpeaker = async ({
   speaker,
   speakerId,
   buffer,
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en"
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.put(
     `/self/events/listings/${eventId}/speakers/${speakerId}`,
     {
@@ -6309,9 +6402,10 @@ var useUpdateSelfEventListingSpeaker = (params = {}, options = {}) => {
 // src/mutations/self/useUpdateSelfImage.ts
 var UpdateSelfImage = async ({
   base64,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.put(
     `/self/image`,
     {
@@ -6331,8 +6425,9 @@ var useUpdateSelfImage = (params = {}, options = {}) => {
 var UpdateSelfLead = async ({
   leadId,
   note,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.put(
     `/self/leads/${leadId}`,
     {
@@ -6347,7 +6442,7 @@ var useUpdateSelfLead = (params = {}, options = {}) => {
 
 // src/mutations/self/useUpdateSelfNotificationPreferences.ts
 var UpdateSelfNotificationPreferences = async ({
-  clientApi,
+  clientApiParams,
   queryClient,
   locale = "en",
   ...params
@@ -6365,6 +6460,7 @@ var UpdateSelfNotificationPreferences = async ({
       }
     );
   }
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.put(`/self/notificationPreferences`, params);
   return data;
 };
@@ -6376,9 +6472,10 @@ var useUpdateSelfNotificationPreferences = (params = {}, options = {}) => {
 var UpdateSelfPushDevice = async ({
   pushDeviceId,
   pushDevice,
-  clientApi,
+  clientApiParams,
   queryClient
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.put(
     `/self/push-devices/${pushDeviceId}`,
     {
@@ -6406,8 +6503,9 @@ var CreateSupportTicket = async ({
   request,
   eventId,
   productId,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     "/supportTickets",
     {
@@ -6428,8 +6526,9 @@ var useCreateSupportTicket = (params = {}, options = {}) => {
 var CreateTeamAccount = async ({
   name,
   email,
-  clientApi
+  clientApiParams
 }) => {
+  const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.post(
     `/self/team`,
     {
@@ -6541,6 +6640,7 @@ export {
   GetActivityComments,
   GetAdvertisement,
   GetBenefits,
+  GetClientAPI,
   GetCommunities,
   GetCommunity,
   GetCommunityActivities,
@@ -6776,7 +6876,6 @@ export {
   UpdateSelfNotificationPreferences,
   UpdateSelfPushDevice,
   UpdateSubscriptionPaymentMethod,
-  getClientAPI,
   isListing,
   isManagedCoupon,
   isSelf,
@@ -6826,7 +6925,6 @@ export {
   useCancelSubscription,
   useCancelTransfer,
   useCaptureSelfEventRegistrationPayment,
-  useClientAPI,
   useCompleteEventActivation,
   useConnectedXM,
   useCreateCommunityAnnouncement,