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

Merge pull request #2369 from wing328/csharp_http_basic

Browse Source 
[C#] fix base64encode issue in csharp
This commit is contained in:
wing328 2016-03-13 13:24:59 +08:00
commit 4a53db839d
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/swagger-codegen/src/main/resources/csharp/api.mustache
View File

@ -228,7 +228,7 @@ namespace {{packageName}}.Api
// http basic authentication required // http basic authentication required
if (!String.IsNullOrEmpty(Configuration.Username) || !String.IsNullOrEmpty(Configuration.Password)) if (!String.IsNullOrEmpty(Configuration.Username) || !String.IsNullOrEmpty(Configuration.Password))
{ {
localVarHeaderParams["Authorization"] = "Basic " + Base64Encode(Configuration.Username + ":" + Configuration.Password); localVarHeaderParams["Authorization"] = "Basic " + ApiClient.Base64Encode(Configuration.Username + ":" + Configuration.Password);
}{{/isBasic}}{{#isOAuth}} }{{/isBasic}}{{#isOAuth}}
// oauth required // oauth required
if (!String.IsNullOrEmpty(Configuration.AccessToken)) if (!String.IsNullOrEmpty(Configuration.AccessToken))
@ -340,7 +340,7 @@ namespace {{packageName}}.Api
// http basic authentication required // http basic authentication required
if (!String.IsNullOrEmpty(Configuration.Username) || !String.IsNullOrEmpty(Configuration.Password)) if (!String.IsNullOrEmpty(Configuration.Username) || !String.IsNullOrEmpty(Configuration.Password))
{ {
localVarHeaderParams["Authorization"] = "Basic " + Base64Encode(Configuration.Username + ":" + Configuration.Password); localVarHeaderParams["Authorization"] = "Basic " + ApiClient.Base64Encode(Configuration.Username + ":" + Configuration.Password);
}{{/isBasic}}{{#isOAuth}} }{{/isBasic}}{{#isOAuth}}
// oauth required // oauth required
if (!String.IsNullOrEmpty(Configuration.AccessToken)) if (!String.IsNullOrEmpty(Configuration.AccessToken))

10
modules/swagger-codegen/src/test/resources/2_0/petstore.json
View File

@ -1091,7 +1091,12 @@
"400": { "400": {
"description": "Invalid username supplied" "description": "Invalid username supplied"
} }
} },
"security": [
{
"test_http_basic": []
}
]
} }
} }
}, },
@ -1129,6 +1134,9 @@
"type": "apiKey", "type": "apiKey",
"name": "test_api_key_query", "name": "test_api_key_query",
"in": "query" "in": "query"
},
"test_http_basic": {
"type": "basic"
} }
}, },
"definitions": { "definitions": {

15
samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs
View File

@ -1001,6 +1001,13 @@ namespace IO.Swagger.Api
// authentication (test_http_basic) required
// http basic authentication required
if (!String.IsNullOrEmpty(Configuration.Username) || !String.IsNullOrEmpty(Configuration.Password))
{
localVarHeaderParams["Authorization"] = "Basic " + ApiClient.Base64Encode(Configuration.Username + ":" + Configuration.Password);
}
// make the HTTP request // make the HTTP request
@ -1080,6 +1087,14 @@ namespace IO.Swagger.Api
// authentication (test_http_basic) required
// http basic authentication required
if (!String.IsNullOrEmpty(Configuration.Username) || !String.IsNullOrEmpty(Configuration.Password))
{
localVarHeaderParams["Authorization"] = "Basic " + ApiClient.Base64Encode(Configuration.Username + ":" + Configuration.Password);
}
// make the HTTP request // make the HTTP request
IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath,