From 7faa6ef40afcfc9f25c1b36c3fcefe8c3b9992a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Vannicatte?= Date: Tue, 8 Feb 2022 10:58:11 +0100 Subject: [PATCH] fix(javascript): auth via query parameters --- .../client-abtesting/src/abtestingApi.ts | 27 +- .../client-analytics/src/analyticsApi.ts | 87 ++---- .../client-common/src/Transporter.ts | 10 +- .../client-common/src/types.ts | 1 + .../client-insights/src/insightsApi.ts | 7 +- .../src/personalizationApi.ts | 22 +- .../src/querySuggestionsApi.ts | 37 +-- .../client-search/src/searchApi.ts | 287 ++++-------------- .../client-sources/src/sourcesApi.ts | 7 +- .../recommend/src/recommendApi.ts | 7 +- templates/javascript/api-single.mustache | 7 +- 11 files changed, 121 insertions(+), 378 deletions(-) diff --git a/clients/algoliasearch-client-javascript/client-abtesting/src/abtestingApi.ts b/clients/algoliasearch-client-javascript/client-abtesting/src/abtestingApi.ts index 6b634a7800..63f2fd023f 100644 --- a/clients/algoliasearch-client-javascript/client-abtesting/src/abtestingApi.ts +++ b/clients/algoliasearch-client-javascript/client-abtesting/src/abtestingApi.ts @@ -36,7 +36,9 @@ export const createAbtestingApi = ( hosts: options?.hosts ?? getDefaultHosts(options.region), baseHeaders: { 'content-type': 'application/x-www-form-urlencoded', + ...auth.headers(), }, + baseQueryParameters: auth.queryParameters(), userAgent: getUserAgent({ userAgents: options.userAgents, client: 'Abtesting', @@ -89,10 +91,7 @@ export const createAbtestingApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -124,10 +123,7 @@ export const createAbtestingApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -157,10 +153,7 @@ export const createAbtestingApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -195,10 +188,7 @@ export const createAbtestingApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -228,10 +218,7 @@ export const createAbtestingApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } diff --git a/clients/algoliasearch-client-javascript/client-analytics/src/analyticsApi.ts b/clients/algoliasearch-client-javascript/client-analytics/src/analyticsApi.ts index 2e8475a53a..aa85e270b2 100644 --- a/clients/algoliasearch-client-javascript/client-analytics/src/analyticsApi.ts +++ b/clients/algoliasearch-client-javascript/client-analytics/src/analyticsApi.ts @@ -51,7 +51,9 @@ export const createAnalyticsApi = ( hosts: options?.hosts ?? getDefaultHosts(options.region), baseHeaders: { 'content-type': 'application/x-www-form-urlencoded', + ...auth.headers(), }, + baseQueryParameters: auth.queryParameters(), userAgent: getUserAgent({ userAgents: options.userAgents, client: 'Analytics', @@ -110,10 +112,7 @@ export const createAnalyticsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -166,10 +165,7 @@ export const createAnalyticsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -222,10 +218,7 @@ export const createAnalyticsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -278,10 +271,7 @@ export const createAnalyticsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -334,10 +324,7 @@ export const createAnalyticsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -390,10 +377,7 @@ export const createAnalyticsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -446,10 +430,7 @@ export const createAnalyticsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -514,10 +495,7 @@ export const createAnalyticsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -582,10 +560,7 @@ export const createAnalyticsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -618,10 +593,7 @@ export const createAnalyticsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -686,10 +658,7 @@ export const createAnalyticsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -760,10 +729,7 @@ export const createAnalyticsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -845,10 +811,7 @@ export const createAnalyticsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -919,10 +882,7 @@ export const createAnalyticsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1001,10 +961,7 @@ export const createAnalyticsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1089,10 +1046,7 @@ export const createAnalyticsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1145,10 +1099,7 @@ export const createAnalyticsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } diff --git a/clients/algoliasearch-client-javascript/client-common/src/Transporter.ts b/clients/algoliasearch-client-javascript/client-common/src/Transporter.ts index a37614c817..4e9e8d9630 100644 --- a/clients/algoliasearch-client-javascript/client-common/src/Transporter.ts +++ b/clients/algoliasearch-client-javascript/client-common/src/Transporter.ts @@ -16,20 +16,22 @@ import { stackFrameWithoutCredentials, } from './stackTrace'; import type { + EndRequest, Headers, Host, + QueryParameters, Request, RequestOptions, + Response, StackFrame, Timeouts, - Response, - EndRequest, UserAgent, } from './types'; export class Transporter { private hosts: Host[]; private baseHeaders: Headers; + private baseQueryParameters: QueryParameters; private hostsCache: Cache; private userAgent: UserAgent; private timeouts: Timeouts; @@ -38,12 +40,14 @@ export class Transporter { constructor({ hosts, baseHeaders, + baseQueryParameters, userAgent, timeouts, requester, }: { hosts: Host[]; baseHeaders: Headers; + baseQueryParameters: QueryParameters; userAgent: UserAgent; timeouts: Timeouts; requester: Requester; @@ -51,6 +55,7 @@ export class Transporter { this.hosts = hosts; this.hostsCache = new MemoryCache(); this.baseHeaders = baseHeaders; + this.baseQueryParameters = baseQueryParameters; this.userAgent = userAgent; this.timeouts = timeouts; this.requester = requester; @@ -135,6 +140,7 @@ export class Transporter { const queryParameters = { 'x-algolia-agent': this.userAgent.value, + ...this.baseQueryParameters, ...dataQueryParameters, ...requestOptions.queryParameters, }; diff --git a/clients/algoliasearch-client-javascript/client-common/src/types.ts b/clients/algoliasearch-client-javascript/client-common/src/types.ts index 850a06e921..dc590d840e 100644 --- a/clients/algoliasearch-client-javascript/client-common/src/types.ts +++ b/clients/algoliasearch-client-javascript/client-common/src/types.ts @@ -52,6 +52,7 @@ export type EchoResponse = Request & { }; export type Headers = Record; +export type QueryParameters = Record; export type Host = { url: string; diff --git a/clients/algoliasearch-client-javascript/client-insights/src/insightsApi.ts b/clients/algoliasearch-client-javascript/client-insights/src/insightsApi.ts index d47ac5a4d5..466ceaf2dd 100644 --- a/clients/algoliasearch-client-javascript/client-insights/src/insightsApi.ts +++ b/clients/algoliasearch-client-javascript/client-insights/src/insightsApi.ts @@ -34,7 +34,9 @@ export const createInsightsApi = ( hosts: options?.hosts ?? getDefaultHosts(options.region), baseHeaders: { 'content-type': 'application/x-www-form-urlencoded', + ...auth.headers(), }, + baseQueryParameters: auth.queryParameters(), userAgent: getUserAgent({ userAgents: options.userAgents, client: 'Insights', @@ -77,10 +79,7 @@ export const createInsightsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } diff --git a/clients/algoliasearch-client-javascript/client-personalization/src/personalizationApi.ts b/clients/algoliasearch-client-javascript/client-personalization/src/personalizationApi.ts index b347427ed8..7b51aa556c 100644 --- a/clients/algoliasearch-client-javascript/client-personalization/src/personalizationApi.ts +++ b/clients/algoliasearch-client-javascript/client-personalization/src/personalizationApi.ts @@ -34,7 +34,9 @@ export const createPersonalizationApi = ( hosts: options?.hosts ?? getDefaultHosts(options.region), baseHeaders: { 'content-type': 'application/x-www-form-urlencoded', + ...auth.headers(), }, + baseQueryParameters: auth.queryParameters(), userAgent: getUserAgent({ userAgents: options.userAgents, client: 'Personalization', @@ -74,10 +76,7 @@ export const createPersonalizationApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -98,10 +97,7 @@ export const createPersonalizationApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -135,10 +131,7 @@ export const createPersonalizationApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -185,10 +178,7 @@ export const createPersonalizationApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } diff --git a/clients/algoliasearch-client-javascript/client-query-suggestions/src/querySuggestionsApi.ts b/clients/algoliasearch-client-javascript/client-query-suggestions/src/querySuggestionsApi.ts index c105b43fc4..aefbab9046 100644 --- a/clients/algoliasearch-client-javascript/client-query-suggestions/src/querySuggestionsApi.ts +++ b/clients/algoliasearch-client-javascript/client-query-suggestions/src/querySuggestionsApi.ts @@ -36,7 +36,9 @@ export const createQuerySuggestionsApi = ( hosts: options?.hosts ?? getDefaultHosts(options.region), baseHeaders: { 'content-type': 'application/x-www-form-urlencoded', + ...auth.headers(), }, + baseQueryParameters: auth.queryParameters(), userAgent: getUserAgent({ userAgents: options.userAgents, client: 'QuerySuggestions', @@ -73,10 +75,7 @@ export const createQuerySuggestionsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -110,10 +109,7 @@ export const createQuerySuggestionsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -134,10 +130,7 @@ export const createQuerySuggestionsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -171,10 +164,7 @@ export const createQuerySuggestionsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -208,10 +198,7 @@ export const createQuerySuggestionsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -243,10 +230,7 @@ export const createQuerySuggestionsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -295,10 +279,7 @@ export const createQuerySuggestionsApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } diff --git a/clients/algoliasearch-client-javascript/client-search/src/searchApi.ts b/clients/algoliasearch-client-javascript/client-search/src/searchApi.ts index 7eede034e7..be0f5574af 100644 --- a/clients/algoliasearch-client-javascript/client-search/src/searchApi.ts +++ b/clients/algoliasearch-client-javascript/client-search/src/searchApi.ts @@ -112,7 +112,9 @@ export const createSearchApi = (options: CreateClientOptions) => { hosts: options?.hosts ?? getDefaultHosts(options.appId), baseHeaders: { 'content-type': 'application/x-www-form-urlencoded', + ...auth.headers(), }, + baseQueryParameters: auth.queryParameters(), userAgent: getUserAgent({ userAgents: options.userAgents, client: 'Search', @@ -153,10 +155,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -206,10 +205,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -238,10 +234,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -291,10 +284,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -337,10 +327,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -395,10 +382,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -447,10 +431,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -505,10 +486,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -545,10 +523,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -588,10 +563,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -625,10 +597,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -668,10 +637,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -705,10 +671,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -751,10 +714,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -788,10 +748,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -832,10 +789,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -882,10 +836,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -919,10 +870,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -969,10 +917,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1002,10 +947,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1026,10 +968,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1050,10 +989,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1100,10 +1036,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1150,10 +1083,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1184,10 +1114,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1225,10 +1152,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1262,10 +1186,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1286,10 +1207,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1330,10 +1248,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1372,10 +1287,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1396,10 +1308,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1431,10 +1340,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1463,10 +1369,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1487,10 +1390,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1511,10 +1411,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1543,10 +1440,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1581,10 +1475,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1615,10 +1506,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1655,10 +1543,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1712,10 +1597,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1771,10 +1653,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1808,10 +1687,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1843,10 +1719,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1880,10 +1753,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1926,10 +1796,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -1994,10 +1861,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -2059,10 +1923,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -2118,10 +1979,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -2164,10 +2022,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -2216,10 +2071,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -2263,10 +2115,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -2309,10 +2158,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -2370,10 +2216,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -2410,10 +2253,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -2450,10 +2290,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -2502,10 +2339,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } @@ -2554,10 +2388,7 @@ export const createSearchApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } diff --git a/clients/algoliasearch-client-javascript/client-sources/src/sourcesApi.ts b/clients/algoliasearch-client-javascript/client-sources/src/sourcesApi.ts index 5ac7ce908e..1bb52600a7 100644 --- a/clients/algoliasearch-client-javascript/client-sources/src/sourcesApi.ts +++ b/clients/algoliasearch-client-javascript/client-sources/src/sourcesApi.ts @@ -32,7 +32,9 @@ export const createSourcesApi = ( hosts: options?.hosts ?? getDefaultHosts(options.region), baseHeaders: { 'content-type': 'application/x-www-form-urlencoded', + ...auth.headers(), }, + baseQueryParameters: auth.queryParameters(), userAgent: getUserAgent({ userAgents: options.userAgents, client: 'Sources', @@ -80,10 +82,7 @@ export const createSourcesApi = ( return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } diff --git a/clients/algoliasearch-client-javascript/recommend/src/recommendApi.ts b/clients/algoliasearch-client-javascript/recommend/src/recommendApi.ts index f0359bd32b..86c723c617 100644 --- a/clients/algoliasearch-client-javascript/recommend/src/recommendApi.ts +++ b/clients/algoliasearch-client-javascript/recommend/src/recommendApi.ts @@ -58,7 +58,9 @@ export const createRecommendApi = (options: CreateClientOptions) => { hosts: options?.hosts ?? getDefaultHosts(options.appId), baseHeaders: { 'content-type': 'application/x-www-form-urlencoded', + ...auth.headers(), }, + baseQueryParameters: auth.queryParameters(), userAgent: getUserAgent({ userAgents: options.userAgents, client: 'Recommend', @@ -101,10 +103,7 @@ export const createRecommendApi = (options: CreateClientOptions) => { return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); } diff --git a/templates/javascript/api-single.mustache b/templates/javascript/api-single.mustache index bbc39b6307..4c824ddf88 100644 --- a/templates/javascript/api-single.mustache +++ b/templates/javascript/api-single.mustache @@ -70,7 +70,9 @@ export const create{{capitalizedApiName}}Api = (options: CreateClientOptions{{#h hosts: options?.hosts ?? getDefaultHosts({{^hasRegionalHost}}options.appId{{/hasRegionalHost}}{{#hasRegionalHost}}options.region{{/hasRegionalHost}}), baseHeaders: { 'content-type': 'application/x-www-form-urlencoded', + ...auth.headers(), }, + baseQueryParameters: auth.queryParameters(), userAgent: getUserAgent({ userAgents: options.userAgents, client: '{{{capitalizedApiName}}}', @@ -216,10 +218,7 @@ export const create{{capitalizedApiName}}Api = (options: CreateClientOptions{{#h return transporter.request(request, { queryParameters, - headers: { - ...headers, - ...auth.headers(), - }, + headers, }); }