restrcutured logic

TykTechnologies · Jun 20, 2023 · aa571ed · aa571ed
1 parent 6093c54
commit aa571ed
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/pkg/engine/datasource/rest_datasource/rest_datasource.go b/pkg/engine/datasource/rest_datasource/rest_datasource.go
@@ -167,11 +167,10 @@ Next:
 				typeRef := p.v.Operation.VariableDefinitions[variableDefRef].Type
 				typeName := p.v.Operation.TypeNameString(typeRef)
 				typeKind := p.v.Operation.Types[typeRef].TypeKind
-				query[i].rawMessage = []byte(`"` + query[i].Value + `"`)
-				// if the type is not a nullable or non-nullable string, leave the rawMessage with quotes
-				if typeKind == ast.TypeKindList ||
-					(typeName != "" && typeName != typeString) ||
-					(typeKind == ast.TypeKindNonNull && p.v.Operation.TypeNameString(p.v.Operation.Types[typeRef].OfType) != typeString) {
+				// if type is a nullable or non nullable string, add quotes to the raw messasge
+				if typeName == typeString || (typeKind == ast.TypeKindNonNull && p.v.Operation.TypeNameString(p.v.Operation.Types[typeRef].OfType) == typeString) {
+					query[i].rawMessage = []byte(`"` + query[i].Value + `"`)
+				} else {
 					query[i].rawMessage = []byte(query[i].Value)
 				}