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

- fix

Browse Source
This commit is contained in:
Giuseppe Nucifora 2018-03-27 15:07:46 +02:00
parent 36a361d021
commit bdae7ebd76
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,7 @@
} 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) { [[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]; return [self POSTWithEndpointAction:endPoint parameters:parameters retries:retries-1 progress:uploadProgress success:success failure:failure];
} failure:^(NSError * _Nonnull error) { } failure:^(NSError * _Nonnull error) {

4
PNObject/Classes/PNObjectConfig.m
View File

@ -876,7 +876,7 @@ static bool isFirstAccess = YES;
- (BOOL) setCredentialTokenForOauthMode:(OAuthMode) oauthMode { - (BOOL) setCredentialTokenForOauthMode:(OAuthMode) oauthMode {
switch (oauthMode) { switch (oauthMode) {
case OAuthModeClientCredential: case OAuthModeClientCredential:
if (_currentOauthClientCredential && ![_currentOauthClientCredential isExpired]) { if (!_currentOauthClientCredential || (_currentOauthClientCredential && ![_currentOauthClientCredential isExpired])) {
return NO; return NO;
} }
[_managerHttpRequestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthClientCredential]; [_managerHttpRequestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthClientCredential];
@ -884,7 +884,7 @@ static bool isFirstAccess = YES;
[_manager.requestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthClientCredential]; [_manager.requestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthClientCredential];
break; break;
case OAuthModePassword: case OAuthModePassword:
if (_currentOauthUserCredential && ![_currentOauthUserCredential isExpired]) { if (!_currentOauthClientCredential || (_currentOauthUserCredential && ![_currentOauthUserCredential isExpired])) {
return NO; return NO;
} }
[_managerHttpRequestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthUserCredential]; [_managerHttpRequestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthUserCredential];