gh-87 handle scheme in host

Author: thomashacker

src/connection/gqlClient.ts

@@ -7,14 +7,17 @@ export interface GraphQLClient {
 }
 
 export const gqlClient = (config: ConnectionParams): GraphQLClient => {
-  const scheme = config.scheme;
-  const host = config.host;
   const defaultHeaders = config.headers;
+  const version = '/v1/graphql';
+  const baseUri = config.host.startsWith(`${config.scheme}://`)
+    ? `${config.host}${version}`
+    : `${config.scheme}://${config.host}${version}`;
+
   return {
     // for backward compatibility with replaced graphql-client lib,
     // results are wrapped into { data: data }
     query: (query: TQuery, variables?: Variables, headers?: HeadersInit) => {
-      return new Client(`${scheme}://${host}/v1/graphql`, {
+      return new Client(baseUri, {
         headers: {
           ...defaultHeaders,
           ...headers,

src/connection/httpClient.ts

@@ -14,7 +14,10 @@ export interface HttpClient {
 }
 
 export const httpClient = (config: ConnectionParams): HttpClient => {
-  const baseUri = `${config.scheme}://${config.host}/v1`;
+  const version = '/v1';
+  const baseUri = config.host.startsWith(`${config.scheme}://`)
+    ? `${config.host}${version}`
+    : `${config.scheme}://${config.host}${version}`;
   const url = makeUrl(baseUri);
 
   return {

src/connection/unit.test.ts

@@ -124,6 +124,40 @@ describe('mock server auth tests', () => {
     await conn.login().then((key) => expect(key).toEqual(apiKey));
   });
 
+  it('should construct the correct baseUri for conn.http when host contains scheme', async () => {
+    const apiKey = 'abcd123';
+
+    const conn = new Connection({
+      scheme: 'http',
+      host: 'http://localhost:' + server.port,
+      apiKey: new ApiKey(apiKey),
+    });
+
+    await conn.http.get('/testEndpoint');
+    const lastRequestURL = server.lastRequest().path; // Get the path of the last request
+    const expectedPath = '/v1/testEndpoint';
+    expect(lastRequestURL).toEqual(expectedPath);
+  });
+
+  it('should construct the correct baseUri for conn.query when host contains scheme', async () => {
+    const apiKey = 'abcd123';
+
+    const conn = new Connection({
+      scheme: 'http',
+      host: 'http://localhost:' + server.port,
+      apiKey: new ApiKey(apiKey),
+    });
+
+    try {
+      await conn.query('{ query { users } }');
+    } catch (error) {
+      // We just want to test the last request path
+    }
+    const lastRequestURL = server.lastRequest().path;
+    const expectedPath = '/v1/graphql';
+    expect(lastRequestURL).toEqual(expectedPath);
+  });
+
   it('shuts down the server', () => {
     return server.close();
   });

test/server.ts

@@ -27,7 +27,7 @@ export function testServer() {
     lastRequest = ctx.request;
     return next();
   });
-  app.use(getLocalOidcConfig, getRemoteOidcConfig, issueToken);
+  app.use(getLocalOidcConfig, getRemoteOidcConfig, issueToken, mockGetEndpoint, mockGraphQLResponse);
   const server = app.listen(port);
 
   serverCache = {
@@ -46,6 +46,28 @@ export function testServer() {
   return serverCache;
 }
 
+const mockGetEndpoint = (ctx: any, next: any) => {
+  if (ctx.path !== '/v1/testEndpoint') {
+    return next();
+  }
+
+  ctx.response.status = 200;
+  ctx.response.body = { message: 'test endpoint' };
+};
+
+const mockGraphQLResponse = (ctx: any, next: any) => {
+  if (ctx.path !== '/v1/graphql') {
+    return next();
+  }
+
+  ctx.response.status = 200;
+  ctx.response.body = {
+    data: {
+      someField: 'someValue',
+    },
+  };
+};
+
 const getLocalOidcConfig = (ctx: any, next: any) => {
   if (ctx.path !== '/v1/.well-known/openid-configuration') {
     return next();