- Fixes

ferdikoomen · ferdikoomen · commit 4c1e74eb9361 · 2020-12-16T19:50:31.000+01:00
diff --git a/package.json b/package.json
@@ -90,7 +90,6 @@
         "express": "4.17.1",
         "form-data": "3.0.0",
         "glob": "7.1.6",
-        "httpntlm": "1.7.6",
         "jest": "26.6.3",
         "jest-cli": "26.6.3",
         "node-fetch": "2.6.1",
diff --git a/src/index.ts b/src/index.ts
@@ -11,7 +11,6 @@ export enum HttpClient {
     FETCH = 'fetch',
     XHR = 'xhr',
     NODE = 'node',
-    HTTPNTLM = 'httpntlm',
 }
 
 export type Options = {
diff --git a/src/templates/core/fetch/request.hbs b/src/templates/core/fetch/request.hbs
@@ -50,7 +50,7 @@ import { OpenAPI } from './OpenAPI';
 /**
  * Request using fetch client
  * @param options The request options from the the service
- * @result ApiResult
+ * @returns ApiResult
  * @throws ApiError
  */
 export async function request(options: ApiRequestOptions): Promise<ApiResult> {
diff --git a/src/templates/core/fetch/sendRequest.hbs b/src/templates/core/fetch/sendRequest.hbs
@@ -4,5 +4,8 @@ async function sendRequest(options: ApiRequestOptions, url: string): Promise<Res
         headers: await getHeaders(options),
         body: getRequestBody(options),
     };
+    if (OpenAPI.WITH_CREDENTIALS) {
+        request.credentials = 'include';
+    }
     return await fetch(url, request);
 }
diff --git a/src/templates/core/httpntlm/getHeaders.hbs b/src/templates/core/httpntlm/getHeaders.hbs
diff --git a/src/templates/core/httpntlm/getRequestBody.hbs b/src/templates/core/httpntlm/getRequestBody.hbs
diff --git a/src/templates/core/httpntlm/getResponseBody.hbs b/src/templates/core/httpntlm/getResponseBody.hbs
diff --git a/src/templates/core/httpntlm/getResponseHeader.hbs b/src/templates/core/httpntlm/getResponseHeader.hbs
diff --git a/src/templates/core/httpntlm/request.hbs b/src/templates/core/httpntlm/request.hbs
diff --git a/src/templates/core/httpntlm/sendRequest.hbs b/src/templates/core/httpntlm/sendRequest.hbs
diff --git a/src/templates/core/node/request.hbs b/src/templates/core/node/request.hbs
@@ -52,11 +52,11 @@ import { OpenAPI } from './OpenAPI';
 
 
 /**
-* Request using node-fetch client
-* @param options The request options from the the service
-* @result ApiResult
-* @throws ApiError
-*/
+ * Request using node-fetch client
+ * @param options The request options from the the service
+ * @returns ApiResult
+ * @throws ApiError
+ */
 export async function request(options: ApiRequestOptions): Promise<ApiResult> {
     const url = getUrl(options);
     const response = await sendRequest(options, url);
diff --git a/src/templates/core/node/sendRequest.hbs b/src/templates/core/node/sendRequest.hbs
@@ -4,5 +4,8 @@ async function sendRequest(options: ApiRequestOptions, url: string): Promise<Res
         headers: await getHeaders(options),
         body: getRequestBody(options),
     };
+    if (OpenAPI.WITH_CREDENTIALS) {
+        request.credentials = 'include';
+    }
     return await fetch(url, request);
 }
