From 9373ea195594144d8dd5bdd109d28df88ec68246 Mon Sep 17 00:00:00 2001
From: dkrantsberg <dkrants@gmail.com>
Date: Thu, 7 Mar 2019 16:38:35 -0500
Subject: [PATCH 1/2] feat: openepi.json and API explorer honor basePath

---
 .../app/templates/public/index.html.ejs        |  4 ++--
 packages/rest/src/rest.server.ts               | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/cli/generators/app/templates/public/index.html.ejs b/packages/cli/generators/app/templates/public/index.html.ejs
index 7f9ae8035648..92811d3935dc 100644
--- a/packages/cli/generators/app/templates/public/index.html.ejs
+++ b/packages/cli/generators/app/templates/public/index.html.ejs
@@ -59,8 +59,8 @@
     <h1><%= project.name %></h1>
     <p>Version <%= project.version || '1.0.0' %></p>
 
-    <h3>OpenAPI spec: <a href="/openapi.json">/openapi.json</a></h3>
-    <h3>API Explorer: <a href="/explorer">/explorer</a></h3>
+    <h3>OpenAPI spec: <a href="openapi.json">openapi.json</a></h3>
+    <h3>API Explorer: <a href="explorer">explorer</a></h3>
   </div>
 
   <footer class="power">
diff --git a/packages/rest/src/rest.server.ts b/packages/rest/src/rest.server.ts
index 38eaf5065f0c..c440d3fe7981 100644
--- a/packages/rest/src/rest.server.ts
+++ b/packages/rest/src/rest.server.ts
@@ -180,6 +180,13 @@ export class RestServer extends Context implements Server, HttpServerLike {
       config.host = undefined;
     }
 
+    this.basePath(config.basePath);
+
+    const OPENAPI_SPEC_MAPPING: {[key: string]: OpenApiSpecForm} = {
+      [`${this._basePath}/openapi.json`]: {version: '3.0.0', format: 'json'},
+      [`${this._basePath}/openapi.yaml`]: {version: '3.0.0', format: 'yaml'},
+    };
+
     config.openApiSpec = config.openApiSpec || {};
     config.openApiSpec.endpointMapping =
       config.openApiSpec.endpointMapping || OPENAPI_SPEC_MAPPING;
@@ -206,8 +213,6 @@ export class RestServer extends Context implements Server, HttpServerLike {
       this.sequence(config.sequence);
     }
 
-    this.basePath(config.basePath);
-
     this.bind(RestBindings.BASE_PATH).toDynamicValue(() => this._basePath);
     this.bind(RestBindings.HANDLER).toDynamicValue(() => this.httpHandler);
   }
@@ -277,7 +282,7 @@ export class RestServer extends Context implements Server, HttpServerLike {
       );
     }
 
-    const explorerPaths = ['/swagger-ui', '/explorer'];
+    const explorerPaths = [`${this._basePath}/swagger-ui`, `${this._basePath}/explorer`];
     this._expressApp.get(explorerPaths, (req, res, next) =>
       this._redirectToSwaggerUI(req, res, next),
     );
@@ -510,7 +515,7 @@ export class RestServer extends Context implements Server, HttpServerLike {
     debug('Redirecting to swagger-ui from %j.', request.originalUrl);
     const protocol = this._getProtocolForRequest(request);
     const baseUrl = protocol === 'http' ? config.httpUrl : config.url;
-    const openApiUrl = `${this._getUrlForClient(request)}/openapi.json`;
+    const openApiUrl = `${this._getUrlForClient(request)}${this._basePath}/openapi.json`;
     const fullUrl = `${baseUrl}?url=${openApiUrl}`;
     response.redirect(308, fullUrl);
   }
@@ -920,11 +925,6 @@ export interface OpenApiSpecForm {
   format?: string;
 }
 
-const OPENAPI_SPEC_MAPPING: {[key: string]: OpenApiSpecForm} = {
-  '/openapi.json': {version: '3.0.0', format: 'json'},
-  '/openapi.yaml': {version: '3.0.0', format: 'yaml'},
-};
-
 /**
  * Options to customize how OpenAPI specs are served
  */

From 289b34e0c60340d702b75bbf7ca212d220c4a0ac Mon Sep 17 00:00:00 2001
From: dkrantsberg <dkrants@gmail.com>
Date: Thu, 7 Mar 2019 17:14:14 -0500
Subject: [PATCH 2/2] chore: added tests

---
 .../integration/rest.server.integration.ts       | 16 +++++++++++++++-
 packages/rest/src/rest.server.ts                 |  9 +++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/packages/rest/src/__tests__/integration/rest.server.integration.ts b/packages/rest/src/__tests__/integration/rest.server.integration.ts
index 59d370fcaa8a..42a685cb15d2 100644
--- a/packages/rest/src/__tests__/integration/rest.server.integration.ts
+++ b/packages/rest/src/__tests__/integration/rest.server.integration.ts
@@ -771,11 +771,25 @@ paths:
 
     it('controls server urls', async () => {
       const response = await createClientForHandler(server.requestHandler).get(
-        '/openapi.json',
+        '/api/openapi.json',
       );
       expect(response.body.servers).to.containEql({url: '/api'});
     });
 
+    it('controls /explorer route', async () => {
+      const response = await createClientForHandler(server.requestHandler).get(
+        '/api/explorer',
+      );
+      expect(response.status).to.eql(308);
+    });
+
+    it('controls /swagger-ui route', async () => {
+      const response = await createClientForHandler(server.requestHandler).get(
+        '/api/swagger-ui',
+      );
+      expect(response.status).to.eql(308);
+    });
+
     it('controls redirect locations', async () => {
       server.controller(DummyController);
       server.redirect('/page/html', '/html');
diff --git a/packages/rest/src/rest.server.ts b/packages/rest/src/rest.server.ts
index c440d3fe7981..8ab3f7cbb7fe 100644
--- a/packages/rest/src/rest.server.ts
+++ b/packages/rest/src/rest.server.ts
@@ -282,7 +282,10 @@ export class RestServer extends Context implements Server, HttpServerLike {
       );
     }
 
-    const explorerPaths = [`${this._basePath}/swagger-ui`, `${this._basePath}/explorer`];
+    const explorerPaths = [
+      `${this._basePath}/swagger-ui`,
+      `${this._basePath}/explorer`,
+    ];
     this._expressApp.get(explorerPaths, (req, res, next) =>
       this._redirectToSwaggerUI(req, res, next),
     );
@@ -515,7 +518,9 @@ export class RestServer extends Context implements Server, HttpServerLike {
     debug('Redirecting to swagger-ui from %j.', request.originalUrl);
     const protocol = this._getProtocolForRequest(request);
     const baseUrl = protocol === 'http' ? config.httpUrl : config.url;
-    const openApiUrl = `${this._getUrlForClient(request)}${this._basePath}/openapi.json`;
+    const openApiUrl = `${this._getUrlForClient(request)}${
+      this._basePath
+    }/openapi.json`;
     const fullUrl = `${baseUrl}?url=${openApiUrl}`;
     response.redirect(308, fullUrl);
   }