Merge pull request #116 from acacode/next

Release 4.0.3

Author: js2me

CHANGELOG.md

@@ -1,5 +1,11 @@
 # next release  
 
+# 4.0.3  
+
+Features:  
+- `--disableStrictSSL` option for disable strict SSL statement with fetching swagger schema. (Thanks @kel666 for PR with feature request)  
+  This option fix problem #114  
+
 # 4.0.2  
 
 Fixes:  

README.md

@@ -54,6 +54,7 @@ Options:
   --module-name-index <number>  determines which path index should be used for routes separation (default: 0)
                                 (example: GET:/fruites/getFruit -> index:0 -> moduleName -> fruites)
   --modular                     generate separated files for http client, data contracts, and routes (default: false)
+  --disableStrictSSL            disabled strict SSL (default: false)
   -h, --help                    display help for command
 ```
 

index.d.ts

@@ -60,6 +60,10 @@ interface GenerateApiParams {
    * determines which path index should be used for routes separation
    */
   moduleNameIndex?: number;
+  /**
+   * disabled SSL check
+   */
+  disableStrictSSL?: boolean;
   /**
    * generate separated files for http client, data contracts, and routes (default: false)
    */
@@ -207,6 +211,7 @@ export interface GenerateApiConfiguration {
     componentsMap: Record<string, SchemaComponent>;
     convertedFromSwagger2: boolean;
     moduleNameIndex: number;
+    disableStrictSSSL: boolean;
     extractRequestParams: boolean;
     fileNames: {
       dataContracts: string;

index.js

@@ -59,7 +59,8 @@ program
     "--module-name-index <number>",
     "determines which path index should be used for routes separation (example: GET:/fruites/getFruit -> index:0 -> moduleName -> fruites)",
     0,
-  );
+  )
+  .option("--disableStrictSSL", "disabled strict SSL", false);
 
 program.parse(process.argv);
 
@@ -78,6 +79,7 @@ const {
   moduleNameIndex,
   extractRequestParams,
   enumNamesAsValues,
+  disableStrictSSL,
 } = program;
 
 generateApi({
@@ -96,4 +98,5 @@ generateApi({
   toJS: !!js,
   enumNamesAsValues: enumNamesAsValues,
   moduleNameIndex: +(moduleNameIndex || 0),
+  disableStrictSSL: !!disableStrictSSL,
 });

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-typescript-api",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "description": "Create typescript api module from swagger schema",
   "scripts": {
     "cli:json": "node index.js -r -d -p ./swagger-test-cli.json -n swagger-test-cli.ts --extract-request-params --enum-names-as-values",

package.json

@@ -26,6 +26,7 @@ const config = {
 
   /** url index from paths used for merging into modules */
   moduleNameIndex: 0,
+  disableStrictSSL: false,
   extractRequestParams: false,
   fileNames: {
     dataContracts: "data-contracts",

src/config.js

@@ -41,6 +41,7 @@ module.exports = {
     hooks: rawHooks,
     extraTemplates,
     enumNamesAsValues,
+    disableStrictSSL = config.disableStrictSSL,
   }) =>
     new Promise((resolve, reject) => {
       addToConfig({
@@ -55,8 +56,9 @@ module.exports = {
         extractRequestParams,
         hooks: _.merge(config.hooks, rawHooks || {}),
         enumNamesAsValues,
+        disableStrictSSL,
       });
-      (spec ? convertSwaggerObject(spec) : getSwaggerObject(input, url))
+      (spec ? convertSwaggerObject(spec) : getSwaggerObject(input, url, disableStrictSSL))
         .then(({ usageSchema, originalSchema }) => {
           const templatesToRender = getTemplates(config);
 

src/index.js

@@ -2,6 +2,7 @@ const _ = require("lodash");
 const yaml = require("js-yaml");
 const axios = require("axios");
 const converter = require("swagger2openapi");
+const https = require("https");
 const { addToConfig } = require("./config");
 const { pathIsExist, getFileContent } = require("./files");
 
@@ -15,19 +16,25 @@ const parseSwaggerFile = (file) => {
   }
 };
 
-const getSwaggerFile = (pathToSwagger, urlToSwagger) =>
+const getSwaggerFile = (pathToSwagger, urlToSwagger, disableStrictSSL) =>
   new Promise((resolve) => {
     if (pathIsExist(pathToSwagger)) {
       console.log(`✨ try to get swagger by path "${pathToSwagger}"`);
       resolve(getFileContent(pathToSwagger));
     } else {
       console.log(`✨ try to get swagger by url "${urlToSwagger}"`);
-      axios.get(urlToSwagger).then((res) => resolve(res.data));
+      let agent = undefined;
+      if (disableStrictSSL) {
+        agent = new https.Agent({
+          rejectUnauthorized: false,
+        });
+      }
+      axios.get(urlToSwagger, { httpsAgent: agent }).then((res) => resolve(res.data));
     }
   });
 
-const getSwaggerObject = (pathToSwagger, urlToSwagger) =>
-  getSwaggerFile(pathToSwagger, urlToSwagger).then((file) =>
+const getSwaggerObject = (pathToSwagger, urlToSwagger, disableStrictSSL) =>
+  getSwaggerFile(pathToSwagger, urlToSwagger, disableStrictSSL).then((file) =>
     convertSwaggerObject(parseSwaggerFile(file)),
   );