diff --git a/src/templates/core/request.hbs b/src/templates/core/request.hbs
@@ -1,4 +1,3 @@
-{{#equals @root.httpClient 'fetch'}}{{>fetch/request}}{{/equals}}
-{{#equals @root.httpClient 'xhr'}}{{>xhr/request}}{{/equals}}
-{{#equals @root.httpClient 'node'}}{{>node/request}}{{/equals}}
-{{#equals @root.httpClient 'httpntml'}}{{>httpntml/request}}{{/equals}}
+{{~#equals @root.httpClient 'fetch'}}{{>fetch/request}}{{/equals~}}
+{{~#equals @root.httpClient 'xhr'}}{{>xhr/request}}{{/equals~}}
+{{~#equals @root.httpClient 'node'}}{{>node/request}}{{/equals~}}
diff --git a/src/templates/core/xhr/request.hbs b/src/templates/core/xhr/request.hbs
@@ -53,7 +53,7 @@ import { OpenAPI } from './OpenAPI';
 /**
  * Request using XHR client
  * @param options The request options from the the service
- * @result ApiResult
+ * @returns ApiResult
  * @throws ApiError
  */
 export async function request(options: ApiRequestOptions): Promise<ApiResult> {
diff --git a/src/templates/exportService.hbs b/src/templates/exportService.hbs
@@ -31,7 +31,7 @@ export class {{{name}}} {
     {{/if}}
     {{/unless}}
     {{#each results}}
-     * @result {{{type}}} {{{description}}}
+     * @returns {{{type}}} {{{description}}}
     {{/each}}
      * @throws ApiError
      */
diff --git a/src/utils/registerHandlebarTemplates.ts b/src/utils/registerHandlebarTemplates.ts
@@ -26,12 +26,6 @@ import nodeGetResponseBody from '../templates/core/node/getResponseBody.hbs';
 import nodeGetResponseHeader from '../templates/core/node/getResponseHeader.hbs';
 import nodeRequest from '../templates/core/node/request.hbs';
 import nodeSendRequest from '../templates/core/node/sendRequest.hbs';
-import httpntlmGetHeaders from '../templates/core/httpntlm/getHeaders.hbs';
-import httpntlmGetRequestBody from '../templates/core/httpntlm/getRequestBody.hbs';
-import httpntlmGetResponseBody from '../templates/core/httpntlm/getResponseBody.hbs';
-import httpntlmGetResponseHeader from '../templates/core/httpntlm/getResponseHeader.hbs';
-import httpntlmRequest from '../templates/core/httpntlm/request.hbs';
-import httpntlmSendRequest from '../templates/core/httpntlm/sendRequest.hbs';
 import templateCoreSettings from '../templates/core/OpenAPI.hbs';
 import templateCoreRequest from '../templates/core/request.hbs';
 import xhrGetHeaders from '../templates/core/xhr/getHeaders.hbs';
@@ -179,13 +173,5 @@ export function registerHandlebarTemplates(): Templates {
     Handlebars.registerPartial('node/sendRequest', Handlebars.template(nodeSendRequest));
     Handlebars.registerPartial('node/request', Handlebars.template(nodeRequest));
 
-    // Specific files for the node client implementation
-    Handlebars.registerPartial('httpntlm/getHeaders', Handlebars.template(httpntlmGetHeaders));
-    Handlebars.registerPartial('httpntlm/getRequestBody', Handlebars.template(httpntlmGetRequestBody));
-    Handlebars.registerPartial('httpntlm/getResponseBody', Handlebars.template(httpntlmGetResponseBody));
-    Handlebars.registerPartial('httpntlm/getResponseHeader', Handlebars.template(httpntlmGetResponseHeader));
-    Handlebars.registerPartial('httpntlm/sendRequest', Handlebars.template(httpntlmSendRequest));
-    Handlebars.registerPartial('httpntlm/request', Handlebars.template(httpntlmRequest));
-
     return templates;
 }
diff --git a/test/index.js b/test/index.js
@@ -6,7 +6,7 @@ async function generateV2() {
     await OpenAPI.generate({
         input: './test/spec/v2.json',
         output: './test/generated/v2/',
-        httpClient: OpenAPI.HttpClient.HTTPNTLM,
+        httpClient: OpenAPI.HttpClient.FETCH,
         useOptions: false,
         useUnionTypes: false,
         exportCore: true,
@@ -20,7 +20,7 @@ async function generateV3() {
     await OpenAPI.generate({
         input: './test/spec/v3.json',
         output: './test/generated/v3/',
-        httpClient: OpenAPI.HttpClient.HTTPNTLM,
+        httpClient: OpenAPI.HttpClient.FETCH,
         useOptions: false,
         useUnionTypes: false,
         exportCore: true,
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -2,7 +2,6 @@ export declare enum HttpClient {
     FETCH = 'fetch',
     XHR = 'xhr',
     NODE = 'node',
-    HTTPNTLM = 'httpntlm',
 }
 
 export type Options = {

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ export enum HttpClient {`
`11`	`11`	`FETCH = 'fetch',`
`12`	`12`	`XHR = 'xhr',`
`13`	`13`	`NODE = 'node',`
`14`		`- HTTPNTLM = 'httpntlm',`
`15`	`14`	`}`
`16`	`15`
`17`	`16`	`export type Options = {`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,8 @@ async function sendRequest(options: ApiRequestOptions, url: string): Promise<Res`
`4`	`4`	`headers: await getHeaders(options),`
`5`	`5`	`body: getRequestBody(options),`
`6`	`6`	`};`
	`7`	`+ if (OpenAPI.WITH_CREDENTIALS) {`
	`8`	`+ request.credentials = 'include';`
	`9`	`+ }`
`7`	`10`	`return await fetch(url, request);`
`8`	`11`	`}`