giuseppenuc/PNObject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- remove refresh token retry

Browse Source
This commit is contained in:
Giuseppe Nucifora 2018-03-28 12:56:32 +02:00
parent 2567a56e2e
commit 87687f3c64
7 changed files with 102 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Example/Podfile.lock
View File

@ -38,7 +38,7 @@ PODS:
- NSString-Helper (1.0.6) - NSString-Helper (1.0.6)
- nv-ios-http-status (0.0.1) - nv-ios-http-status (0.0.1)
- PEAR-FileManager-iOS (1.3.1) - PEAR-FileManager-iOS (1.3.1)
- PNObject (2.4.2): - PNObject (2.4.5):
- AFNetworking - AFNetworking
- CodFis-Helper - CodFis-Helper
- DDDKeychainWrapper - DDDKeychainWrapper
@ -85,7 +85,7 @@ SPEC CHECKSUMS:
NSString-Helper: 389265918b2a4c5b0d09f0e03c607e8e5e254dd7 NSString-Helper: 389265918b2a4c5b0d09f0e03c607e8e5e254dd7
nv-ios-http-status: b6c2b5fc8656cc19e0d3000dadce2080b99d0e2f nv-ios-http-status: b6c2b5fc8656cc19e0d3000dadce2080b99d0e2f
PEAR-FileManager-iOS: 3bc403f68a53483f5629aa822f4649e40275c4d3 PEAR-FileManager-iOS: 3bc403f68a53483f5629aa822f4649e40275c4d3
PNObject: 332e958cd11c9083abce467b0b93c84405a5c065 PNObject: e754ef3f56399808cdb48af39d610c8132f2effe
PureLayout: 4d550abe49a94f24c2808b9b95db9131685fe4cd PureLayout: 4d550abe49a94f24c2808b9b95db9131685fe4cd
RZDataBinding: 6981e90ddaae2f5e02028323b1043f8c31013109 RZDataBinding: 6981e90ddaae2f5e02028323b1043f8c31013109
Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66 Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66

4
Example/Pods/Local Podspecs/PNObject.podspec.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "PNObject", "name": "PNObject",
"version": "2.4.2", "version": "2.4.5",
"summary": "PNObject is a simple replica of the more complex ParseObject", "summary": "PNObject is a simple replica of the more complex ParseObject",
"homepage": "https://github.com/giuseppenucifora/PNObject", "homepage": "https://github.com/giuseppenucifora/PNObject",
"license": { "license": {
@ -12,7 +12,7 @@
}, },
"source": { "source": {
"git": "https://github.com/giuseppenucifora/PNObject.git", "git": "https://github.com/giuseppenucifora/PNObject.git",
"tag": "2.4.2" "tag": "2.4.5"
}, },
"platforms": { "platforms": {
"ios": "8.0" "ios": "8.0"

4
Example/Pods/Manifest.lock generated
View File

@ -38,7 +38,7 @@ PODS:
- NSString-Helper (1.0.6) - NSString-Helper (1.0.6)
- nv-ios-http-status (0.0.1) - nv-ios-http-status (0.0.1)
- PEAR-FileManager-iOS (1.3.1) - PEAR-FileManager-iOS (1.3.1)
- PNObject (2.4.2): - PNObject (2.4.5):
- AFNetworking - AFNetworking
- CodFis-Helper - CodFis-Helper
- DDDKeychainWrapper - DDDKeychainWrapper
@ -85,7 +85,7 @@ SPEC CHECKSUMS:
NSString-Helper: 389265918b2a4c5b0d09f0e03c607e8e5e254dd7 NSString-Helper: 389265918b2a4c5b0d09f0e03c607e8e5e254dd7
nv-ios-http-status: b6c2b5fc8656cc19e0d3000dadce2080b99d0e2f nv-ios-http-status: b6c2b5fc8656cc19e0d3000dadce2080b99d0e2f
PEAR-FileManager-iOS: 3bc403f68a53483f5629aa822f4649e40275c4d3 PEAR-FileManager-iOS: 3bc403f68a53483f5629aa822f4649e40275c4d3
PNObject: 332e958cd11c9083abce467b0b93c84405a5c065 PNObject: e754ef3f56399808cdb48af39d610c8132f2effe
PureLayout: 4d550abe49a94f24c2808b9b95db9131685fe4cd PureLayout: 4d550abe49a94f24c2808b9b95db9131685fe4cd
RZDataBinding: 6981e90ddaae2f5e02028323b1043f8c31013109 RZDataBinding: 6981e90ddaae2f5e02028323b1043f8c31013109
Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66 Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66

2
PNObject.podspec
View File

@ -8,7 +8,7 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'PNObject' 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' s.summary = 'PNObject is a simple replica of the more complex ParseObject'

11
PNObject/Classes/PNObject+PNObjectDELETEConnection.m
View File

@ -61,21 +61,14 @@
} }
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
if (retries > 0) { if (retries > 0) {
[[PNObjectConfig sharedInstance] refreshTokenWithBlockSuccess:^(BOOL refreshSuccess) {
return [self DELETEWithEndpointAction:endPoint
[self DELETEWithEndpointAction:endPoint
oauthMode:oauthMode oauthMode:oauthMode
parameters:parameters parameters:parameters
retries:retries-1 retries:retries-1
progress:uploadProgress progress:uploadProgress
success:success success:success
failure:failure]; failure:failure];
} failure:^(NSError * _Nonnull error) {
if (failure) {
failure(nil,error);
}
}];
} }
else { else {
if (failure) { if (failure) {

34
PNObject/Classes/PNObject+PNObjectGETConnection.m
View File

@ -46,7 +46,7 @@
} }
+ (void) GETWithEndpointAction:(NSString * _Nonnull) endPoint + (void) GETWithEndpointAction:(NSString * _Nonnull) endPoint
oauthMode:(OAuthMode) oauthMode oauthMode:(OAuthMode) oauthMode
progress:(nullable void (^)(NSProgress * _Nullable downloadProgress)) downloadProgress progress:(nullable void (^)(NSProgress * _Nullable downloadProgress)) downloadProgress
success:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSDictionary * _Nullable responseObject))success success:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSDictionary * _Nullable responseObject))success
failure:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error))failure { failure:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error))failure {
@ -54,16 +54,16 @@
} }
+ (void) GETWithEndpointAction:(NSString * _Nonnull) endPoint + (void) GETWithEndpointAction:(NSString * _Nonnull) endPoint
oauthMode:(OAuthMode) oauthMode oauthMode:(OAuthMode) oauthMode
parameters:(NSDictionary * _Nullable) parameters 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 success:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSDictionary * _Nullable responseObject))success
failure:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error))failure { 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]; return [self GETWithEndpointAction:endPoint oauthMode:oauthMode parameters:parameters retries:MAX_RETRIES progress:downloadProgress success:success failure:failure];
} }
+ (void) GETWithEndpointAction:(NSString * _Nonnull) endPoint + (void) GETWithEndpointAction:(NSString * _Nonnull) endPoint
oauthMode:(OAuthMode) oauthMode oauthMode:(OAuthMode) oauthMode
parameters:(NSDictionary * _Nullable) parameters parameters:(NSDictionary * _Nullable) parameters
retries:(NSInteger) retries retries:(NSInteger) retries
progress:(nullable void (^)(NSProgress * _Nullable downloadProgress)) downloadProgress progress:(nullable void (^)(NSProgress * _Nullable downloadProgress)) downloadProgress
@ -79,21 +79,15 @@
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
if (retries > 0) { if (retries > 0) {
[[PNObjectConfig sharedInstance] refreshTokenWithBlockSuccess:^(BOOL refreshSuccess) {
return [self GETWithEndpointAction:endPoint
return [self GETWithEndpointAction:endPoint oauthMode:oauthMode
oauthMode:oauthMode parameters:parameters
parameters:parameters retries:retries-1
retries:retries-1 progress:downloadProgress
progress:downloadProgress success:success
success:success failure:failure];
failure:failure];
} failure:^(NSError * _Nonnull error) {
if (failure) {
failure(nil,error);
}
}];
return;
}else { }else {
if (failure) { if (failure) {
failure(task,error); failure(task,error);
@ -105,7 +99,7 @@
[[PNObjectConfig sharedInstance] refreshTokenForOauthMode:oauthMode retries:MAX_RETRIES WithBlockSuccess:^(BOOL refreshSuccess) { [[PNObjectConfig sharedInstance] refreshTokenForOauthMode:oauthMode retries:MAX_RETRIES WithBlockSuccess:^(BOOL refreshSuccess) {
return [self GETWithEndpointAction:endPoint return [self GETWithEndpointAction:endPoint
oauthMode:oauthMode oauthMode:oauthMode
parameters:parameters parameters:parameters
retries:retries-1 retries:retries-1
progress:downloadProgress progress:downloadProgress

110
PNObject/Classes/PNObject+PNObjectPOSTConnection.m
View File

@ -23,7 +23,11 @@
progress:(nullable void (^)(NSProgress * _Nonnull uploadProgress)) uploadProgress progress:(nullable void (^)(NSProgress * _Nonnull uploadProgress)) uploadProgress
success:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSDictionary * _Nullable responseObject))success success:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSDictionary * _Nullable responseObject))success
failure:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error))failure { 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 + (void) POSTWithEndpointAction:(NSString * _Nonnull) endPoint
@ -32,8 +36,12 @@
progress:(nullable void (^)(NSProgress * _Nonnull uploadProgress)) uploadProgress progress:(nullable void (^)(NSProgress * _Nonnull uploadProgress)) uploadProgress
success:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSDictionary * _Nullable responseObject))success success:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSDictionary * _Nullable responseObject))success
failure:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error))failure { 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 + (void) POSTWithEndpointAction:(NSString * _Nonnull) endPoint
@ -42,7 +50,13 @@
progress:(nullable void (^)(NSProgress * _Nullable uploadProgress)) uploadProgress progress:(nullable void (^)(NSProgress * _Nullable uploadProgress)) uploadProgress
success:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSDictionary * _Nullable responseObject))success success:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSDictionary * _Nullable responseObject))success
failure:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error))failure { 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 + (void) POSTWithEndpointAction:(NSString * _Nonnull) endPoint
@ -55,7 +69,10 @@
if([[PNObjectConfig sharedInstance] setCredentialTokenForOauthMode:oauthMode]){ 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) { if (success) {
success(task,responseObject); success(task,responseObject);
@ -63,15 +80,14 @@
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
if (retries > 0) { if (retries > 0) {
[[PNObjectConfig sharedInstance] refreshTokenForOauthMode:oauthMode retries:MAX_RETRIES WithBlockSuccess:^(BOOL refreshSuccess) {
return [self POSTWithEndpointAction:endPoint
return [self POSTWithEndpointAction:endPoint parameters:parameters retries:retries-1 progress:uploadProgress success:success failure:failure]; parameters:parameters
} failure:^(NSError * _Nonnull error) { retries:retries-1
progress:uploadProgress
if (failure) { success:success
failure(nil,error); failure:failure];
}
}];
} }
else { else {
if (failure) { if (failure) {
@ -81,9 +97,17 @@
}]; }];
} }
else { 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) { } failure:^(NSError * _Nonnull error) {
if (failure) { if (failure) {
@ -101,7 +125,14 @@
success:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSDictionary * _Nullable responseObject))success success:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSDictionary * _Nullable responseObject))success
failure:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error))failure { 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 progress:(nullable void (^)(NSProgress * _Nonnull uploadProgress)) uploadProgress
success:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSDictionary * _Nullable responseObject))success success:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSDictionary * _Nullable responseObject))success
failure:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error))failure { 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 + (void) POSTWithEndpointAction:(NSString * _Nonnull) endPoint
@ -143,7 +181,10 @@
if (postFormData) { if (postFormData) {
for (PNObjectFormData *postData in 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) { } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
if (retries > 0) { if (retries > 0) {
[[PNObjectConfig sharedInstance] refreshTokenWithBlockSuccess:^(BOOL refreshSuccess) {
return [self POSTWithEndpointAction:endPoint
return [self POSTWithEndpointAction:endPoint formData:postFormData parameters:parameters retries:retries-1 progress:uploadProgress success:success failure:failure]; formData:postFormData
} failure:^(NSError * _Nonnull error) { parameters:parameters
retries:retries-1
if (failure) { progress:uploadProgress
failure(nil,error); success:success
} failure:failure];
}];
} }
else { else {
if (failure) { if (failure) {
@ -173,9 +212,18 @@
}]; }];
} }
else { 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) { } failure:^(NSError * _Nonnull error) {
if (failure) { if (failure) {