Skip to content

Commit e789d69

Browse files
committed
- Updated
1 parent a005cc3 commit e789d69

File tree

2 files changed

+200
-195
lines changed

2 files changed

+200
-195
lines changed

test/__snapshots__/index.spec.js.snap

Lines changed: 37 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ type Config = {
6767
TOKEN?: string | Resolver<string>;
6868
USERNAME?: string | Resolver<string>;
6969
PASSWORD?: string | Resolver<string>;
70-
DOMAIN?: string | Resolver<string>;
7170
HEADERS?: Headers | Resolver<Headers>;
7271
}
7372

@@ -78,7 +77,6 @@ export const OpenAPI: Config = {
7877
TOKEN: undefined,
7978
USERNAME: undefined,
8079
PASSWORD: undefined,
81-
DOMAIN: undefined,
8280
HEADERS: undefined,
8381
};"
8482
`;
@@ -210,6 +208,9 @@ async function sendRequest(options: ApiRequestOptions, url: string): Promise<Res
210208
headers: await getHeaders(options),
211209
body: getRequestBody(options),
212210
};
211+
if (OpenAPI.WITH_CREDENTIALS) {
212+
request.credentials = 'include';
213+
}
213214
return await fetch(url, request);
214215
}
215216

@@ -265,7 +266,7 @@ function catchErrors(options: ApiRequestOptions, result: ApiResult): void {
265266
/**
266267
* Request using fetch client
267268
* @param options The request options from the the service
268-
* @result ApiResult
269+
* @returns ApiResult
269270
* @throws ApiError
270271
*/
271272
export async function request(options: ApiRequestOptions): Promise<ApiResult> {
@@ -284,10 +285,7 @@ export async function request(options: ApiRequestOptions): Promise<ApiResult> {
284285

285286
catchErrors(options, result);
286287
return result;
287-
}
288-
289-
290-
"
288+
}"
291289
`;
292290

293291
exports[`v2 should generate: ./test/generated/v2/index.ts 1`] = `
@@ -1733,7 +1731,7 @@ export class ComplexService {
17331731
/**
17341732
* @param parameterObject Parameter containing object
17351733
* @param parameterReference Parameter containing reference
1736-
* @result ModelWithString Successful response
1734+
* @returns ModelWithString Successful response
17371735
* @throws ApiError
17381736
*/
17391737
public static async complexTypes(
@@ -1937,7 +1935,7 @@ import { OpenAPI } from '../core/OpenAPI';
19371935
export class HeaderService {
19381936

19391937
/**
1940-
* @result string Successful response
1938+
* @returns string Successful response
19411939
* @throws ApiError
19421940
*/
19431941
public static async callWithResultFromHeader(): Promise<string> {
@@ -2049,7 +2047,7 @@ import { OpenAPI } from '../core/OpenAPI';
20492047
export class ResponseService {
20502048

20512049
/**
2052-
* @result ModelWithString Message for default response
2050+
* @returns ModelWithString Message for default response
20532051
* @throws ApiError
20542052
*/
20552053
public static async callWithResponse(): Promise<ModelWithString> {
@@ -2061,7 +2059,7 @@ export class ResponseService {
20612059
}
20622060

20632061
/**
2064-
* @result ModelWithString Message for default response
2062+
* @returns ModelWithString Message for default response
20652063
* @throws ApiError
20662064
*/
20672065
public static async callWithDuplicateResponses(): Promise<ModelWithString> {
@@ -2078,10 +2076,10 @@ export class ResponseService {
20782076
}
20792077

20802078
/**
2081-
* @result any Message for 200 response
2082-
* @result ModelWithString Message for default response
2083-
* @result ModelThatExtends Message for 201 response
2084-
* @result ModelThatExtendsExtends Message for 202 response
2079+
* @returns any Message for 200 response
2080+
* @returns ModelWithString Message for default response
2081+
* @returns ModelThatExtends Message for 201 response
2082+
* @returns ModelThatExtendsExtends Message for 202 response
20852083
* @throws ApiError
20862084
*/
20872085
public static async callWithResponses(): Promise<{
@@ -2211,10 +2209,10 @@ export class TypesService {
22112209
* @param parameterBoolean This is a boolean parameter
22122210
* @param parameterObject This is an object parameter
22132211
* @param id This is a number parameter
2214-
* @result number Response is a simple number
2215-
* @result string Response is a simple string
2216-
* @result boolean Response is a simple boolean
2217-
* @result any Response is a simple object
2212+
* @returns number Response is a simple number
2213+
* @returns string Response is a simple string
2214+
* @returns boolean Response is a simple boolean
2215+
* @returns any Response is a simple object
22182216
* @throws ApiError
22192217
*/
22202218
public static async types(
@@ -2313,7 +2311,6 @@ type Config = {
23132311
TOKEN?: string | Resolver<string>;
23142312
USERNAME?: string | Resolver<string>;
23152313
PASSWORD?: string | Resolver<string>;
2316-
DOMAIN?: string | Resolver<string>;
23172314
HEADERS?: Headers | Resolver<Headers>;
23182315
}
23192316

@@ -2324,7 +2321,6 @@ export const OpenAPI: Config = {
23242321
TOKEN: undefined,
23252322
USERNAME: undefined,
23262323
PASSWORD: undefined,
2327-
DOMAIN: undefined,
23282324
HEADERS: undefined,
23292325
};"
23302326
`;
@@ -2456,6 +2452,9 @@ async function sendRequest(options: ApiRequestOptions, url: string): Promise<Res
24562452
headers: await getHeaders(options),
24572453
body: getRequestBody(options),
24582454
};
2455+
if (OpenAPI.WITH_CREDENTIALS) {
2456+
request.credentials = 'include';
2457+
}
24592458
return await fetch(url, request);
24602459
}
24612460

