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-28 09:55:01 +02:00
parent 6c4574164e
commit 6644db05d7
1 changed files with 67 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
PNObject/Classes/PNObjectConfig.m
View File

@ -205,18 +205,23 @@ static bool isFirstAccess = YES;
} }
AFOAuthCredential *clientCredential = [AFOAuthCredential retrieveCredentialWithIdentifier:PNObjectServiceClientCredentialIdentifier]; AFOAuthCredential *clientCredential = [AFOAuthCredential retrieveCredentialWithIdentifier:PNObjectServiceClientCredentialIdentifier];
if (clientCredential) { if (clientCredential && ![clientCredential isExpired]) {
_currentOauthClientCredential = clientCredential; _currentOauthClientCredential = clientCredential;
} }
else {
[AFOAuthCredential deleteCredentialWithIdentifier:PNObjectServiceClientCredentialIdentifier];
}
AFOAuthCredential *userCredential = [AFOAuthCredential retrieveCredentialWithIdentifier:PNObjectServiceUserCredentialIdentifier]; AFOAuthCredential *userCredential = [AFOAuthCredential retrieveCredentialWithIdentifier:PNObjectServiceUserCredentialIdentifier];
if (userCredential) { if (userCredential && ![userCredential isExpired]) {
_currentOauthUserCredential = userCredential; _currentOauthUserCredential = userCredential;
} }
else {
[AFOAuthCredential deleteCredentialWithIdentifier:PNObjectServiceUserCredentialIdentifier];
}
} }
return self; return self;
} }
@ -381,19 +386,12 @@ static bool isFirstAccess = YES;
_clientCredentialAuthManager.responseSerializer = [AFJSONResponseSerializerWithData serializer]; _clientCredentialAuthManager.responseSerializer = [AFJSONResponseSerializerWithData serializer];
_clientCredentialAuthManager.requestSerializer = _oauthJsonRequestSerializer; _clientCredentialAuthManager.requestSerializer = _oauthJsonRequestSerializer;
if (canTryRefreh) { if (_currentOauthClientCredential && ![_currentOauthClientCredential isExpired]) {
if (_currentOauthClientCredential && ![_currentOauthClientCredential isExpired]) { [_oauthHttpRequestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthClientCredential];
[_oauthJsonRequestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthClientCredential];
[_oauthHttpRequestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthClientCredential]; [_clientCredentialAuthManager.requestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthClientCredential];
[_oauthJsonRequestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthClientCredential];
[_clientCredentialAuthManager.requestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthClientCredential];
}
else {
[self refreshToken];
}
} }
} }
return _clientCredentialAuthManager; return _clientCredentialAuthManager;
@ -423,17 +421,13 @@ static bool isFirstAccess = YES;
[_oauthHttpRequestSerializer setValue:[_headerFields objectForKey:key] forHTTPHeaderField:key]; [_oauthHttpRequestSerializer setValue:[_headerFields objectForKey:key] forHTTPHeaderField:key];
} }
if (canTryRefreh) {
if (_currentOauthUserCredential && ![_currentOauthUserCredential isExpired] && ![[_manager requestSerializer] hasAuthorizationHeaderField]) {
[_oauthHttpRequestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthUserCredential]; if (_currentOauthUserCredential && ![_currentOauthUserCredential isExpired] && ![[_manager requestSerializer] hasAuthorizationHeaderField]) {
[_oauthJsonRequestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthUserCredential];
[_userCredentialAuthManager.requestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthUserCredential]; [_oauthHttpRequestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthUserCredential];
} [_oauthJsonRequestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthUserCredential];
else { [_userCredentialAuthManager.requestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthUserCredential];
[self refreshToken];
}
} }
_userCredentialAuthManager.responseSerializer = [AFJSONResponseSerializerWithData serializer]; _userCredentialAuthManager.responseSerializer = [AFJSONResponseSerializerWithData serializer];
@ -514,8 +508,8 @@ static bool isFirstAccess = YES;
WithBlockSuccess:(nullable void (^)(BOOL refreshSuccess))success WithBlockSuccess:(nullable void (^)(BOOL refreshSuccess))success
failure:(nullable void (^)(NSError * _Nonnull error))failure { failure:(nullable void (^)(NSError * _Nonnull error))failure {
__block __typeof__(_currentOauthClientCredential) wCurrentOauthCredential = _currentOauthClientCredential; __block __typeof__(_currentOauthClientCredential) wCurrentOauthClientCredential = _currentOauthClientCredential;
__block __typeof__(_currentOauthUserCredential) wCurrentOauthUserCredential = _currentOauthUserCredential;
__block __typeof__(_managerHttpRequestSerializer) wHttpSerializer = _managerHttpRequestSerializer; __block __typeof__(_managerHttpRequestSerializer) wHttpSerializer = _managerHttpRequestSerializer;
__block __typeof__(_managerJsonRequestSerializer) wJsonSerializer = _managerJsonRequestSerializer; __block __typeof__(_managerJsonRequestSerializer) wJsonSerializer = _managerJsonRequestSerializer;
__block __typeof__(_clientCredentialAuthManager) wClientCredentialAuthManager = _clientCredentialAuthManager; __block __typeof__(_clientCredentialAuthManager) wClientCredentialAuthManager = _clientCredentialAuthManager;
@ -527,14 +521,14 @@ static bool isFirstAccess = YES;
if (_currentOauthClientCredential && ![_currentOauthClientCredential isExpired]) { if (_currentOauthClientCredential && ![_currentOauthClientCredential isExpired]) {
[_clientCredentialAuthManager authenticateUsingOAuthWithURLString:_currentClientCredenzialEndPointUrl refreshToken:[_currentOauthClientCredential refreshToken] success:^(AFOAuthCredential * _Nonnull credential) { [_clientCredentialAuthManager authenticateUsingOAuthWithURLString:_currentClientCredenzialEndPointUrl refreshToken:[_currentOauthClientCredential refreshToken] success:^(AFOAuthCredential * _Nonnull credential) {
wCurrentOauthCredential = credential; wCurrentOauthClientCredential = credential;
[AFOAuthCredential storeCredential:wCurrentOauthCredential withIdentifier:PNObjectServiceClientCredentialIdentifier]; [AFOAuthCredential storeCredential:credential withIdentifier:PNObjectServiceClientCredentialIdentifier];
[wHttpSerializer setAuthorizationHeaderFieldWithCredential:wCurrentOauthCredential]; [wHttpSerializer setAuthorizationHeaderFieldWithCredential:credential];
[wJsonSerializer setAuthorizationHeaderFieldWithCredential:wCurrentOauthCredential]; [wJsonSerializer setAuthorizationHeaderFieldWithCredential:credential];
[wClientCredentialAuthManager.requestSerializer setAuthorizationHeaderFieldWithCredential:wCurrentOauthCredential]; [wClientCredentialAuthManager.requestSerializer setAuthorizationHeaderFieldWithCredential:credential];
[wManager.requestSerializer setAuthorizationHeaderFieldWithCredential:wCurrentOauthCredential]; [wManager.requestSerializer setAuthorizationHeaderFieldWithCredential:credential];
[[NSNotificationCenter defaultCenter] postNotificationName:PNObjectLocalNotificationRefreshTokenClientCredentialSuccess object:nil]; [[NSNotificationCenter defaultCenter] postNotificationName:PNObjectLocalNotificationRefreshTokenClientCredentialSuccess object:nil];
if (success) { if (success) {
@ -543,7 +537,6 @@ static bool isFirstAccess = YES;
return; return;
} failure:^(NSError * _Nonnull error) { } failure:^(NSError * _Nonnull error) {
[self resetTokenForOauthMode:oauthMode];
if (retries > 0) { if (retries > 0) {
[self refreshTokenForOauthMode:oauthMode retries:retries-1 WithBlockSuccess:success failure:failure]; [self refreshTokenForOauthMode:oauthMode retries:retries-1 WithBlockSuccess:success failure:failure];
@ -559,13 +552,14 @@ static bool isFirstAccess = YES;
} }
else { else {
[_clientCredentialAuthManager authenticateUsingOAuthWithURLString:_currentClientCredenzialEndPointUrl scope:@"" success:^(AFOAuthCredential * _Nonnull credential) { [_clientCredentialAuthManager authenticateUsingOAuthWithURLString:_currentClientCredenzialEndPointUrl scope:@"" success:^(AFOAuthCredential * _Nonnull credential) {
wCurrentOauthClientCredential = credential;
[AFOAuthCredential storeCredential:wCurrentOauthCredential withIdentifier:PNObjectServiceClientCredentialIdentifier]; [AFOAuthCredential storeCredential:credential withIdentifier:PNObjectServiceClientCredentialIdentifier];
[wHttpSerializer setAuthorizationHeaderFieldWithCredential:wCurrentOauthCredential]; [wHttpSerializer setAuthorizationHeaderFieldWithCredential:credential];
[wJsonSerializer setAuthorizationHeaderFieldWithCredential:wCurrentOauthCredential]; [wJsonSerializer setAuthorizationHeaderFieldWithCredential:credential];
[wClientCredentialAuthManager.requestSerializer setAuthorizationHeaderFieldWithCredential:wCurrentOauthCredential]; [wClientCredentialAuthManager.requestSerializer setAuthorizationHeaderFieldWithCredential:credential];
[wManager.requestSerializer setAuthorizationHeaderFieldWithCredential:wCurrentOauthCredential]; [wManager.requestSerializer setAuthorizationHeaderFieldWithCredential:credential];
[[NSNotificationCenter defaultCenter] postNotificationName:PNObjectLocalNotificationRefreshTokenClientCredentialSuccess object:nil]; [[NSNotificationCenter defaultCenter] postNotificationName:PNObjectLocalNotificationRefreshTokenClientCredentialSuccess object:nil];
if (success) { if (success) {
@ -585,14 +579,14 @@ static bool isFirstAccess = YES;
if (_currentOauthUserCredential && ![_currentOauthUserCredential isExpired]) { if (_currentOauthUserCredential && ![_currentOauthUserCredential isExpired]) {
[_userCredentialAuthManager authenticateUsingOAuthWithURLString:_currentClientCredenzialEndPointUrl refreshToken:[_currentOauthUserCredential refreshToken] success:^(AFOAuthCredential * _Nonnull credential) { [_userCredentialAuthManager authenticateUsingOAuthWithURLString:_currentClientCredenzialEndPointUrl refreshToken:[_currentOauthUserCredential refreshToken] success:^(AFOAuthCredential * _Nonnull credential) {
wCurrentOauthCredential = credential; wCurrentOauthUserCredential = credential;
[AFOAuthCredential storeCredential:wCurrentOauthCredential withIdentifier:PNObjectServiceUserCredentialIdentifier]; [AFOAuthCredential storeCredential:credential withIdentifier:PNObjectServiceUserCredentialIdentifier];
[wHttpSerializer setAuthorizationHeaderFieldWithCredential:wCurrentOauthCredential]; [wHttpSerializer setAuthorizationHeaderFieldWithCredential:credential];
[wJsonSerializer setAuthorizationHeaderFieldWithCredential:wCurrentOauthCredential]; [wJsonSerializer setAuthorizationHeaderFieldWithCredential:credential];
[wUserCredentialAuthManager.requestSerializer setAuthorizationHeaderFieldWithCredential:wCurrentOauthCredential]; [wUserCredentialAuthManager.requestSerializer setAuthorizationHeaderFieldWithCredential:credential];
[wManager.requestSerializer setAuthorizationHeaderFieldWithCredential:wCurrentOauthCredential]; [wManager.requestSerializer setAuthorizationHeaderFieldWithCredential:credential];
[[NSNotificationCenter defaultCenter] postNotificationName:PNObjectLocalNotificationRefreshTokenClientCredentialSuccess object:nil]; [[NSNotificationCenter defaultCenter] postNotificationName:PNObjectLocalNotificationRefreshTokenClientCredentialSuccess object:nil];
if (success) { if (success) {
@ -601,7 +595,6 @@ static bool isFirstAccess = YES;
return; return;
} failure:^(NSError * _Nonnull error) { } failure:^(NSError * _Nonnull error) {
[self resetTokenForOauthMode:oauthMode];
if (retries > 0) { if (retries > 0) {
[self refreshTokenForOauthMode:oauthMode retries:retries-1 WithBlockSuccess:success failure:failure]; [self refreshTokenForOauthMode:oauthMode retries:retries-1 WithBlockSuccess:success failure:failure];
} }
@ -696,12 +689,12 @@ static bool isFirstAccess = YES;
[_userCredentialAuthManager authenticateUsingFacebookOAuthWithURLString:_currentClientCredenzialEndPointUrl facebookId:facebookId facebookToken:facebookToken scope:@"" success:^(AFOAuthCredential * _Nonnull credential) { [_userCredentialAuthManager authenticateUsingFacebookOAuthWithURLString:_currentClientCredenzialEndPointUrl facebookId:facebookId facebookToken:facebookToken scope:@"" success:^(AFOAuthCredential * _Nonnull credential) {
wCurrentOauthCredential = credential; wCurrentOauthCredential = credential;
[AFOAuthCredential storeCredential:wCurrentOauthCredential withIdentifier:PNObjectServiceUserCredentialIdentifier]; [AFOAuthCredential storeCredential:credential withIdentifier:PNObjectServiceUserCredentialIdentifier];
[wHttpSerializer setAuthorizationHeaderFieldWithCredential:wCurrentOauthCredential]; [wHttpSerializer setAuthorizationHeaderFieldWithCredential:credential];
[wJsonSerializer setAuthorizationHeaderFieldWithCredential:wCurrentOauthCredential]; [wJsonSerializer setAuthorizationHeaderFieldWithCredential:credential];
[wUserCredentialAuthManager.requestSerializer setAuthorizationHeaderFieldWithCredential:wCurrentOauthCredential]; [wUserCredentialAuthManager.requestSerializer setAuthorizationHeaderFieldWithCredential:credential];
[wManager.requestSerializer setAuthorizationHeaderFieldWithCredential:wCurrentOauthCredential]; [wManager.requestSerializer setAuthorizationHeaderFieldWithCredential:credential];
[[NSNotificationCenter defaultCenter] postNotificationName:PNObjectLocalNotificationRefreshTokenUserSuccess object:nil]; [[NSNotificationCenter defaultCenter] postNotificationName:PNObjectLocalNotificationRefreshTokenUserSuccess object:nil];
if (success) { if (success) {
@ -737,7 +730,6 @@ static bool isFirstAccess = YES;
} }
__block __typeof__(_currentOauthUserCredential) wCurrentOauthCredential = _currentOauthUserCredential; __block __typeof__(_currentOauthUserCredential) wCurrentOauthCredential = _currentOauthUserCredential;
__block __typeof__(_managerHttpRequestSerializer) wHttpSerializer = _managerHttpRequestSerializer; __block __typeof__(_managerHttpRequestSerializer) wHttpSerializer = _managerHttpRequestSerializer;
__block __typeof__(_managerJsonRequestSerializer) wJsonSerializer = _managerJsonRequestSerializer; __block __typeof__(_managerJsonRequestSerializer) wJsonSerializer = _managerJsonRequestSerializer;
__block __typeof__(_manager) wManager = _manager; __block __typeof__(_manager) wManager = _manager;
@ -747,12 +739,12 @@ static bool isFirstAccess = YES;
[_userCredentialAuthManager authenticateUsingOAuthWithURLString:_currentClientCredenzialEndPointUrl username:email password:password scope:@"" success:^(AFOAuthCredential * _Nonnull credential) { [_userCredentialAuthManager authenticateUsingOAuthWithURLString:_currentClientCredenzialEndPointUrl username:email password:password scope:@"" success:^(AFOAuthCredential * _Nonnull credential) {
wCurrentOauthCredential = credential; wCurrentOauthCredential = credential;
[AFOAuthCredential storeCredential:wCurrentOauthCredential withIdentifier:PNObjectServiceUserCredentialIdentifier]; [AFOAuthCredential storeCredential:credential withIdentifier:PNObjectServiceUserCredentialIdentifier];
[wHttpSerializer setAuthorizationHeaderFieldWithCredential:wCurrentOauthCredential]; [wHttpSerializer setAuthorizationHeaderFieldWithCredential:credential];
[wJsonSerializer setAuthorizationHeaderFieldWithCredential:wCurrentOauthCredential]; [wJsonSerializer setAuthorizationHeaderFieldWithCredential:credential];
[wUserCredentialAuthManager.requestSerializer setAuthorizationHeaderFieldWithCredential:wCurrentOauthCredential]; [wUserCredentialAuthManager.requestSerializer setAuthorizationHeaderFieldWithCredential:credential];
[wManager.requestSerializer setAuthorizationHeaderFieldWithCredential:wCurrentOauthCredential]; [wManager.requestSerializer setAuthorizationHeaderFieldWithCredential:credential];
[[NSNotificationCenter defaultCenter] postNotificationName:PNObjectLocalNotificationRefreshTokenUserSuccess object:nil]; [[NSNotificationCenter defaultCenter] postNotificationName:PNObjectLocalNotificationRefreshTokenUserSuccess object:nil];
@ -769,9 +761,9 @@ static bool isFirstAccess = YES;
} }
- (void) refreshTokenForUserWithUsername:(NSString * _Nonnull) username - (void) refreshTokenForUserWithUsername:(NSString * _Nonnull) username
password:(NSString * _Nonnull) password password:(NSString * _Nonnull) password
withBlockSuccess:(nullable void (^)(BOOL refreshSuccess))success withBlockSuccess:(nullable void (^)(BOOL refreshSuccess))success
failure:(nullable void (^)(NSError * _Nonnull error))failure { failure:(nullable void (^)(NSError * _Nonnull error))failure {
if (![SINGLETON_PNObjectConfig.userSubClass isValidPassword:password]) { if (![SINGLETON_PNObjectConfig.userSubClass isValidPassword:password]) {
if (failure) { if (failure) {
@ -782,7 +774,6 @@ static bool isFirstAccess = YES;
} }
__block __typeof__(_currentOauthUserCredential) wCurrentOauthCredential = _currentOauthUserCredential; __block __typeof__(_currentOauthUserCredential) wCurrentOauthCredential = _currentOauthUserCredential;
__block __typeof__(_managerHttpRequestSerializer) wHttpSerializer = _managerHttpRequestSerializer; __block __typeof__(_managerHttpRequestSerializer) wHttpSerializer = _managerHttpRequestSerializer;
__block __typeof__(_managerJsonRequestSerializer) wJsonSerializer = _managerJsonRequestSerializer; __block __typeof__(_managerJsonRequestSerializer) wJsonSerializer = _managerJsonRequestSerializer;
__block __typeof__(_manager) wManager = _manager; __block __typeof__(_manager) wManager = _manager;
@ -792,12 +783,12 @@ static bool isFirstAccess = YES;
[_userCredentialAuthManager authenticateUsingOAuthWithURLString:_currentClientCredenzialEndPointUrl username:username password:password scope:@"" success:^(AFOAuthCredential * _Nonnull credential) { [_userCredentialAuthManager authenticateUsingOAuthWithURLString:_currentClientCredenzialEndPointUrl username:username password:password scope:@"" success:^(AFOAuthCredential * _Nonnull credential) {
wCurrentOauthCredential = credential; wCurrentOauthCredential = credential;
[AFOAuthCredential storeCredential:wCurrentOauthCredential withIdentifier:PNObjectServiceUserCredentialIdentifier]; [AFOAuthCredential storeCredential:credential withIdentifier:PNObjectServiceUserCredentialIdentifier];
[wHttpSerializer setAuthorizationHeaderFieldWithCredential:wCurrentOauthCredential]; [wHttpSerializer setAuthorizationHeaderFieldWithCredential:credential];
[wJsonSerializer setAuthorizationHeaderFieldWithCredential:wCurrentOauthCredential]; [wJsonSerializer setAuthorizationHeaderFieldWithCredential:credential];
[wUserCredentialAuthManager.requestSerializer setAuthorizationHeaderFieldWithCredential:wCurrentOauthCredential]; [wUserCredentialAuthManager.requestSerializer setAuthorizationHeaderFieldWithCredential:credential];
[wManager.requestSerializer setAuthorizationHeaderFieldWithCredential:wCurrentOauthCredential]; [wManager.requestSerializer setAuthorizationHeaderFieldWithCredential:credential];
[[NSNotificationCenter defaultCenter] postNotificationName:PNObjectLocalNotificationRefreshTokenUserSuccess object:nil]; [[NSNotificationCenter defaultCenter] postNotificationName:PNObjectLocalNotificationRefreshTokenUserSuccess object:nil];
@ -874,27 +865,34 @@ static bool isFirstAccess = YES;
} }
- (BOOL) setCredentialTokenForOauthMode:(OAuthMode) oauthMode { - (BOOL) setCredentialTokenForOauthMode:(OAuthMode) oauthMode {
switch (oauthMode) { switch (oauthMode) {
case OAuthModeClientCredential: case OAuthModeClientCredential:{
NSLog(@"%@",_currentOauthClientCredential);
if (!_currentOauthClientCredential || (_currentOauthClientCredential && ![_currentOauthClientCredential isExpired])) { if (!_currentOauthClientCredential || (_currentOauthClientCredential && ![_currentOauthClientCredential isExpired])) {
return NO; return NO;
} }
[_managerHttpRequestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthClientCredential]; [_managerHttpRequestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthClientCredential];
[_managerJsonRequestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthClientCredential]; [_managerJsonRequestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthClientCredential];
[_manager.requestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthClientCredential]; [_manager.requestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthClientCredential];
}
break; break;
case OAuthModePassword: case OAuthModePassword:{
if (!_currentOauthClientCredential || (_currentOauthUserCredential && ![_currentOauthUserCredential isExpired])) {
if (!_currentOauthUserCredential || (_currentOauthUserCredential && ![_currentOauthUserCredential isExpired])) {
return NO; return NO;
} }
[_managerHttpRequestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthUserCredential]; [_managerHttpRequestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthUserCredential];
[_managerJsonRequestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthUserCredential]; [_managerJsonRequestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthUserCredential];
[_manager.requestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthUserCredential]; [_manager.requestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthUserCredential];
}
break; break;
default: default: {
[_managerHttpRequestSerializer setValue:@"" forHTTPHeaderField:@"Authorization"]; [_managerHttpRequestSerializer setValue:@"" forHTTPHeaderField:@"Authorization"];
[_managerJsonRequestSerializer setValue:@"" forHTTPHeaderField:@"Authorization"]; [_managerJsonRequestSerializer setValue:@"" forHTTPHeaderField:@"Authorization"];
[_manager.requestSerializer setValue:@"" forHTTPHeaderField:@"Authorization"]; [_manager.requestSerializer setValue:@"" forHTTPHeaderField:@"Authorization"];
}
break; break;
} }
return YES; return YES;