loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

better auth for C#, format change

Browse Source
This commit is contained in:
wing328 2015-11-20 15:54:42 +08:00 committed by Alvin Zeng
parent 6712754f6a
commit d5b80ac8cd
3 changed files with 62 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
View File

@ -198,10 +198,12 @@ namespace {{packageName}}.Client
{ {
if (obj is DateTime) if (obj is DateTime)
return ((DateTime)obj).ToString ("u"); return ((DateTime)obj).ToString ("u");
else if (obj is IList) { else if (obj is IList)
{
string flattenString = ""; string flattenString = "";
string separator = ","; string separator = ",";
foreach (var param in (IList)obj) { foreach (var param in (IList)obj)
{
flattenString += param.ToString() + separator; flattenString += param.ToString() + separator;
} }
return flattenString.Remove(flattenString.Length - 1);; return flattenString.Remove(flattenString.Length - 1);;
@ -318,11 +320,29 @@ namespace {{packageName}}.Client
{ {
{{#authMethods}} {{#authMethods}}
case "{{name}}": case "{{name}}":
{{#isApiKey}}{{#isKeyInHeader}}headerParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInHeader}}{{#isKeyInQuery}}queryParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}headerParams["Authorization"] = "Basic " + Base64Encode(Configuration.Username + ":" + Configuration.Password);{{/isBasic}}{{#isOAuth}}headerParams["Authorization"] = "Bearer " + Configuration.AccessToken;{{/isOAuth}} {{#isApiKey}}{{#isKeyInHeader}}
var apiKeyValue = GetApiKeyWithPrefix("{{keyParamName}}");
if (!String.IsNullOrEmpty(apiKeyValue))
{
headerParams["{{keyParamName}}"] = apiKeyValue;
}{{/isKeyInHeader}}{{#isKeyInQuery}}
var apiKeyValue = GetApiKeyWithPrefix("{{keyParamName}}");
if (!String.IsNullOrEmpty(apiKeyValue))
{
queryParams["{{keyParamName}}"] = apiKeyValue;
}{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}
if (!String.IsNullOrEmpty(Configuration.Username) && !String.IsNullOrEmpty(Configuration.Password))
{
headerParams["Authorization"] = "Basic " + Base64Encode(Configuration.Username + ":" + Configuration.Password);
}{{/isBasic}}{{#isOAuth}}
if (!String.IsNullOrEmpty(Configuration.AccessToken))
{
headerParams["Authorization"] = "Bearer " + Configuration.AccessToken;
}{{/isOAuth}}
break; break;
{{/authMethods}} {{/authMethods}}
default: default:
//TODO show warning about security definition not found //show warning about security definition not found
break; break;
} }
} }
@ -335,11 +355,14 @@ namespace {{packageName}}.Client
/// </summary> /// </summary>
/// <param name="accepts">The accepts array to select from.</param> /// <param name="accepts">The accepts array to select from.</param>
/// <returns>The Accept header to use.</returns> /// <returns>The Accept header to use.</returns>
public String SelectHeaderAccept(String[] accepts) { public String SelectHeaderAccept(String[] accepts)
{
if (accepts.Length == 0) if (accepts.Length == 0)
return null; return null;
if (accepts.Contains("application/json", StringComparer.OrdinalIgnoreCase)) if (accepts.Contains("application/json", StringComparer.OrdinalIgnoreCase))
return "application/json"; return "application/json";
return String.Join(",", accepts); return String.Join(",", accepts);
} }
@ -350,8 +373,7 @@ namespace {{packageName}}.Client
/// <returns>Encoded string.</returns> /// <returns>Encoded string.</returns>
public static string Base64Encode(string text) public static string Base64Encode(string text)
{ {
var textByte = System.Text.Encoding.UTF8.GetBytes(text); return System.Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(text));
return System.Convert.ToBase64String(textByte);
} }
/// <summary> /// <summary>
@ -361,7 +383,8 @@ namespace {{packageName}}.Client
/// <param name="source">Object to be casted</param> /// <param name="source">Object to be casted</param>
/// <param name="dest">Target type</param> /// <param name="dest">Target type</param>
/// <returns>Casted object</returns> /// <returns>Casted object</returns>
public static dynamic ConvertType(dynamic source, Type dest) { public static dynamic ConvertType(dynamic source, Type dest)
{
return Convert.ChangeType(source, dest); return Convert.ChangeType(source, dest);
} }

30
samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs
View File

@ -198,10 +198,12 @@ namespace IO.Swagger.Client
{ {
if (obj is DateTime) if (obj is DateTime)
return ((DateTime)obj).ToString ("u"); return ((DateTime)obj).ToString ("u");
else if (obj is IList) { else if (obj is IList)
{
string flattenString = ""; string flattenString = "";
string separator = ","; string separator = ",";
foreach (var param in (IList)obj) { foreach (var param in (IList)obj)
{
flattenString += param.ToString() + separator; flattenString += param.ToString() + separator;
} }
return flattenString.Remove(flattenString.Length - 1);; return flattenString.Remove(flattenString.Length - 1);;
@ -318,15 +320,24 @@ namespace IO.Swagger.Client
{ {
case "api_key": case "api_key":
headerParams["api_key"] = GetApiKeyWithPrefix("api_key");
var apiKeyValue = GetApiKeyWithPrefix("api_key");
if (!String.IsNullOrEmpty(apiKeyValue))
{
headerParams["api_key"] = apiKeyValue;
}
break; break;
case "petstore_auth": case "petstore_auth":
if (!String.IsNullOrEmpty(Configuration.AccessToken))
{
headerParams["Authorization"] = "Bearer " + Configuration.AccessToken; headerParams["Authorization"] = "Bearer " + Configuration.AccessToken;
}
break; break;
default: default:
//TODO show warning about security definition not found //show warning about security definition not found
break; break;
} }
} }
@ -339,11 +350,14 @@ namespace IO.Swagger.Client
/// </summary> /// </summary>
/// <param name="accepts">The accepts array to select from.</param> /// <param name="accepts">The accepts array to select from.</param>
/// <returns>The Accept header to use.</returns> /// <returns>The Accept header to use.</returns>
public String SelectHeaderAccept(String[] accepts) { public String SelectHeaderAccept(String[] accepts)
{
if (accepts.Length == 0) if (accepts.Length == 0)
return null; return null;
if (accepts.Contains("application/json", StringComparer.OrdinalIgnoreCase)) if (accepts.Contains("application/json", StringComparer.OrdinalIgnoreCase))
return "application/json"; return "application/json";
return String.Join(",", accepts); return String.Join(",", accepts);
} }
@ -354,8 +368,7 @@ namespace IO.Swagger.Client
/// <returns>Encoded string.</returns> /// <returns>Encoded string.</returns>
public static string Base64Encode(string text) public static string Base64Encode(string text)
{ {
var textByte = System.Text.Encoding.UTF8.GetBytes(text); return System.Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(text));
return System.Convert.ToBase64String(textByte);
} }
/// <summary> /// <summary>
@ -365,7 +378,8 @@ namespace IO.Swagger.Client
/// <param name="source">Object to be casted</param> /// <param name="source">Object to be casted</param>
/// <param name="dest">Target type</param> /// <param name="dest">Target type</param>
/// <returns>Casted object</returns> /// <returns>Casted object</returns>
public static dynamic ConvertType(dynamic source, Type dest) { public static dynamic ConvertType(dynamic source, Type dest)
{
return Convert.ChangeType(source, dest); return Convert.ChangeType(source, dest);
} }

10
samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.csproj.FilesWrittenAbsolute.txt
View File

@ -1,6 +1,12 @@
/Users/williamcheng/Code/csharp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttribute.cs
/Users/williamcheng/Code/csharp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb
/Users/williamcheng/Code/csharp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll
/Users/williamcheng/Code/csharp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll
/Users/williamcheng/Code/csharp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb
/Users/williamcheng/Code/csharp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/Newtonsoft.Json.dll
/Users/williamcheng/Code/csharp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/nunit.framework.dll
/Users/williamcheng/Code/csharp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/RestSharp.dll
/Users/williamcheng/Code/wing328/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttribute.cs /Users/williamcheng/Code/wing328/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttribute.cs
/Users/williamcheng/Code/wing328/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb
/Users/williamcheng/Code/wing328/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll
/Users/williamcheng/Code/wing328/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll /Users/williamcheng/Code/wing328/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll
/Users/williamcheng/Code/wing328/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb /Users/williamcheng/Code/wing328/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb
/Users/williamcheng/Code/wing328/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/Newtonsoft.Json.dll /Users/williamcheng/Code/wing328/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/Newtonsoft.Json.dll