From 6354e2c57191c92d6e55629e16424fcba3a590cb Mon Sep 17 00:00:00 2001 From: Jomarquez21 Date: Tue, 11 Sep 2018 15:18:55 -0500 Subject: [PATCH 1/2] remove basepath as required to generate domain by default --- lib/codegen.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/codegen.js b/lib/codegen.js index 54dbe7ef..ac3977c5 100644 --- a/lib/codegen.js +++ b/lib/codegen.js @@ -30,6 +30,14 @@ var getPathToMethodName = function(opts, m, path){ return m.toLowerCase() + result[0].toUpperCase() + result.substring(1); }; +var getDefaultDomain = function(swagger) { + var domain = swagger.schemes[0]; + domain += '://'; + domain += swagger.host; + domain += _.has(swagger, 'basePath') ? swagger.basePath.replace(/\/+$/g,'') : ''; + return domain; +} + var getViewForSwagger2 = function(opts, type){ var swagger = opts.swagger; var methods = []; @@ -42,7 +50,7 @@ var getViewForSwagger2 = function(opts, type){ moduleName: opts.moduleName, className: opts.className, imports: opts.imports, - domain: (swagger.schemes && swagger.schemes.length > 0 && swagger.host && swagger.basePath) ? swagger.schemes[0] + '://' + swagger.host + swagger.basePath.replace(/\/+$/g,'') : '', + domain: (swagger.schemes && swagger.schemes.length > 0 && swagger.host) ? getDefaultDomain(swagger) : '', methods: [], definitions: [] }; From 307f415d2bf270c93f3f64daa0a87135aa665cac Mon Sep 17 00:00:00 2001 From: Jomarquez21 Date: Tue, 11 Sep 2018 19:14:09 -0500 Subject: [PATCH 2/2] add semicolon --- lib/codegen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/codegen.js b/lib/codegen.js index ac3977c5..cc1e45cc 100644 --- a/lib/codegen.js +++ b/lib/codegen.js @@ -36,7 +36,7 @@ var getDefaultDomain = function(swagger) { domain += swagger.host; domain += _.has(swagger, 'basePath') ? swagger.basePath.replace(/\/+$/g,'') : ''; return domain; -} +}; var getViewForSwagger2 = function(opts, type){ var swagger = opts.swagger;