## Description > This PR adds a selection dropdown for the HTTP Version in the REST API and GraphQL plugins. #### PR fixes following issue(s) Fixes #28226 #### Type of change - New feature (non-breaking change which adds functionality) ## Testing #### How Has This Been Tested? > Please describe the tests that you ran to verify your changes. Also list any relevant details for your test configuration. > Delete anything that is not relevant - [x] Manual - [ ] JUnit - [ ] Jest - [ ] Cypress > > #### Test Plan > Add Testsmith test cases links that relate to this PR > > #### Issues raised during DP testing > Link issues raised during DP testing for better visiblity and tracking (copy link from comments dropped on this PR) > > > ## Checklist: #### Dev activity - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [ ] PR is being merged under a feature flag #### QA activity: - [ ] [Speedbreak features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-) have been covered - [ ] Test plan covers all impacted features and [areas of interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-) - [ ] Test plan has been peer reviewed by project stakeholders and other QA members - [ ] Manually tested functionality on DP - [ ] We had an implementation alignment call with stakeholders post QA Round 2 - [ ] Cypress test cases have been added and approved by SDET/manual QA - [ ] Added `Test Plan Approved` label after Cypress tests were reviewed - [ ] Added `Test Plan Approved` label after JUnit tests were reviewed <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Introduced support for selecting different HTTP protocol versions when configuring APIs. - **Enhancements** - Improved user interface for API configuration with a new dropdown to select HTTP protocol versions. - **Bug Fixes** - Fixed an issue to ensure that the API configuration now correctly displays protocol labels in dropdown menus. - **Documentation** - Added user-friendly placeholders and titles for secure and fast API connection settings. - **Refactor** - Enhanced internal methods to support the selection of HTTP protocol versions for API actions. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Aman Agarwal <aman@appsmith.com>
373 lines
9.8 KiB
TypeScript
373 lines
9.8 KiB
TypeScript
import {
|
|
extractApiUrlPath,
|
|
transformRestAction,
|
|
} from "transformers/RestActionTransformer";
|
|
import type { ApiAction } from "entities/Action";
|
|
import { PluginType } from "entities/Action";
|
|
import {
|
|
HTTP_PROTOCOL,
|
|
MultiPartOptionTypes,
|
|
POST_BODY_FORMAT_OPTIONS,
|
|
// POST_BODY_FORMAT_OPTIONS_ENUM,
|
|
} from "constants/ApiEditorConstants/CommonApiConstants";
|
|
|
|
// jest.mock("POST_");
|
|
|
|
const BASE_ACTION: ApiAction = {
|
|
dynamicBindingPathList: [],
|
|
cacheResponse: "",
|
|
executeOnLoad: false,
|
|
invalids: [],
|
|
isValid: false,
|
|
workspaceId: "",
|
|
pageId: "",
|
|
pluginId: "",
|
|
id: "testId",
|
|
datasource: {
|
|
id: "testDataSource",
|
|
},
|
|
name: "testName",
|
|
pluginType: PluginType.API,
|
|
actionConfiguration: {
|
|
httpMethod: "GET",
|
|
httpVersion: HTTP_PROTOCOL.HTTP11.value,
|
|
encodeParamsToggle: true,
|
|
path: "users",
|
|
headers: [],
|
|
formData: {
|
|
apiContentType: "none",
|
|
},
|
|
timeoutInMillisecond: 5000,
|
|
},
|
|
jsonPathKeys: [],
|
|
messages: [],
|
|
};
|
|
|
|
describe("Api action transformer", () => {
|
|
it("Removes params from path", () => {
|
|
const input: ApiAction = {
|
|
...BASE_ACTION,
|
|
actionConfiguration: {
|
|
...BASE_ACTION.actionConfiguration,
|
|
path: "users?page=1",
|
|
queryParameters: [
|
|
{
|
|
key: "page",
|
|
value: "1",
|
|
},
|
|
],
|
|
},
|
|
};
|
|
|
|
const output = {
|
|
...BASE_ACTION,
|
|
actionConfiguration: {
|
|
...BASE_ACTION.actionConfiguration,
|
|
path: "users",
|
|
queryParameters: [
|
|
{
|
|
key: "page",
|
|
value: "1",
|
|
},
|
|
],
|
|
},
|
|
};
|
|
const result = transformRestAction(input);
|
|
expect(result).toEqual(output);
|
|
});
|
|
|
|
it("Sets the correct body for JSON display type", () => {
|
|
const input = {
|
|
...BASE_ACTION,
|
|
actionConfiguration: {
|
|
...BASE_ACTION.actionConfiguration,
|
|
httpMethod: "POST",
|
|
headers: [{ key: "content-type", value: "application/json" }],
|
|
body: "{ name: 'test' }",
|
|
},
|
|
};
|
|
const output = {
|
|
...BASE_ACTION,
|
|
actionConfiguration: {
|
|
...BASE_ACTION.actionConfiguration,
|
|
httpMethod: "POST",
|
|
headers: [{ key: "content-type", value: "application/json" }],
|
|
body: "{ name: 'test' }",
|
|
},
|
|
};
|
|
const result = transformRestAction(input);
|
|
expect(result).toEqual(output);
|
|
});
|
|
|
|
it("bodyFormData should not be reset for non xxx-form-encoded-data type", () => {
|
|
const input = {
|
|
...BASE_ACTION,
|
|
actionConfiguration: {
|
|
...BASE_ACTION.actionConfiguration,
|
|
httpMethod: "POST",
|
|
headers: [{ key: "content-type", value: "application/json" }],
|
|
body: "{ name: 'test' }",
|
|
bodyFormData: [
|
|
{
|
|
key: "hey",
|
|
value: "ho",
|
|
editable: true,
|
|
mandatory: false,
|
|
description: "I been tryin to do it right",
|
|
type: "",
|
|
},
|
|
],
|
|
},
|
|
};
|
|
const output = {
|
|
...BASE_ACTION,
|
|
actionConfiguration: {
|
|
...BASE_ACTION.actionConfiguration,
|
|
httpMethod: "POST",
|
|
headers: [{ key: "content-type", value: "application/json" }],
|
|
body: "{ name: 'test' }",
|
|
bodyFormData: [
|
|
{
|
|
key: "hey",
|
|
value: "ho",
|
|
editable: true,
|
|
mandatory: false,
|
|
description: "I been tryin to do it right",
|
|
type: "",
|
|
},
|
|
],
|
|
},
|
|
};
|
|
const result = transformRestAction(input);
|
|
expect(result).toEqual(output);
|
|
});
|
|
|
|
it("body should not be reset for xxx-form-encoded-data type", () => {
|
|
const input = {
|
|
...BASE_ACTION,
|
|
actionConfiguration: {
|
|
...BASE_ACTION.actionConfiguration,
|
|
httpMethod: "POST",
|
|
headers: [
|
|
{
|
|
key: "content-type",
|
|
value: POST_BODY_FORMAT_OPTIONS.FORM_URLENCODED,
|
|
},
|
|
],
|
|
bodyFormData: [
|
|
{
|
|
key: "hey",
|
|
value: "ho",
|
|
editable: true,
|
|
mandatory: false,
|
|
description: "I been tryin to do it right",
|
|
type: "",
|
|
},
|
|
],
|
|
body: "{ name: 'test' }",
|
|
},
|
|
};
|
|
const output = {
|
|
...BASE_ACTION,
|
|
actionConfiguration: {
|
|
...BASE_ACTION.actionConfiguration,
|
|
httpMethod: "POST",
|
|
headers: [
|
|
{
|
|
key: "content-type",
|
|
value: POST_BODY_FORMAT_OPTIONS.FORM_URLENCODED,
|
|
},
|
|
],
|
|
body: "{ name: 'test' }",
|
|
bodyFormData: [
|
|
{
|
|
key: "hey",
|
|
value: "ho",
|
|
editable: true,
|
|
mandatory: false,
|
|
description: "I been tryin to do it right",
|
|
type: "",
|
|
},
|
|
],
|
|
},
|
|
};
|
|
const result = transformRestAction(input);
|
|
expect(result).toEqual(output);
|
|
});
|
|
|
|
it("Sets the correct body for xxx-form-encoded-data display type", () => {
|
|
const input = {
|
|
...BASE_ACTION,
|
|
actionConfiguration: {
|
|
...BASE_ACTION.actionConfiguration,
|
|
httpMethod: "POST",
|
|
headers: [
|
|
{
|
|
key: "content-type",
|
|
value: POST_BODY_FORMAT_OPTIONS.FORM_URLENCODED,
|
|
},
|
|
],
|
|
bodyFormData: [
|
|
{
|
|
key: "hey",
|
|
value: "ho",
|
|
editable: true,
|
|
mandatory: false,
|
|
description: "I been tryin to do it right",
|
|
type: "",
|
|
},
|
|
],
|
|
},
|
|
};
|
|
const output = {
|
|
...BASE_ACTION,
|
|
actionConfiguration: {
|
|
...BASE_ACTION.actionConfiguration,
|
|
httpMethod: "POST",
|
|
headers: [
|
|
{
|
|
key: "content-type",
|
|
value: POST_BODY_FORMAT_OPTIONS.FORM_URLENCODED,
|
|
},
|
|
],
|
|
body: "",
|
|
bodyFormData: [
|
|
{
|
|
key: "hey",
|
|
value: "ho",
|
|
editable: true,
|
|
mandatory: false,
|
|
description: "I been tryin to do it right",
|
|
type: "",
|
|
},
|
|
],
|
|
},
|
|
};
|
|
const result = transformRestAction(input);
|
|
expect(result).toEqual(output);
|
|
});
|
|
|
|
it("Sets the correct body for custom/raw display type", () => {
|
|
const input = {
|
|
...BASE_ACTION,
|
|
actionConfiguration: {
|
|
...BASE_ACTION.actionConfiguration,
|
|
headers: [{ key: "content-type", value: "text/html" }],
|
|
httpMethod: "POST",
|
|
body: "raw body",
|
|
},
|
|
};
|
|
const output = {
|
|
...BASE_ACTION,
|
|
actionConfiguration: {
|
|
...BASE_ACTION.actionConfiguration,
|
|
headers: [{ key: "content-type", value: "text/html" }],
|
|
httpMethod: "POST",
|
|
body: "raw body",
|
|
},
|
|
};
|
|
const result = transformRestAction(input);
|
|
expect(result).toEqual(output);
|
|
});
|
|
|
|
it("filters empty pairs from form data", () => {
|
|
const input: ApiAction = {
|
|
...BASE_ACTION,
|
|
actionConfiguration: {
|
|
...BASE_ACTION.actionConfiguration,
|
|
httpMethod: "POST",
|
|
headers: [
|
|
{
|
|
key: "content-type",
|
|
value: POST_BODY_FORMAT_OPTIONS.MULTIPART_FORM_DATA,
|
|
},
|
|
],
|
|
body: "",
|
|
bodyFormData: [
|
|
{
|
|
key: "hey",
|
|
value: "ho",
|
|
type: MultiPartOptionTypes.TEXT,
|
|
editable: true,
|
|
mandatory: false,
|
|
description: "I been tryin to do it right",
|
|
},
|
|
{
|
|
key: "",
|
|
value: "",
|
|
editable: true,
|
|
mandatory: false,
|
|
description: "I been tryin to do it right",
|
|
type: "",
|
|
},
|
|
],
|
|
},
|
|
};
|
|
|
|
// output object should not include the second bodyFormData object
|
|
// as its key, value and type are empty
|
|
const output: ApiAction = {
|
|
...BASE_ACTION,
|
|
actionConfiguration: {
|
|
...BASE_ACTION.actionConfiguration,
|
|
httpMethod: "POST",
|
|
headers: [
|
|
{
|
|
key: "content-type",
|
|
value: POST_BODY_FORMAT_OPTIONS.MULTIPART_FORM_DATA,
|
|
},
|
|
],
|
|
body: "",
|
|
bodyFormData: [
|
|
{
|
|
key: "hey",
|
|
value: "ho",
|
|
type: MultiPartOptionTypes.TEXT,
|
|
editable: true,
|
|
mandatory: false,
|
|
description: "I been tryin to do it right",
|
|
},
|
|
],
|
|
},
|
|
};
|
|
const result = transformRestAction(input);
|
|
expect(result).toEqual(output);
|
|
});
|
|
|
|
it("Ensures that Api url path is being correctly extracted regardless of expressions witin dynamic bindings", () => {
|
|
// testing for simple dynamic bindings in path
|
|
const path1 = `/{{Text1.text ? 'users' : 'user'}}`;
|
|
const output1 = `/{{Text1.text ? 'users' : 'user'}}`;
|
|
|
|
const result1 = extractApiUrlPath(path1);
|
|
expect(result1).toEqual(output1);
|
|
|
|
// testing multiple dynamic bindings in path with empty query params
|
|
const path2 = `/{{Text1.text ? 'users' : 'user'}}/{{"test"}}?`;
|
|
const output2 = `/{{Text1.text ? 'users' : 'user'}}/{{"test"}}`;
|
|
|
|
const result2 = extractApiUrlPath(path2);
|
|
expect(result2).toEqual(output2);
|
|
|
|
// testing multiple dynamic bindings in path with non-empty query params
|
|
const path3 = `/{{Text1.text ? 'users' : 'user'}}/{{"test"}}?a=hello&b=world`;
|
|
const output3 = `/{{Text1.text ? 'users' : 'user'}}/{{"test"}}`;
|
|
|
|
const result3 = extractApiUrlPath(path3);
|
|
expect(result3).toEqual(output3);
|
|
|
|
// testing normal strings and dynamic bindings in path with non-empty query params
|
|
const path4 = `/key/{{Text1.text}}?a=hello&b=world`;
|
|
const output4 = `/key/{{Text1.text}}`;
|
|
|
|
const result4 = extractApiUrlPath(path4);
|
|
expect(result4).toEqual(output4);
|
|
|
|
const path5 = "/{{Text1.text ?? 'user1'}}";
|
|
const output5 = "/{{Text1.text ?? 'user1'}}";
|
|
|
|
const result5 = extractApiUrlPath(path5);
|
|
expect(result5).toEqual(output5);
|
|
});
|
|
});
|