Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 5 additions & 7 deletions packages/js/plugins/http/schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,14 @@ type Response {
type Request {
headers: [Header!]
urlParams: [UrlParam!]
responseType: String! # "TEXT" || "BINARY"
responseType: ResponseType!
body: String
}

# Enum types curently not supported
#
# enum ResponseType {
# TEXT
# BINARY
# }
enum ResponseType {
TEXT
BINARY
}

type Query {
get(url: String!, request: Request): Response
Expand Down
4 changes: 2 additions & 2 deletions packages/js/plugins/http/src/__tests__/e2e/e2e.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ describe("e2e tests for HttpPlugin", () => {
post(
url: "http://www.example.com/api"
request: {
responseType: BINARY
responseType: 1
body: "{data: 'test-request'}"
}
)
Expand Down Expand Up @@ -293,7 +293,7 @@ describe("e2e tests for HttpPlugin", () => {
post(
url: "http://www.example.com/api"
request: {
responseType: TEXT
responseType: 0
body: "{data: 'test-request'}"
urlParams: [{key: "query", value: "foo"}]
headers: [{key: "X-Request-Header", value: "req-foo"}]
Expand Down
9 changes: 5 additions & 4 deletions packages/js/plugins/http/src/__tests__/unit/index.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { HttpPlugin } from "../../index";

import axios, { AxiosResponse, AxiosRequestConfig } from "axios";
import { ResponseType } from "../../types";

// mock axios
jest.mock("axios");
Expand Down Expand Up @@ -35,7 +36,7 @@ describe("test http plugin", () => {
{ key: "X-Test-Header", value: "test-header-value" },
],
urlParams: [{ key: "q", value: "test-param" }],
responseType: "TEXT",
responseType: ResponseType.TEXT,
});

expect(mockedAxios.get).lastCalledWith("/api/test", {
Expand Down Expand Up @@ -72,7 +73,7 @@ describe("test http plugin", () => {
{ key: "X-Test-Header", value: "test-header-value" },
],
urlParams: [{ key: "q", value: "test-param" }],
responseType: "BINARY",
responseType: ResponseType.BINARY,
});

expect(mockedAxios.get).lastCalledWith("/api/test", {
Expand Down Expand Up @@ -114,7 +115,7 @@ describe("test http plugin", () => {
],
urlParams: [{ key: "q", value: "test-param" }],
body: "{request: 1001}",
responseType: "TEXT",
responseType: ResponseType.TEXT,
});

expect(mockedAxios.post).lastCalledWith("/api/test", "{request: 1001}", {
Expand Down Expand Up @@ -152,7 +153,7 @@ describe("test http plugin", () => {
],
urlParams: [{ key: "q", value: "test-param" }],
body: "{request: 1001}",
responseType: "BINARY",
responseType: ResponseType.BINARY,
});

expect(mockedAxios.post).lastCalledWith("/api/test", "{request: 1001}", {
Expand Down
6 changes: 4 additions & 2 deletions packages/js/plugins/http/src/__tests__/unit/util.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { fromAxiosResponse, toAxiosRequestConfig } from "../../util";
import { ResponseType } from "../../types";

describe("converting axios response", () => {

test("response type: text", () => {
const response = fromAxiosResponse({
status: 200,
Expand Down Expand Up @@ -45,7 +47,7 @@ describe("creating axios config", () => {
{ key: "Accept", value: "application-json" },
{ key: "X-Header", value: "test-value" },
],
responseType: "TEXT",
responseType: ResponseType.TEXT,
body: "body-content",
});

Expand All @@ -60,7 +62,7 @@ describe("creating axios config", () => {
test("with url params", () => {
const config = toAxiosRequestConfig({
urlParams: [{ key: "tag", value: "data" }],
responseType: "BINARY",
responseType: ResponseType.BINARY,
body: "body-content",
});

Expand Down
5 changes: 4 additions & 1 deletion packages/js/plugins/http/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ export class UrlParam {
value: string;
}

export type ResponseType = "TEXT" | "BINARY";
export enum ResponseType {
TEXT,
BINARY,
}

export class Request {
headers?: Header[];
Expand Down
5 changes: 3 additions & 2 deletions packages/js/plugins/http/src/util.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Request, Response, Header } from "./types";
import { Request, Response, Header, ResponseType } from "./types";

import { AxiosResponse, AxiosRequestConfig } from "axios";

Expand Down Expand Up @@ -50,7 +50,8 @@ export function toAxiosRequestConfig(request: Request): AxiosRequestConfig {
}, {});

let config: AxiosRequestConfig = {
responseType: request.responseType == "BINARY" ? "arraybuffer" : "text",
responseType:
request.responseType == ResponseType.BINARY ? "arraybuffer" : "text",
};

if (urlParams) {
Expand Down