@@ -2511,7 +2510,7 @@ function catchErrors(options: ApiRequestOptions, result: ApiResult): void {
25112510
/**
25122511
* Request using fetch client
25132512
* @param options The request options from the the service
2514-
* @result ApiResult
2513+
* @returns ApiResult
25152514
* @throws ApiError
25162515
*/
25172516
export async function request(options: ApiRequestOptions): Promise<ApiResult> {
@@ -2530,10 +2529,7 @@ export async function request(options: ApiRequestOptions): Promise<ApiResult> {
25302529

25312530
catchErrors(options, result);
25322531
return result;
2533-
}
2534-
2535-
2536-
"
2532+
}"
25372533
`;
25382534

25392535
exports[`v3 should generate: ./test/generated/v3/index.ts 1`] = `
@@ -4250,7 +4246,7 @@ export class ComplexService {
42504246
/**
42514247
* @param parameterObject Parameter containing object
42524248
* @param parameterReference Parameter containing reference
4253-
* @result ModelWithString Successful response
4249+
* @returns ModelWithString Successful response
42544250
* @throws ApiError
42554251
*/
42564252
public static async complexTypes(
@@ -4281,7 +4277,7 @@ export class ComplexService {
42814277
/**
42824278
* @param id
42834279
* @param requestBody
4284-
* @result ModelWithString Success
4280+
* @returns ModelWithString Success
42854281
* @throws ApiError
42864282
*/
42874283
public static async complexParams(
@@ -4484,7 +4480,7 @@ import { OpenAPI } from '../core/OpenAPI';
44844480
export class HeaderService {
44854481

44864482
/**
4487-
* @result string Successful response
4483+
* @returns string Successful response
44884484
* @throws ApiError
44894485
*/
44904486
public static async callWithResultFromHeader(): Promise<string> {
@@ -4513,7 +4509,7 @@ import { OpenAPI } from '../core/OpenAPI';
45134509
export class MultipartService {
45144510

45154511
/**
4516-
* @result any OK
4512+
* @returns any OK
45174513
* @throws ApiError
45184514
*/
45194515
public static async multipartResponse(): Promise<{
@@ -4705,7 +4701,7 @@ import { OpenAPI } from '../core/OpenAPI';
47054701
export class ResponseService {
47064702

47074703
/**
4708-
* @result ModelWithString
4704+
* @returns ModelWithString
47094705
* @throws ApiError
47104706
*/
47114707
public static async callWithResponse(): Promise<ModelWithString> {
@@ -4717,7 +4713,7 @@ export class ResponseService {
47174713
}
47184714

47194715
/**
4720-
* @result ModelWithString Message for default response
4716+
* @returns ModelWithString Message for default response
47214717
* @throws ApiError
47224718
*/
47234719
public static async callWithDuplicateResponses(): Promise<ModelWithString> {
@@ -4734,10 +4730,10 @@ export class ResponseService {
47344730
}
47354731

47364732
/**
4737-
* @result any Message for 200 response
4738-
* @result ModelWithString Message for default response
4739-
* @result ModelThatExtends Message for 201 response
4740-
* @result ModelThatExtendsExtends Message for 202 response
4733+
* @returns any Message for 200 response
4734+
* @returns ModelWithString Message for default response
4735+
* @returns ModelThatExtends Message for 201 response
4736+
* @returns ModelThatExtendsExtends Message for 202 response
47414737
* @throws ApiError
47424738
*/
47434739
public static async callWithResponses(): Promise<{
@@ -4867,10 +4863,10 @@ export class TypesService {
48674863
* @param parameterString This is a string parameter
48684864
* @param parameterBoolean This is a boolean parameter
48694865
* @param id This is a number parameter
4870-
* @result number Response is a simple number
4871-
* @result string Response is a simple string
4872-
* @result boolean Response is a simple boolean
4873-
* @result any Response is a simple object
4866+
* @returns number Response is a simple number
4867+
* @returns string Response is a simple string
4868+
* @returns boolean Response is a simple boolean
4869+
* @returns any Response is a simple object
48744870
* @throws ApiError
48754871
*/
48764872
public static async types(
@@ -4913,7 +4909,7 @@ export class UploadService {
49134909

49144910
/**
49154911
* @param file Supply a file reference for upload
4916-
* @result boolean
4912+
* @returns boolean
49174913
* @throws ApiError
49184914
*/
49194915
public static async uploadFile(

0 commit comments

Comments
 (0)