@ethlete/query 5.33.2 → 5.34.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @ethlete/query
 
+## 5.34.0
+
+### Minor Changes
+
+- [`2cf5165`](https://github.com/ethlete-io/ethdk/commit/2cf5165074956da6ce918ac9a7b0585897744651) Thanks [@TomTomB](https://github.com/TomTomB)! - Add bearerDecryptFn to query 3 bearer auth provider config
+
+## 5.33.3
+
+### Patch Changes
+
+- [`c4f21f5`](https://github.com/ethlete-io/ethdk/commit/c4f21f5e69a6379d19989bc15ddfd86ca7eacdbd) Thanks [@TomTomB](https://github.com/TomTomB)! - Fix gql query param parsing
+
 ## 5.33.2
 
 ### Patch Changes

package/fesm2022/ethlete-query.mjs

@@ -122,7 +122,10 @@ const buildQueryString = (params, config) => {
     const ignoredValuesFns = config?.ignoredValuesFns ?? [isNaN$1, isEmptyString];
     const queryParams = [];
     function processValue(key, value) {
-        if (config?.useJsonStringify) {
+        if (config?.objectNotation === 'json-stringify') {
+            if (value === undefined) {
+                return false;
+            }
             if (ignoredValues.includes(value)) {
                 return false;
             }
@@ -130,7 +133,8 @@ const buildQueryString = (params, config) => {
                 return false;
             }
             const encodedKey = encodeURIComponent(key);
-            const encodedValue = encodeURIComponent(JSON.stringify(value));
+            const val = typeof value === 'object' ? JSON.stringify(value) : value;
+            const encodedValue = encodeURIComponent(val);
             queryParams.push(`${encodedKey}=${encodedValue}`);
             return true;
         }
@@ -716,19 +720,12 @@ class QueryCreator {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         this.prepare = (args) => {
-            const shouldUseJsonStringifyForQs = isGqlQueryConfig(this._queryConfig) &&
-                (this._queryConfig.transferVia === 'GET' ||
-                    (this._client.config.request?.gql?.transferVia === 'GET' && !this._queryConfig.transferVia));
-            const originalQueryParams = this._client.config.request?.queryParams;
-            const queryParamConfig = originalQueryParams
-                ? { ...originalQueryParams, useJsonStringify: shouldUseJsonStringifyForQs }
-                : undefined;
             const route = buildRoute({
                 base: this._client.config.baseRoute,
                 route: this._queryConfig.route,
                 pathParams: args?.pathParams,
                 queryParams: computeQueryQueryParams({ config: this._queryConfig, client: this._client, args }),
-                queryParamConfig,
+                queryParamConfig: this._client.config.request?.queryParams,
             });
             const cacheKey = (args?.config?.queryStoreCacheKey ?? '') + buildQueryCacheKey$1(route, args);
             if (shouldCacheQuery$1(this._queryConfig.method) && !args?.config?.skipQueryStore) {
@@ -1007,17 +1004,19 @@ const getOpName = /(query|mutation) ?([\w\d-_]+)? ?\(.*?\)? \{/;
 const transformGql = (str) => {
     str = Array.isArray(str) ? str.join('') : str;
     const name = getOpName.exec(str);
-    return function (variables) {
+    return (variables) => {
         const data = { query: str };
         if (variables)
-            data['variables'] = variables;
+            data['variables'] = JSON.stringify(variables);
         if (name && name.length) {
             const operationName = name[2];
             if (operationName)
                 data['operationName'] = name[2];
         }
-        // minify the query
-        data.query = data.query.replace(/\s+/g, ' ').trim();
+        if (!isDevMode()) {
+            // minify the query
+            data.query = data.query.replace(/\s+/g, ' ').trim();
+        }
         return data;
     };
 };
@@ -3003,6 +3002,12 @@ const createBearerAuthProvider = (options) => {
         const query = latestExecutedQuery();
         return query?.query?.tokens()?.tokens ?? null;
     });
+    const bearerData = computed(() => {
+        const accessToken = tokens()?.accessToken;
+        if (!accessToken)
+            return null;
+        return (options.bearerDecryptFn?.(accessToken) ?? decryptBearer(accessToken));
+    });
     toObservable(computed(() => {
         const query = latestExecutedQuery();
         const expiresIn = query?.query?.expiresIn() ?? null;
@@ -3150,6 +3155,7 @@ const createBearerAuthProvider = (options) => {
         tryLoginWithCookie,
         latestExecutedQuery: latestNonInternalQuery.asReadonly(),
         tokens,
+        bearerData,
     };
     if (cookieEnabled()) {
         if (!cookieOptions.autoLoginExcludeRoutes.some((r) => route().startsWith(r))) {
@@ -3179,6 +3185,7 @@ const createBearerAuthProviderConfig = (options) => {
         selectRole: options.selectRole,
         tokenLogin: options.tokenLogin,
         tokenRefresh: options.tokenRefresh,
+        bearerDecryptFn: options.bearerDecryptFn,
     };
     return bearerAuthProviderConfig;
 };
@@ -4338,9 +4345,7 @@ const createQueryRepository = (config) => {
             route: options.route,
             pathParams: args?.pathParams,
             queryParams: args?.queryParams,
-            queryParamConfig: options.internalRunQueryOptions?.forceJsonStringifyInQueryParams
-                ? { useJsonStringify: true }
-                : config.queryString,
+            queryParamConfig: config.queryString,
         });
         const key = shouldCache &&
             buildQueryCacheKey(`${options.key ? options.key + '_' : ''}${route}`, {
@@ -4694,7 +4699,6 @@ const createGqlExecuteFn = (executeOptions) => {
             options,
             internalOptions: {
                 useQueryRepositoryCache: executeOptions.creatorInternals.method === 'QUERY',
-                forceJsonStringifyInQueryParams: executeOptions.creatorInternals.method === 'QUERY',
             },
             transformResponse: (originalResponse) => {
                 if (originalResponse && 'data' in originalResponse) {