Skip to content

fix: Fix for using charset from response headers instead of default UTF-8 #20862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
balachandarsv wants to merge 4 commits into
base: release
Choose a base branch
from
+39 −1
Open

fix: Fix for using charset from response headers instead of default UTF-8 #20862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9730ce4
Fix for using charset from response headers instead of default utf8
balachandarsv Feb 22, 2023
ead5645
Merge branch 'appsmithorg:release' into release
balachandarsv Apr 4, 2023
9fbe852
Merge branch 'appsmithorg:release' into release
balachandarsv May 10, 2023
58805d4
Add: Unit test for Charset in RestAPI changes
balachandarsv May 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ...rc/main/java/com/appsmith/external/helpers/restApiUtils/helpers/RestAPIActivateUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.time.Instant;
Expand Down Expand Up @@ -127,7 +128,11 @@ public Mono<ActionExecutionResult> triggerApiCall(WebClient client, HttpMethod h
*/
if (contentType.includes(MediaType.APPLICATION_JSON)) {
try {
String jsonBody = new String(body, StandardCharsets.UTF_8);
Charset charset = contentType.getCharset();
Copy link
Copy Markdown
Contributor

@sumitsum sumitsum Apr 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please add a JUnit TC for this in the file RestApiPluginTest.java ?

Copy link
Copy Markdown
Author

@balachandarsv balachandarsv Apr 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. Will do.

Copy link
Copy Markdown
Contributor

@sumitsum sumitsum Apr 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@balachandarsv please mention here once you are done.

Copy link
Copy Markdown
Author

@balachandarsv balachandarsv May 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please check @sumitsum

if(charset==null) {
charset = StandardCharsets.UTF_8;
}
String jsonBody = new String(body, charset);
result.setBody(objectMapper.readTree(jsonBody));
responseDataType = ResponseDataType.JSON;
} catch (IOException e) {
Expand Down
33 changes: 33 additions & 0 deletions .../appsmith-plugins/restApiPlugin/src/test/java/com/external/plugins/RestApiPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1903,5 +1903,38 @@ public void whenAPIReturnsNon200_doNotStringifyResponseBody() throws IOException
})
.verifyComplete();
}

@Test
public void testExtractResponseCharsetAndReadResponse() {
MockWebServer mockWebServer = new MockWebServer();
MockResponse mockResponse = new MockResponse()
.setResponseCode(200)
.addHeader("Content-Type", "application/json; charset=UTF-16")
.setBody("{\"name\":\"John\"}");
mockWebServer.enqueue(mockResponse);
mockWebServer.start();

DatasourceConfiguration dsConfig = new DatasourceConfiguration();
dsConfig.setUrl(mockWebServer.url("/").toString());

ActionConfiguration actionConfig = new ActionConfiguration();
actionConfig.setHttpMethod(HttpMethod.GET);

Mono<ActionExecutionResult> resultMono = pluginExecutor.executeParameterized(null, new ExecuteActionDTO(), dsConfig, actionConfig);

StepVerifier.create(resultMono)
.assertNext(result -> {
assertTrue(result.getIsExecutionSuccess());
assertNotNull(result.getBody());
assertEquals("{\"name\":\"John\"}", result.getBody().toString());
})
.verifyComplete();

try {
mockWebServer.shutdown();
} catch (IOException e) {
e.printStackTrace();
}
}
}