Skip to content

Fix deserialization of paths and query params for servers #370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 2, 2021
Merged

Fix deserialization of paths and query params for servers #370

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 40 additions & 9 deletions ...a/software/amazon/smithy/typescript/codegen/integration/HttpBindingProtocolGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1683,10 +1683,25 @@ private void readDirectQueryBindings(GenerationContext context, List<HttpBinding
TypeScriptWriter writer = context.getWriter();
for (HttpBinding binding : directQueryBindings) {
String memberName = context.getSymbolProvider().toMemberName(binding.getMember());
writer.openBlock("if (query['$L'] !== undefined) {", "}", binding.getLocationName(), () -> {
writer.openBlock("if (query[$S] !== undefined) {", "}", binding.getLocationName(), () -> {
Shape target = context.getModel().expectShape(binding.getMember().getTarget());
String queryValue = getOutputValue(context, binding.getLocation(),
"query['" + binding.getLocationName() + "'] as string",
if (target instanceof CollectionShape) {
writer.write("const decoded = Array.isArray(query[$1S]) ? (query[$1S] as string[])"
+ ".map(e => decodeURIComponent(e)) : [decodeURIComponent(query[$1S] as string)];",
binding.getLocationName());
} else {
writer.addImport("SerializationException",
"__SerializationException",
"@aws-smithy/server-common");
writer.openBlock("if (Array.isArray(query[$1S])) {", "}",
binding.getLocationName(),
() -> {
writer.write("throw new __SerializationException();");
});
writer.write("const decoded = decodeURIComponent(query[$1S] as string);",
binding.getLocationName());
}
String queryValue = getOutputValue(context, binding.getLocation(), "decoded",
binding.getMember(), target);
writer.write("contents.$L = $L;", memberName, queryValue);
});
Expand All @@ -1703,10 +1718,23 @@ private void readMappedQueryBindings(GenerationContext context, HttpBinding mapp
valueType = "string[]";
}
writer.write("let parsedQuery: { [key: string]: $L } = {}", valueType);
String parsedValue = getOutputValue(context, mappedBinding.getLocation(), "value as string",
target.getValue(), valueShape);
String parsedValue = getOutputValue(context, mappedBinding.getLocation(),
"decoded", target.getValue(), valueShape);
writer.openBlock("for (const [key, value] of Object.entries(query)) {", "}", () -> {
writer.write("parsedQuery[key] = $L;", parsedValue);
if (valueShape instanceof CollectionShape) {
writer.write("const decoded = Array.isArray(value) ? (value as string[])"
+ ".map(e => decodeURIComponent(e)) : [decodeURIComponent(value as string)];");
} else {
writer.addImport("SerializationException",
"__SerializationException",
"@aws-smithy/server-common");
writer.openBlock("if (Array.isArray(value)) {", "}",
() -> {
writer.write("throw new __SerializationException();");
});
writer.write("const decoded = decodeURIComponent(value as string);");
}
writer.write("parsedQuery[decodeURIComponent(key)] = $L;", parsedValue);
});
String memberName = context.getSymbolProvider().toMemberName(mappedBinding.getMember());
writer.write("contents.$L = parsedQuery;", memberName);
Expand Down Expand Up @@ -1745,8 +1773,11 @@ private void readPath(
for (HttpBinding binding : pathBindings) {
Shape target = context.getModel().expectShape(binding.getMember().getTarget());
String memberName = context.getSymbolProvider().toMemberName(binding.getMember());
// since this is in the path, we should decode early
String dataSource = String.format("decodeURIComponent(parsedPath.groups.%s)",
binding.getLocationName());
String labelValue = getOutputValue(context, binding.getLocation(),
"parsedPath.groups." + binding.getLocationName(), binding.getMember(), target);
dataSource, binding.getMember(), target);
writer.write("contents.$L = $L;", memberName, labelValue);
}
});
Expand Down Expand Up @@ -2522,11 +2553,11 @@ private String getCollectionOutputParam(
switch (bindingType) {
case QUERY_PARAMS:
case QUERY:
return String.format("(Array.isArray(%1$s) ? (%1$s[]) : [%1$s]).map(_entry => %2$s)",
return String.format("%1$s.map(_entry => %2$s)",
dataSource, collectionTargetValue);
case LABEL:
dataSource = "(" + dataSource + " || \"\")";
// Split these values on commas.
// Split these values on slashes.
outputParam = "" + dataSource + ".split('/')";

// Iterate over each entry and do deser work.
Expand Down