Fix swagger route

Author: hirsch88

.env.example

@@ -2,7 +2,9 @@
 # APPLICATION
 #
 APP_NAME="express-typescript-boilerplate"
-APP_ROUTE="http://localhost:3000"
+APP_SCHEMA="http"
+APP_HOST="localhost"
+APP_PORT="3000"
 APP_ROUTE_PREFIX="/api"
 APP_BANNER=true
 

.env.test

@@ -2,7 +2,9 @@
 # APPLICATION
 #
 APP_NAME="express-typescript-boilerplate"
-APP_ROUTE="http://localhost:3000"
+APP_SCHEMA="http"
+APP_HOST="localhost"
+APP_PORT="3000"
 APP_ROUTE_PREFIX="/api"
 APP_BANNER=false
 

src/api/swagger.json

@@ -13,9 +13,7 @@
     "produces": [
         "application/json"
     ],
-    "schemes": [
-        "http"
-    ],
+    "schemes": [],
     "securityDefinitions": {
         "JWT": {
             "type": "apiKey",
@@ -35,7 +33,7 @@
         }
     ],
     "paths": {
-        "/info": {
+        "/": {
             "get": {
                 "tags": [
                     "Info"

src/env.ts

@@ -21,9 +21,10 @@ export const env = {
         name: getOsEnv('APP_NAME'),
         version: (pkg as any).version,
         description: (pkg as any).description,
-        route: getOsEnv('APP_ROUTE'),
+        host: getOsEnv('APP_HOST'),
+        schema: getOsEnv('APP_SCHEMA'),
         routePrefix: getOsEnv('APP_ROUTE_PREFIX'),
-        port: normalizePort(process.env.PORT || '3000'),
+        port: normalizePort(process.env.PORT || getOsEnv('APP_PORT')),
         banner: toBool(getOsEnv('APP_BANNER')),
         dirs: {
             migrations: [path.relative(path.join(process.cwd()), path.join(__dirname, 'database/migrations/*.ts'))],

src/lib/banner.ts

@@ -3,23 +3,24 @@ import { Logger } from '../lib/logger';
 
 export function banner(log: Logger): void {
     if (env.app.banner) {
+        const route = () => `${env.app.schema}://${env.app.host}:${env.app.port}`;
         log.info(``);
-        log.info(`Aloha, your app is ready on ${env.app.route}${env.app.routePrefix}`);
+        log.info(`Aloha, your app is ready on ${route()}${env.app.routePrefix}`);
         log.info(`To shut it down, press <CTRL> + C at any time.`);
         log.info(``);
         log.info('-------------------------------------------------------');
         log.info(`Environment  : ${env.node}`);
         log.info(`Version      : ${env.app.version}`);
         log.info(``);
-        log.info(`API Info     : ${env.app.route}${env.app.routePrefix}`);
+        log.info(`API Info     : ${route()}${env.app.routePrefix}`);
         if (env.graphql.enabled) {
-            log.info(`GraphQL      : ${env.app.route}${env.graphql.route}`);
+            log.info(`GraphQL      : ${route()}${env.graphql.route}`);
         }
         if (env.swagger.enabled) {
-            log.info(`Swagger      : ${env.app.route}${env.swagger.route}`);
+            log.info(`Swagger      : ${route()}${env.swagger.route}`);
         }
         if (env.monitor.enabled) {
-            log.info(`Monitor      : ${env.app.route}${env.monitor.route}`);
+            log.info(`Monitor      : ${route()}${env.monitor.route}`);
         }
         log.info('-------------------------------------------------------');
         log.info('');

src/loaders/swaggerLoader.ts

@@ -16,8 +16,9 @@ export const swaggerLoader: MicroframeworkLoader = (settings: MicroframeworkSett
             description: env.app.description,
             version: env.app.version,
         };
-        swaggerFile.host = env.app.route;
+        swaggerFile.host = `${env.app.host}:${env.app.port}`;
         swaggerFile.basePath = env.app.routePrefix;
+        swaggerFile.schemes = [env.app.schema];
 
         expressApp.use(
             env.swagger.route,