Merge pull request #454 from acacode/next

Release 12.0.1

Author: js2me

CHANGELOG.md

@@ -1,4 +1,9 @@
-# next release
+# next release  
+
+## 12.0.1  
+
+fix: problem based with http requests and `disableStrictSSL` option (#453)  
+docs: update docs for `requestOptions` nodejs option  
 
 ## 12.0.0  
 

index.d.ts

@@ -151,7 +151,10 @@ interface GenerateApiParamsBase {
   typePrefix?: string;
   /** suffix string value for type names */
   typeSuffix?: string;
+  /** extra configuration for extracting type names operations */
   extractingOptions?: Partial<ExtractingOptions>;
+  /** configuration for fetching swagger schema requests */
+  requestOptions?: null | Partial<import("node-fetch").RequestInit>;
 }
 
 type CodeGenConstruct = {
@@ -529,6 +532,7 @@ export interface GenerateApiConfiguration {
       routes: ParsedRoute[];
     }[];
   };
+  requestOptions?: null | Partial<import("node-fetch").RequestInit>;
   utils: {
     formatDescription: (description: string, inline?: boolean) => string;
     internalCase: (value: string) => string;

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-typescript-api",
-  "version": "12.0.0",
+  "version": "12.0.1",
   "description": "Generate typescript/javascript api from swagger schema",
   "scripts": {
     "cli:json": "node index.js -r -d -p ./swagger-test-cli.json -n swagger-test-cli.ts",

package.json

@@ -1,3 +1,4 @@
+const _ = require("lodash");
 const https = require("https");
 const fetch = require("node-fetch-h2");
 
@@ -18,7 +19,7 @@ class Request {
 
   /**
    *
-   * @param url
+   * @param url {string}
    * @param disableStrictSSL
    * @param authToken
    * @param options {Partial<import("node-fetch").RequestInit>}
@@ -28,11 +29,9 @@ class Request {
     /**
      * @type {Partial<import("node-fetch").RequestInit>}
      */
-    const requestOptions = {
-      ...(this.config.requestOptions || {}),
-    };
+    const requestOptions = {};
 
-    if (disableStrictSSL) {
+    if (disableStrictSSL && !_.startsWith(url, "http://")) {
       requestOptions.agent = new https.Agent({
         rejectUnauthorized: false,
       });
@@ -43,7 +42,7 @@ class Request {
       };
     }
 
-    Object.assign(requestOptions, options);
+    _.merge(requestOptions, options, this.config.requestOptions);
 
     try {
       const response = await fetch(url, requestOptions);