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

Fix issue in Configuration-body.mustache in objc client

Browse Source
This commit is contained in:
geekerzp 2015-08-07 18:31:07 +08:00
parent 29e8a8f573
commit 732a9eb64d
2 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
modules/swagger-codegen/src/main/resources/objc/Configuration-body.mustache
View File

@ -54,7 +54,7 @@
NSString *basicAuthCredentials = [NSString stringWithFormat:@"%@:%@", self.username, self.password]; NSString *basicAuthCredentials = [NSString stringWithFormat:@"%@:%@", self.username, self.password];
NSData *data = [basicAuthCredentials dataUsingEncoding:NSUTF8StringEncoding]; NSData *data = [basicAuthCredentials dataUsingEncoding:NSUTF8StringEncoding];
basicAuthCredentials = [NSString stringWithFormat:@"Basic %@", [data base64EncodedStringWithOptions:0]]; basicAuthCredentials = [NSString stringWithFormat:@"Basic %@", [data base64EncodedStringWithOptions:0]];
return basicAuthCredentials; return basicAuthCredentials;
} }
@ -81,7 +81,7 @@
if ([self.loggingFileHanlder isKindOfClass:[NSFileHandle class]]) { if ([self.loggingFileHanlder isKindOfClass:[NSFileHandle class]]) {
[self.loggingFileHanlder closeFile]; [self.loggingFileHanlder closeFile];
} }
_loggingFile = loggingFile; _loggingFile = loggingFile;
_loggingFileHanlder = [NSFileHandle fileHandleForWritingAtPath:_loggingFile]; _loggingFileHanlder = [NSFileHandle fileHandleForWritingAtPath:_loggingFile];
if (_loggingFileHanlder == nil) { if (_loggingFileHanlder == nil) {
@ -103,15 +103,28 @@
#pragma mark - #pragma mark -
- (NSDictionary *) authSettings { - (NSDictionary *) authSettings {
return @{ return @{
@"api_key": @{ {{#authMethods}}
@"type": @"api_key", {{#isApiKey}}
@"in": @"header", @"{{name}}":
@"key": @"api_key", @{
@"value": [self getApiKeyWithPrefix:@"api_key"] @"type": @"api_key",
}, @"in": {{#isKeyInHeader}}@"header"{{/isKeyInHeader}}{{#isKeyInQuery}}@"query"{{/isKeyInQuery}},
@"key": @"{{keyParamName}}",
}; @"value": [self getApiKeyWithPrefix:@"{{keyParamName}}"]
},
{{/isApiKey}}
{{#isBasic}}
@"{{name}}":
@{
@"type": @"basic",
@"in": @"header",
@"key": @"Authorization",
@"value": [self getBasicAuthToken]
},
{{/isBasic}}
{{/authMethods}}
};
} }
@end @end

22
samples/client/petstore/objc/SwaggerClient/SWGConfiguration.m
View File

@ -54,7 +54,7 @@
NSString *basicAuthCredentials = [NSString stringWithFormat:@"%@:%@", self.username, self.password]; NSString *basicAuthCredentials = [NSString stringWithFormat:@"%@:%@", self.username, self.password];
NSData *data = [basicAuthCredentials dataUsingEncoding:NSUTF8StringEncoding]; NSData *data = [basicAuthCredentials dataUsingEncoding:NSUTF8StringEncoding];
basicAuthCredentials = [NSString stringWithFormat:@"Basic %@", [data base64EncodedStringWithOptions:0]]; basicAuthCredentials = [NSString stringWithFormat:@"Basic %@", [data base64EncodedStringWithOptions:0]];
return basicAuthCredentials; return basicAuthCredentials;
} }
@ -81,7 +81,7 @@
if ([self.loggingFileHanlder isKindOfClass:[NSFileHandle class]]) { if ([self.loggingFileHanlder isKindOfClass:[NSFileHandle class]]) {
[self.loggingFileHanlder closeFile]; [self.loggingFileHanlder closeFile];
} }
_loggingFile = loggingFile; _loggingFile = loggingFile;
_loggingFileHanlder = [NSFileHandle fileHandleForWritingAtPath:_loggingFile]; _loggingFileHanlder = [NSFileHandle fileHandleForWritingAtPath:_loggingFile];
if (_loggingFileHanlder == nil) { if (_loggingFileHanlder == nil) {
@ -103,15 +103,15 @@
#pragma mark - #pragma mark -
- (NSDictionary *) authSettings { - (NSDictionary *) authSettings {
return @{ return @{
@"api_key": @{ @"api_key":
@"type": @"api_key", @{
@"in": @"header", @"type": @"api_key",
@"key": @"api_key", @"in": @"header",
@"value": [self getApiKeyWithPrefix:@"api_key"] @"key": @"api_key",
}, @"value": [self getApiKeyWithPrefix:@"api_key"]
},
}; };
} }
@end @end