From 9ea718cc8eb850845742b9867b0527a5121de22d Mon Sep 17 00:00:00 2001 From: Jorge Leandro Perez Date: Mon, 23 Feb 2015 15:30:51 -0300 Subject: [PATCH 1/5] WPComOAuthController: Adds missing copy --- WordPressApi/WPComOAuthController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPressApi/WPComOAuthController.m b/WordPressApi/WPComOAuthController.m index a669739..3824240 100644 --- a/WordPressApi/WPComOAuthController.m +++ b/WordPressApi/WPComOAuthController.m @@ -74,7 +74,7 @@ - (void)setSecret:(NSString *)secret { } - (void)setCompletionBlock:(void (^)(NSString *token, NSString *blogId, NSString *blogUrl, NSString *scope, NSError *error))completionBlock { - _completionBlock = completionBlock; + _completionBlock = [completionBlock copy]; } #pragma mark - View lifecycle From 6c17419fd4746d54e7a5d416e6b5a242087a246c Mon Sep 17 00:00:00 2001 From: Jorge Leandro Perez Date: Mon, 23 Feb 2015 15:31:09 -0300 Subject: [PATCH 2/5] WPComOAuthController: One line per ivar please --- WordPressApi/WPComOAuthController.m | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/WordPressApi/WPComOAuthController.m b/WordPressApi/WPComOAuthController.m index 3824240..2a97c69 100644 --- a/WordPressApi/WPComOAuthController.m +++ b/WordPressApi/WPComOAuthController.m @@ -19,8 +19,13 @@ @interface WPComOAuthController () @end @implementation WPComOAuthController { - NSString *_clientId, *_redirectUrl, *_scope, *_blogId, *_secret; - NSString *_username, *_password; + NSString *_clientId; + NSString *_redirectUrl; + NSString *_scope; + NSString *_blogId; + NSString *_secret; + NSString *_username; + NSString *_password; BOOL _isSSO; void (^_completionBlock)(NSString *token, NSString *blogId, NSString *blogUrl, NSString *scope, NSError *error); } From 227159756a6f856c585ff1c320338ca740a9b697 Mon Sep 17 00:00:00 2001 From: Jorge Leandro Perez Date: Mon, 23 Feb 2015 15:31:32 -0300 Subject: [PATCH 3/5] WPComOAuthController: Adds authToken field --- WordPressApi/WPComOAuthController.h | 1 + WordPressApi/WPComOAuthController.m | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/WordPressApi/WPComOAuthController.h b/WordPressApi/WPComOAuthController.h index dd23433..b45294a 100644 --- a/WordPressApi/WPComOAuthController.h +++ b/WordPressApi/WPComOAuthController.h @@ -11,6 +11,7 @@ typedef NS_ENUM(NSUInteger, WPComOAuthErrorCode) { - (void)setWordPressComUsername:(NSString *)username; - (void)setWordPressComPassword:(NSString *)password; +- (void)setWordPressComAuthToken:(NSString *)authToken; - (void)setClient:(NSString *)client; - (void)setRedirectUrl:(NSString *)redirectUrl; diff --git a/WordPressApi/WPComOAuthController.m b/WordPressApi/WPComOAuthController.m index 2a97c69..b034d46 100644 --- a/WordPressApi/WPComOAuthController.m +++ b/WordPressApi/WPComOAuthController.m @@ -26,6 +26,7 @@ @implementation WPComOAuthController { NSString *_secret; NSString *_username; NSString *_password; + NSString *_authToken; BOOL _isSSO; void (^_completionBlock)(NSString *token, NSString *blogId, NSString *blogUrl, NSString *scope, NSError *error); } @@ -66,6 +67,10 @@ - (void)setWordPressComPassword:(NSString *)password { _password = password; } +- (void)setWordPressComAuthToken:(NSString *)authToken { + _authToken = authToken; +} + - (void)setClient:(NSString *)client { _clientId = client; } @@ -133,6 +138,9 @@ - (void)viewDidAppear:(BOOL)animated { [request setHTTPBody:[request_body dataUsingEncoding:NSUTF8StringEncoding]]; [request setValue:[NSString stringWithFormat:@"%lu", (unsigned long)[request_body length]] forHTTPHeaderField:@"Content-Length"]; [request addValue:@"*/*" forHTTPHeaderField:@"Accept"]; + if (_authToken) { + [request addValue:[NSString stringWithFormat:@"Bearer %@", _authToken] forHTTPHeaderField:@"Authorization"]; + } [request setHTTPMethod:@"POST"]; } [self.webView loadRequest:request]; @@ -283,6 +291,7 @@ - (BOOL)handleOpenURL:(NSURL *)URL { WPComOAuthController *ssoController = [[WPComOAuthController alloc] initForSSO]; [ssoController setWordPressComUsername:_username]; [ssoController setWordPressComPassword:_password]; + [ssoController setWordPressComAuthToken:_authToken]; [ssoController setClient:clientId]; [ssoController setRedirectUrl:redirectUrl]; [ssoController present]; From 30cf530f892f867e49e0deb5032de185998ed45d Mon Sep 17 00:00:00 2001 From: Jorge Leandro Perez Date: Mon, 23 Feb 2015 15:32:12 -0300 Subject: [PATCH 4/5] Updates WordPressApiExample project flags --- .../WordPressApiExample.xcodeproj/project.pbxproj | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/WordPressApiExample/WordPressApiExample.xcodeproj/project.pbxproj b/WordPressApiExample/WordPressApiExample.xcodeproj/project.pbxproj index 31bcd08..6cd75ef 100644 --- a/WordPressApiExample/WordPressApiExample.xcodeproj/project.pbxproj +++ b/WordPressApiExample/WordPressApiExample.xcodeproj/project.pbxproj @@ -238,7 +238,7 @@ E1F753CA14A094F400DB35A3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0510; + LastUpgradeCheck = 0610; ORGANIZATIONNAME = Automattic; }; buildConfigurationList = E1F753CD14A094F400DB35A3 /* Build configuration list for PBXProject "WordPressApiExample" */; @@ -345,9 +345,11 @@ CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -379,9 +381,11 @@ CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; From 86753546e9b371938b8b67f52564c4688e49875b Mon Sep 17 00:00:00 2001 From: Jorge Leandro Perez Date: Mon, 23 Feb 2015 15:46:09 -0300 Subject: [PATCH 5/5] Updates Podspec --- WordPressApi.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPressApi.podspec b/WordPressApi.podspec index 6e25430..6057a58 100644 --- a/WordPressApi.podspec +++ b/WordPressApi.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressApi" - s.version = "0.3.1" + s.version = "0.3.2" s.summary = "A simple Objective-C client to publish posts on the WordPress platform" s.homepage = "https://github.com/wordpress-mobile/WordPressApi" s.license = { :type => 'MIT', :file => 'LICENSE.md' }