From bdae7ebd76a7e166b6887a4b1160d0545cd3f1b1 Mon Sep 17 00:00:00 2001 From: Giuseppe Nucifora Date: Tue, 27 Mar 2018 15:07:46 +0200 Subject: [PATCH] - fix --- PNObject/Classes/PNObject+PNObjectPOSTConnection.m | 2 +- PNObject/Classes/PNObjectConfig.m | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PNObject/Classes/PNObject+PNObjectPOSTConnection.m b/PNObject/Classes/PNObject+PNObjectPOSTConnection.m index 18ff279..6157f02 100644 --- a/PNObject/Classes/PNObject+PNObjectPOSTConnection.m +++ b/PNObject/Classes/PNObject+PNObjectPOSTConnection.m @@ -63,7 +63,7 @@ } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { 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]; } failure:^(NSError * _Nonnull error) { diff --git a/PNObject/Classes/PNObjectConfig.m b/PNObject/Classes/PNObjectConfig.m index f65945b..ea96628 100644 --- a/PNObject/Classes/PNObjectConfig.m +++ b/PNObject/Classes/PNObjectConfig.m @@ -876,7 +876,7 @@ static bool isFirstAccess = YES; - (BOOL) setCredentialTokenForOauthMode:(OAuthMode) oauthMode { switch (oauthMode) { case OAuthModeClientCredential: - if (_currentOauthClientCredential && ![_currentOauthClientCredential isExpired]) { + if (!_currentOauthClientCredential || (_currentOauthClientCredential && ![_currentOauthClientCredential isExpired])) { return NO; } [_managerHttpRequestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthClientCredential]; @@ -884,7 +884,7 @@ static bool isFirstAccess = YES; [_manager.requestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthClientCredential]; break; case OAuthModePassword: - if (_currentOauthUserCredential && ![_currentOauthUserCredential isExpired]) { + if (!_currentOauthClientCredential || (_currentOauthUserCredential && ![_currentOauthUserCredential isExpired])) { return NO; } [_managerHttpRequestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthUserCredential];