Redocly/redoc
1
1
Fork 0
mirror of https://github.com/Redocly/redoc.git synced 2025-05-03 15:13:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: incorrect serialization of parameter sample with hypen

Browse Source
This commit is contained in:
Roman Hotsiy 2019-07-29 18:22:24 +03:00
parent 299a59faad
commit f7dd658a01
No known key found for this signature in database
GPG Key ID: 5CB7B3ACABA57CB0
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/utils/openapi.ts
View File

@ -163,11 +163,20 @@ function deepObjectEncodeField(fieldVal: any, fieldName: string): string {
} }
} }
// URI.Template doesn't support names with hypen, while OpenAPI allow
function escapeURITemplateName(template: string): string {
return template.replace(/-/g, '%2D');
}
function unescapeURITemplateName(template: string): string {
return template.replace(/%2D/g, '-');
}
function serializeFormValue(name: string, explode: boolean, value: any) { function serializeFormValue(name: string, explode: boolean, value: any) {
name = escapeURITemplateName(name);
const suffix = explode ? '*' : ''; const suffix = explode ? '*' : '';
const template = new URI.Template(`{?${name}${suffix}}`); const template = new URI.Template(`{?${name}${suffix}}`);
return unescapeURITemplateName(template.expand({ [name]: value }).substring(1));
return template.expand({ [name]: value }).substring(1);
} }
/* /*
@ -188,7 +197,6 @@ export function urlFormEncodePayload(
switch (style) { switch (style) {
case 'form': case 'form':
return serializeFormValue(fieldName, explode, fieldVal); return serializeFormValue(fieldName, explode, fieldVal);
break;
case 'spaceDelimited': case 'spaceDelimited':
return delimitedEncodeField(fieldVal, fieldName, '%20'); return delimitedEncodeField(fieldVal, fieldName, '%20');
case 'pipeDelimited': case 'pipeDelimited':
@ -211,6 +219,7 @@ function serializePathParameter(
explode: boolean, explode: boolean,
value: any, value: any,
): string { ): string {
name = escapeURITemplateName(name);
const suffix = explode ? '*' : ''; const suffix = explode ? '*' : '';
let prefix = ''; let prefix = '';
@ -222,7 +231,7 @@ function serializePathParameter(
const template = new URI.Template(`{${prefix}${name}${suffix}}`); const template = new URI.Template(`{${prefix}${name}${suffix}}`);
return template.expand({ [name]: value }); return unescapeURITemplateName(template.expand({ [name]: value }));
} }
function serializeQueryParameter( function serializeQueryParameter(
@ -273,12 +282,13 @@ function serializeHeaderParameter(
explode: boolean, explode: boolean,
value: any, value: any,
): string { ): string {
name = escapeURITemplateName(name);
switch (style) { switch (style) {
case 'simple': case 'simple':
const suffix = explode ? '*' : ''; const suffix = explode ? '*' : '';
const template = new URI.Template(`{${name}${suffix}}`); const template = new URI.Template(`{${name}${suffix}}`);
return template.expand({ [name]: value }); return unescapeURITemplateName(template.expand({ [name]: value }));
default: default:
console.warn('Unexpected style for header: ' + style); console.warn('Unexpected style for header: ' + style);
return ''; return '';