forked from loafle/openapi-generator-original
Merge pull request #620 from geekerzp/develop_2.0_objc_content_type
Fixed request content-type in objc client
This commit is contained in:
commit
54a5ecb101
@ -314,7 +314,7 @@ static bool loggingEnabled = true;
|
|||||||
NSString * urlString = [[NSURL URLWithString:path relativeToURL:self.baseURL] absoluteString];
|
NSString * urlString = [[NSURL URLWithString:path relativeToURL:self.baseURL] absoluteString];
|
||||||
|
|
||||||
// request with multipart form
|
// request with multipart form
|
||||||
if(file != nil) {
|
if([requestContentType isEqualToString:@"multipart/form-data"]) {
|
||||||
request = [self.requestSerializer multipartFormRequestWithMethod: @"POST"
|
request = [self.requestSerializer multipartFormRequestWithMethod: @"POST"
|
||||||
URLString: urlString
|
URLString: urlString
|
||||||
parameters: nil
|
parameters: nil
|
||||||
@ -325,15 +325,17 @@ static bool loggingEnabled = true;
|
|||||||
[formData appendPartWithFormData: data name: key];
|
[formData appendPartWithFormData: data name: key];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (file) {
|
||||||
[formData appendPartWithFileData: [file data]
|
[formData appendPartWithFileData: [file data]
|
||||||
name: [file paramName]
|
name: [file paramName]
|
||||||
fileName: [file name]
|
fileName: [file name]
|
||||||
mimeType: [file mimeType]];
|
mimeType: [file mimeType]];
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
error:nil];
|
error:nil];
|
||||||
}
|
}
|
||||||
// request with form parameters
|
// request with form parameters or json
|
||||||
else {
|
else {
|
||||||
NSString* pathWithQueryParams = [self pathWithQueryParamsToString:path queryParams:queryParams];
|
NSString* pathWithQueryParams = [self pathWithQueryParamsToString:path queryParams:queryParams];
|
||||||
NSString* urlString = [[NSURL URLWithString:pathWithQueryParams relativeToURL:self.baseURL] absoluteString];
|
NSString* urlString = [[NSURL URLWithString:pathWithQueryParams relativeToURL:self.baseURL] absoluteString];
|
||||||
@ -470,7 +472,7 @@ static bool loggingEnabled = true;
|
|||||||
NSString * urlString = [[NSURL URLWithString:path relativeToURL:self.baseURL] absoluteString];
|
NSString * urlString = [[NSURL URLWithString:path relativeToURL:self.baseURL] absoluteString];
|
||||||
|
|
||||||
// request with multipart form
|
// request with multipart form
|
||||||
if(file != nil) {
|
if([requestContentType isEqualToString:@"multipart/form-data"]) {
|
||||||
request = [self.requestSerializer multipartFormRequestWithMethod: @"POST"
|
request = [self.requestSerializer multipartFormRequestWithMethod: @"POST"
|
||||||
URLString: urlString
|
URLString: urlString
|
||||||
parameters: nil
|
parameters: nil
|
||||||
@ -481,15 +483,17 @@ static bool loggingEnabled = true;
|
|||||||
[formData appendPartWithFormData: data name: key];
|
[formData appendPartWithFormData: data name: key];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (file) {
|
||||||
[formData appendPartWithFileData: [file data]
|
[formData appendPartWithFileData: [file data]
|
||||||
name: [file paramName]
|
name: [file paramName]
|
||||||
fileName: [file name]
|
fileName: [file name]
|
||||||
mimeType: [file mimeType]];
|
mimeType: [file mimeType]];
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
error:nil];
|
error:nil];
|
||||||
}
|
}
|
||||||
// request with form parameters
|
// request with form parameters or json
|
||||||
else {
|
else {
|
||||||
NSString* pathWithQueryParams = [self pathWithQueryParamsToString:path queryParams:queryParams];
|
NSString* pathWithQueryParams = [self pathWithQueryParamsToString:path queryParams:queryParams];
|
||||||
NSString* urlString = [[NSURL URLWithString:pathWithQueryParams relativeToURL:self.baseURL] absoluteString];
|
NSString* urlString = [[NSURL URLWithString:pathWithQueryParams relativeToURL:self.baseURL] absoluteString];
|
||||||
@ -576,3 +580,11 @@ static bool loggingEnabled = true;
|
|||||||
}
|
}
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user