From 55b822bd517d70ba326e80f6a4ab135d48b8b345 Mon Sep 17 00:00:00 2001 From: Giuseppe Nucifora Date: Wed, 28 Mar 2018 12:56:32 +0200 Subject: [PATCH] - remove refresh token retry --- Example/Podfile.lock | 4 +- .../Pods/Local Podspecs/PNObject.podspec.json | 4 +- Example/Pods/Manifest.lock | 4 +- PNObject.podspec | 2 +- .../PNObject+PNObjectDELETEConnection.m | 11 +- .../Classes/PNObject+PNObjectGETConnection.m | 34 +++--- .../Classes/PNObject+PNObjectPOSTConnection.m | 110 +++++++++++++----- 7 files changed, 102 insertions(+), 67 deletions(-) diff --git a/Example/Podfile.lock b/Example/Podfile.lock index cf0fc86..fbaa00c 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -38,7 +38,7 @@ PODS: - NSString-Helper (1.0.6) - nv-ios-http-status (0.0.1) - PEAR-FileManager-iOS (1.3.1) - - PNObject (2.4.2): + - PNObject (2.4.5): - AFNetworking - CodFis-Helper - DDDKeychainWrapper @@ -85,7 +85,7 @@ SPEC CHECKSUMS: NSString-Helper: 389265918b2a4c5b0d09f0e03c607e8e5e254dd7 nv-ios-http-status: b6c2b5fc8656cc19e0d3000dadce2080b99d0e2f PEAR-FileManager-iOS: 3bc403f68a53483f5629aa822f4649e40275c4d3 - PNObject: 332e958cd11c9083abce467b0b93c84405a5c065 + PNObject: e754ef3f56399808cdb48af39d610c8132f2effe PureLayout: 4d550abe49a94f24c2808b9b95db9131685fe4cd RZDataBinding: 6981e90ddaae2f5e02028323b1043f8c31013109 Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66 diff --git a/Example/Pods/Local Podspecs/PNObject.podspec.json b/Example/Pods/Local Podspecs/PNObject.podspec.json index 107af26..27d1405 100644 --- a/Example/Pods/Local Podspecs/PNObject.podspec.json +++ b/Example/Pods/Local Podspecs/PNObject.podspec.json @@ -1,6 +1,6 @@ { "name": "PNObject", - "version": "2.4.2", + "version": "2.4.5", "summary": "PNObject is a simple replica of the more complex ParseObject", "homepage": "https://github.com/giuseppenucifora/PNObject", "license": { @@ -12,7 +12,7 @@ }, "source": { "git": "https://github.com/giuseppenucifora/PNObject.git", - "tag": "2.4.2" + "tag": "2.4.5" }, "platforms": { "ios": "8.0" diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock index cf0fc86..fbaa00c 100644 --- a/Example/Pods/Manifest.lock +++ b/Example/Pods/Manifest.lock @@ -38,7 +38,7 @@ PODS: - NSString-Helper (1.0.6) - nv-ios-http-status (0.0.1) - PEAR-FileManager-iOS (1.3.1) - - PNObject (2.4.2): + - PNObject (2.4.5): - AFNetworking - CodFis-Helper - DDDKeychainWrapper @@ -85,7 +85,7 @@ SPEC CHECKSUMS: NSString-Helper: 389265918b2a4c5b0d09f0e03c607e8e5e254dd7 nv-ios-http-status: b6c2b5fc8656cc19e0d3000dadce2080b99d0e2f PEAR-FileManager-iOS: 3bc403f68a53483f5629aa822f4649e40275c4d3 - PNObject: 332e958cd11c9083abce467b0b93c84405a5c065 + PNObject: e754ef3f56399808cdb48af39d610c8132f2effe PureLayout: 4d550abe49a94f24c2808b9b95db9131685fe4cd RZDataBinding: 6981e90ddaae2f5e02028323b1043f8c31013109 Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66 diff --git a/PNObject.podspec b/PNObject.podspec index afd4d82..2d3c30a 100644 --- a/PNObject.podspec +++ b/PNObject.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'PNObject' -s.version = '2.4.4' +s.version = '2.4.5' s.summary = 'PNObject is a simple replica of the more complex ParseObject' diff --git a/PNObject/Classes/PNObject+PNObjectDELETEConnection.m b/PNObject/Classes/PNObject+PNObjectDELETEConnection.m index e7048f9..6fc796e 100644 --- a/PNObject/Classes/PNObject+PNObjectDELETEConnection.m +++ b/PNObject/Classes/PNObject+PNObjectDELETEConnection.m @@ -61,21 +61,14 @@ } } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { if (retries > 0) { - [[PNObjectConfig sharedInstance] refreshTokenWithBlockSuccess:^(BOOL refreshSuccess) { - - [self DELETEWithEndpointAction:endPoint + + return [self DELETEWithEndpointAction:endPoint oauthMode:oauthMode parameters:parameters retries:retries-1 progress:uploadProgress success:success failure:failure]; - } failure:^(NSError * _Nonnull error) { - - if (failure) { - failure(nil,error); - } - }]; } else { if (failure) { diff --git a/PNObject/Classes/PNObject+PNObjectGETConnection.m b/PNObject/Classes/PNObject+PNObjectGETConnection.m index d6b835e..f27f04d 100644 --- a/PNObject/Classes/PNObject+PNObjectGETConnection.m +++ b/PNObject/Classes/PNObject+PNObjectGETConnection.m @@ -46,7 +46,7 @@ } + (void) GETWithEndpointAction:(NSString * _Nonnull) endPoint - oauthMode:(OAuthMode) oauthMode + oauthMode:(OAuthMode) oauthMode progress:(nullable void (^)(NSProgress * _Nullable downloadProgress)) downloadProgress success:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSDictionary * _Nullable responseObject))success failure:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error))failure { @@ -54,16 +54,16 @@ } + (void) GETWithEndpointAction:(NSString * _Nonnull) endPoint - oauthMode:(OAuthMode) oauthMode + oauthMode:(OAuthMode) oauthMode parameters:(NSDictionary * _Nullable) parameters - progress:(nullable void (^)(NSProgress * _Nullable downloadProgress)) downloadProgress + progress:(nullable void (^)(NSProgress * _Nullable downloadProgress)) downloadProgress success:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSDictionary * _Nullable responseObject))success failure:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error))failure { return [self GETWithEndpointAction:endPoint oauthMode:oauthMode parameters:parameters retries:MAX_RETRIES progress:downloadProgress success:success failure:failure]; } + (void) GETWithEndpointAction:(NSString * _Nonnull) endPoint - oauthMode:(OAuthMode) oauthMode + oauthMode:(OAuthMode) oauthMode parameters:(NSDictionary * _Nullable) parameters retries:(NSInteger) retries progress:(nullable void (^)(NSProgress * _Nullable downloadProgress)) downloadProgress @@ -79,21 +79,15 @@ } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { if (retries > 0) { - [[PNObjectConfig sharedInstance] refreshTokenWithBlockSuccess:^(BOOL refreshSuccess) { - - return [self GETWithEndpointAction:endPoint - oauthMode:oauthMode - parameters:parameters - retries:retries-1 - progress:downloadProgress - success:success - failure:failure]; - } failure:^(NSError * _Nonnull error) { - if (failure) { - failure(nil,error); - } - }]; - return; + + return [self GETWithEndpointAction:endPoint + oauthMode:oauthMode + parameters:parameters + retries:retries-1 + progress:downloadProgress + success:success + failure:failure]; + }else { if (failure) { failure(task,error); @@ -105,7 +99,7 @@ [[PNObjectConfig sharedInstance] refreshTokenForOauthMode:oauthMode retries:MAX_RETRIES WithBlockSuccess:^(BOOL refreshSuccess) { return [self GETWithEndpointAction:endPoint - oauthMode:oauthMode + oauthMode:oauthMode parameters:parameters retries:retries-1 progress:downloadProgress diff --git a/PNObject/Classes/PNObject+PNObjectPOSTConnection.m b/PNObject/Classes/PNObject+PNObjectPOSTConnection.m index 6157f02..78706c4 100644 --- a/PNObject/Classes/PNObject+PNObjectPOSTConnection.m +++ b/PNObject/Classes/PNObject+PNObjectPOSTConnection.m @@ -23,7 +23,11 @@ progress:(nullable void (^)(NSProgress * _Nonnull uploadProgress)) uploadProgress success:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSDictionary * _Nullable responseObject))success failure:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error))failure { - return [self POSTWithEndpointAction:endPoint oauthMode:OAuthModeClientCredential parameters:parameters retries:MAX_RETRIES progress:uploadProgress success:success failure:failure]; + return [self POSTWithEndpointAction:endPoint + oauthMode:OAuthModeClientCredential + parameters:parameters retries:MAX_RETRIES + progress:uploadProgress success:success + failure:failure]; } + (void) POSTWithEndpointAction:(NSString * _Nonnull) endPoint @@ -32,8 +36,12 @@ progress:(nullable void (^)(NSProgress * _Nonnull uploadProgress)) uploadProgress success:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSDictionary * _Nullable responseObject))success failure:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error))failure { - return [self POSTWithEndpointAction:endPoint oauthMode:OAuthModeClientCredential parameters:parameters retries:retries progress:uploadProgress success:success failure:failure]; - + return [self POSTWithEndpointAction:endPoint + oauthMode:OAuthModeClientCredential + parameters:parameters retries:retries + progress:uploadProgress success:success + failure:failure]; + } + (void) POSTWithEndpointAction:(NSString * _Nonnull) endPoint @@ -42,7 +50,13 @@ progress:(nullable void (^)(NSProgress * _Nullable uploadProgress)) uploadProgress success:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSDictionary * _Nullable responseObject))success failure:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error))failure { - return [self POSTWithEndpointAction:endPoint oauthMode:oauthMode parameters:parameters retries:MAX_RETRIES progress:uploadProgress success:success failure:failure]; + return [self POSTWithEndpointAction:endPoint + oauthMode:oauthMode + parameters:parameters + retries:MAX_RETRIES + progress:uploadProgress + success:success + failure:failure]; } + (void) POSTWithEndpointAction:(NSString * _Nonnull) endPoint @@ -55,7 +69,10 @@ if([[PNObjectConfig sharedInstance] setCredentialTokenForOauthMode:oauthMode]){ - [[[PNObjectConfig sharedInstance] manager] POST:[[[PNObjectConfig sharedInstance] endPointUrl] stringByAppendingFormat:@"%@",endPoint] parameters:parameters progress:uploadProgress success:^(NSURLSessionDataTask *task, id responseObject) { + [[[PNObjectConfig sharedInstance] manager] POST:[[[PNObjectConfig sharedInstance] endPointUrl] stringByAppendingFormat:@"%@",endPoint] + parameters:parameters + progress:uploadProgress + success:^(NSURLSessionDataTask *task, id responseObject) { if (success) { success(task,responseObject); @@ -63,15 +80,14 @@ } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { if (retries > 0) { - [[PNObjectConfig sharedInstance] refreshTokenForOauthMode:oauthMode retries:MAX_RETRIES WithBlockSuccess:^(BOOL refreshSuccess) { - - return [self POSTWithEndpointAction:endPoint parameters:parameters retries:retries-1 progress:uploadProgress success:success failure:failure]; - } failure:^(NSError * _Nonnull error) { - - if (failure) { - failure(nil,error); - } - }]; + + return [self POSTWithEndpointAction:endPoint + parameters:parameters + retries:retries-1 + progress:uploadProgress + success:success + failure:failure]; + } else { if (failure) { @@ -81,9 +97,17 @@ }]; } else { - [[PNObjectConfig sharedInstance] refreshTokenForOauthMode:oauthMode retries:MAX_RETRIES WithBlockSuccess:^(BOOL refreshSuccess) { + [[PNObjectConfig sharedInstance] refreshTokenForOauthMode:oauthMode + retries:MAX_RETRIES + WithBlockSuccess:^(BOOL refreshSuccess) { - return [self POSTWithEndpointAction:endPoint oauthMode:oauthMode parameters:parameters retries:retries-1 progress:uploadProgress success:success failure:failure]; + return [self POSTWithEndpointAction:endPoint + oauthMode:oauthMode + parameters:parameters + retries:retries-1 + progress:uploadProgress + success:success + failure:failure]; } failure:^(NSError * _Nonnull error) { if (failure) { @@ -101,7 +125,14 @@ success:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSDictionary * _Nullable responseObject))success failure:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error))failure { - return [self POSTWithEndpointAction:endPoint oauthMode:OAuthModeClientCredential formData:postFormData parameters:parameters retries:MAX_RETRIES progress:uploadProgress success:success failure:failure]; + return [self POSTWithEndpointAction:endPoint + oauthMode:OAuthModeClientCredential + formData:postFormData + parameters:parameters + retries:MAX_RETRIES + progress:uploadProgress + success:success + failure:failure]; } @@ -112,7 +143,14 @@ progress:(nullable void (^)(NSProgress * _Nonnull uploadProgress)) uploadProgress success:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSDictionary * _Nullable responseObject))success failure:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error))failure { - return [self POSTWithEndpointAction:endPoint oauthMode:OAuthModeClientCredential formData:postFormData parameters:parameters retries:retries progress:uploadProgress success:success failure:failure]; + return [self POSTWithEndpointAction:endPoint + oauthMode:OAuthModeClientCredential + formData:postFormData + parameters:parameters + retries:retries + progress:uploadProgress + success:success + failure:failure]; } + (void) POSTWithEndpointAction:(NSString * _Nonnull) endPoint @@ -143,7 +181,10 @@ if (postFormData) { for (PNObjectFormData *postData in postFormData) { - [formData appendPartWithFileData:[postData formData] name:[postData name] fileName:[postData fileName] mimeType:[postData mimeType]]; + [formData appendPartWithFileData:[postData formData] + name:[postData name] + fileName:[postData fileName] + mimeType:[postData mimeType]]; } } } @@ -154,16 +195,14 @@ } } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { if (retries > 0) { - [[PNObjectConfig sharedInstance] refreshTokenWithBlockSuccess:^(BOOL refreshSuccess) { - - return [self POSTWithEndpointAction:endPoint formData:postFormData parameters:parameters retries:retries-1 progress:uploadProgress success:success failure:failure]; - } failure:^(NSError * _Nonnull error) { - - if (failure) { - failure(nil,error); - } - }]; - + + return [self POSTWithEndpointAction:endPoint + formData:postFormData + parameters:parameters + retries:retries-1 + progress:uploadProgress + success:success + failure:failure]; } else { if (failure) { @@ -173,9 +212,18 @@ }]; } else { - [[PNObjectConfig sharedInstance] refreshTokenForOauthMode:oauthMode retries:MAX_RETRIES WithBlockSuccess:^(BOOL refreshSuccess) { + [[PNObjectConfig sharedInstance] refreshTokenForOauthMode:oauthMode + retries:MAX_RETRIES + WithBlockSuccess:^(BOOL refreshSuccess) { - return [self POSTWithEndpointAction:endPoint oauthMode:oauthMode formData:postFormData parameters:parameters retries:retries-1 progress:uploadProgress success:success failure:failure]; + return [self POSTWithEndpointAction:endPoint + oauthMode:oauthMode + formData:postFormData + parameters:parameters + retries:retries-1 + progress:uploadProgress + success:success + failure:failure]; } failure:^(NSError * _Nonnull error) { if (failure) {