fix(protocol): Allow https (#13)

* allow https * allow https * Update envoy-request-params-refiner.test.ts * Update envoy-fetch.test.ts * Update envoy-request-params-refiner.test.ts
Tubitv · Jan 30, 2018 · ed45d92 · ed45d92
1 parent c70c8d5
commit ed45d92
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 20 deletions.
diff --git a/src/envoy-fetch.ts b/src/envoy-fetch.ts
@@ -41,8 +41,8 @@ export default async function envoyFetch(
 
   const callDirectly = envoyParams.context.shouldCallWithoutEnvoy(host);
 
-  if (protocol !== "http:" && !callDirectly) {
-    throw new Error(`envoy fetch is designed only for http for now, current found: ${url}`);
+  if (protocol !== "http:" && protocol !== "https:" && !callDirectly) {
+    throw new Error(`envoy fetch is designed only for http / https for now, current found: ${url}`);
   }
   const refinedInit: RequestInit = { ...init };
 

diff --git a/src/envoy-request-params-refiner.ts b/src/envoy-request-params-refiner.ts
@@ -59,8 +59,8 @@ export default function envoyRequestParamsRefiner(
 
   const callDirectly = envoyParams.context.shouldCallWithoutEnvoy(host);
 
-  if (protocol !== "http:") {
-    throw new Error(`envoy request is designed only for http for now, current found: ${protocol}`);
+  if (protocol !== "http:" && protocol !== "https:") {
+    throw new Error(`envoy request is designed only for http / https for now, current found: ${protocol}`);
   }
 
   const oldHeaders: HttpHeader = {};

diff --git a/test/envoy-fetch.test.ts b/test/envoy-fetch.test.ts
@@ -10,14 +10,4 @@ describe("envoy-fetch test", () => {
       expect(e.message).toBe("Cannot read the URL for envoy to fetch");
     });
   });
-
-  it("should throw Error for http url", () => {
-    expect.assertions(1);
-    const param = new EnvoyHttpRequestParams(new EnvoyContext({}));
-    envoyFetch(param, "https://foo/bar").catch((e: Error) => {
-      expect(e.message).toBe(
-        "envoy fetch is designed only for http for now, current found: https://foo/bar"
-      );
-    });
-  });
 });
diff --git a/test/envoy-request-params-refiner.test.ts b/test/envoy-request-params-refiner.test.ts
@@ -8,9 +8,6 @@ describe("Envoy request params refiner test", () => {
     expect(() => {
       envoyRequestParamsRefiner("invalid url", {});
     }).toThrow();
-    expect(() => {
-      envoyRequestParamsRefiner("https://foo.bar/path", {});
-    }).toThrow();
     expect(() => {
       envoyRequestParamsRefiner(
         {
@@ -22,9 +19,6 @@ describe("Envoy request params refiner test", () => {
     expect(() => {
       envoyRequestParamsRefiner({ url: "invalid url" }, {});
     }).toThrow();
-    expect(() => {
-      envoyRequestParamsRefiner({ url: "https://foo.bar/path" }, new EnvoyContext({}));
-    }).toThrow();
   });
 
   it("should refine the params (string url)", () => {