Skip to content

Commit ff02ba0

Browse files
authored
fix(javascript): revert: do not send user-agent for Predict (#919) (#957)
This reverts commit dc43c2a.
1 parent fbe774d commit ff02ba0

File tree

4 files changed

+7
-30
lines changed

4 files changed

+7
-30
lines changed

clients/algoliasearch-client-javascript/packages/client-common/src/transporter/createTransporter.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,12 @@ export function createTransporter({
110110
: {};
111111

112112
const queryParameters: QueryParameters = {
113+
'x-algolia-agent': algoliaAgent.value,
113114
...baseQueryParameters,
114115
...request.queryParameters,
115116
...dataQueryParameters,
116117
};
117118

118-
if (algoliaAgent.value) {
119-
queryParameters['x-algolia-agent'] = algoliaAgent.value;
120-
}
121-
122119
if (requestOptions && requestOptions.queryParameters) {
123120
for (const key of Object.keys(requestOptions.queryParameters)) {
124121
// We want to keep `undefined` and `null` values,

generators/src/main/java/com/algolia/codegen/AlgoliaJavaScriptGenerator.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,6 @@ private void setDefaultGeneratorOptions() {
121121
additionalProperties.put("isSearchClient", CLIENT.equals("search"));
122122
additionalProperties.put("isAlgoliasearchClient", isAlgoliasearchClient);
123123

124-
// PRED-523 - tmp addition until the predict client supports user-agent in their API
125-
additionalProperties.put("isPredictClient", CLIENT.equals("predict"));
126-
127124
if (isAlgoliasearchClient) {
128125
// Files used to create the package.json of the algoliasearch package
129126
additionalProperties.put("analyticsVersion", Utils.getOpenApiToolsField("javascript", "analytics", "packageVersion"));

generators/src/main/java/com/algolia/codegen/cts/tests/TestsClient.java

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public TestsClient(String language, String client) {
1919

2020
@Override
2121
public boolean available() {
22-
// no `algoliasearch` client tests for now, only `lite`.
22+
// no `lite` client test for now
2323
if (language.equals("javascript") && client.equals("algoliasearch")) {
2424
return false;
2525
}
@@ -28,15 +28,6 @@ public boolean available() {
2828
return templates.exists();
2929
}
3030

31-
public boolean isTestAvailable(String testName) {
32-
// PRED-523 - tmp addition until the predict client supports user-agent in their API
33-
if (client.equals("predict") && testName.equals("calls api with correct user agent")) {
34-
return false;
35-
}
36-
37-
return true;
38-
}
39-
4031
@Override
4132
public void addSupportingFiles(List<SupportingFile> supportingFiles, String outputFolder, String extension) {
4233
if (!available()) {
@@ -59,11 +50,6 @@ public void run(Map<String, CodegenModel> models, Map<String, CodegenOperation>
5950
for (ClientTestData test : blockEntry.getValue()) {
6051
Map<String, Object> testOut = new HashMap<>();
6152
List<Object> steps = new ArrayList<>();
62-
63-
if (!isTestAvailable(test.testName)) {
64-
continue;
65-
}
66-
6753
testOut.put("testName", test.testName);
6854
testOut.put("testIndex", testIndex++);
6955
testOut.put("autoCreateClient", test.autoCreateClient);

templates/javascript/clients/api-single.mustache

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,11 @@ export function create{{capitalizedApiName}}({
1919
const transporter = createTransporter({
2020
hosts: getDefaultHosts({{^hasRegionalHost}}appIdOption{{/hasRegionalHost}}{{#hasRegionalHost}}regionOption{{/hasRegionalHost}}),
2121
...options,
22-
{{! // PRED-523 - tmp addition until the predict client supports user-agent in their API }}
23-
algoliaAgent:
24-
{{#isPredictClient}}
25-
{...getAlgoliaAgent({ algoliaAgents, client: '{{{algoliaAgent}}}', version: apiClientVersion }), value: '' },
26-
{{/isPredictClient}}
27-
{{^isPredictClient}}
28-
getAlgoliaAgent({ algoliaAgents, client: '{{{algoliaAgent}}}', version: apiClientVersion }),
29-
{{/isPredictClient}}
22+
algoliaAgent: getAlgoliaAgent({
23+
algoliaAgents,
24+
client: '{{{algoliaAgent}}}',
25+
version: apiClientVersion,
26+
}),
3027
baseHeaders: {
3128
'content-type': 'text/plain',
3229
...auth.headers(),

0 commit comments

Comments
 (0)