Skip to content

Commit b87d420

Browse files
authored
Merge pull request #66 from CyberSource/clean-up
Clean up
2 parents 210c3e2 + c2c9ae2 commit b87d420

File tree

2 files changed

+45
-187
lines changed

2 files changed

+45
-187
lines changed

generator/cybersource-csharp-template/ApiClient.mustache

Lines changed: 43 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -122,30 +122,7 @@ namespace {{packageName}}.Client
122122
Dictionary<String, FileParameter> fileParams, Dictionary<String, String> pathParams,
123123
String contentType)
124124
{
125-
var request = new RestRequest(path, method);
126-
{{#netStandard}}
127-
// disable ResetSharp.Portable built-in serialization
128-
request.Serializer = null;
129-
{{/netStandard}}
130-
131-
// add path parameter, if any
132-
foreach(var param in pathParams)
133-
request.AddParameter(param.Key, param.Value, ParameterType.UrlSegment);
134-
135-
// add header parameter, if any
136-
// 1. passed to this function
137-
foreach (var param in headerParams)
138-
{
139-
if (param.Key == "Authorization")
140-
{
141-
request.AddParameter("Authorization", string.Format("Bearer " + param.Value),
142-
ParameterType.HttpHeader);
143-
}
144-
else
145-
request.AddHeader(param.Key, param.Value);
146-
}
147-
148-
//2.set in the defaultHeaders of configuration
125+
//1.set in the defaultHeaders of configuration
149126
150127
// Change to path(Request Target) to be sent to Authentication SDK
151128
// Include Query Params in the Request target
@@ -165,6 +142,29 @@ namespace {{packageName}}.Client
165142
firstQueryParam = false;
166143
}
167144
}
145+
146+
var request = new RestRequest(path, method);
147+
{{#netStandard}}
148+
// disable ResetSharp.Portable built-in serialization
149+
request.Serializer = null;
150+
{{/netStandard}}
151+
152+
// add path parameter, if any
153+
foreach(var param in pathParams)
154+
request.AddParameter(param.Key, param.Value, ParameterType.UrlSegment);
155+
156+
// add header parameter, if any
157+
// 2. passed to this function
158+
foreach (var param in headerParams)
159+
{
160+
if (param.Key == "Authorization")
161+
{
162+
request.AddParameter("Authorization", string.Format("Bearer " + param.Value),
163+
ParameterType.HttpHeader);
164+
}
165+
else
166+
request.AddHeader(param.Key, param.Value);
167+
}
168168

169169
if (postBody == null)
170170
{
@@ -187,8 +187,8 @@ namespace {{packageName}}.Client
187187
}
188188

189189
// add query parameter, if any
190-
foreach(var param in queryParams)
191-
request.AddQueryParameter(param.Key, param.Value);
190+
// foreach(var param in queryParams)
191+
// request.AddQueryParameter(param.Key, param.Value);
192192

193193
// add form parameter, if any
194194
foreach(var param in formParams)
@@ -372,12 +372,26 @@ namespace {{packageName}}.Client
372372
/// <returns>Formatted string.</returns>
373373
public string ParameterToString(object obj)
374374
{
375-
if (obj is DateTime)
376-
// Return a formatted date string - Can be customized with Configuration.DateTimeFormat
375+
if (obj is DateTime) {
376+
string outDateTime = null;
377+
378+
if (((DateTime)obj).TimeOfDay.CompareTo(new TimeSpan(0, 0, 0)) == 0) {
379+
outDateTime = ((DateTime?)obj).Value.ToString("yyyy-MM-dd");
380+
}
381+
else
382+
{
383+
outDateTime = ((DateTime?)obj).Value.ToString("yyyy-MM-ddTHH:mm:ssZ");
384+
}
385+
386+
return outDateTime;
387+
388+
389+
// Return a formatted date string - Can be customized with Configuration.DateTimeFormat
377390
// Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o")
378391
// https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8
379392
// For example: 2009-06-15T13:45:30.0000000
380-
return ((DateTime)obj).ToString (Configuration.DateTimeFormat);
393+
// return ((DateTime)obj).ToString (Configuration.DateTimeFormat);
394+
}
381395
else if (obj is DateTimeOffset)
382396
// Return a formatted date string - Can be customized with Configuration.DateTimeFormat
383397
// Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o")

0 commit comments

Comments
 (0)