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

Merge branch 'develop' into 'master'

Browse Source 
Release 0.3.6

- Add isAuthenticated method
- Fix vari

See merge request !24
This commit is contained in:
Giuseppe Nucifora 2016-02-12 09:40:27 +00:00
commit 1af76a7ba4
5 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Example/PNObject/PNObjectViewController.m
View File

@ -62,6 +62,8 @@
[self.view addSubview:_cancelToken]; [self.view addSubview:_cancelToken];
User * user = [User currentUser];
[self.view setNeedsUpdateConstraints]; [self.view setNeedsUpdateConstraints];
} }
@ -102,17 +104,17 @@
/*User *user = [User currentUser]; /*User *user = [User currentUser];
[user setFirstName:@"Giuseppe"]; [user setFirstName:@"Giuseppe"];
[user setLastName:@"Nuficora"]; [user setLastName:@"Nuficora"];
[user setEmail:@"packman@giuseppenucifora.com"]; [user setEmail:@"packman@giuseppenucifora.com"];
[user setPassword:@"asdasdasd"]; [user setPassword:@"asdasdasd"];
[user setConfirmPassword:@"asdasdasd"]; [user setConfirmPassword:@"asdasdasd"];
[user setHasAcceptedNewsletter:NO]; [user setHasAcceptedNewsletter:NO];
[user setHasAcceptedPrivacy:YES]; [user setHasAcceptedPrivacy:YES];
[user saveLocally]; [user saveLocally];
[user reloadFormServer];*/ [user reloadFormServer];*/
/*[[User currentUser] socialLoginWithBlockSuccessFromViewController:self /*[[User currentUser] socialLoginWithBlockSuccessFromViewController:self
blockSuccess:^(PNUser * _Nullable responseObject) { blockSuccess:^(PNUser * _Nullable responseObject) {
@ -121,12 +123,17 @@
}];*/ }];*/
[[PNUser currentUser] loginCurrentUserWithEmail:@"packman@giuseppenucifora.com" password:@"asdasdasd" withBlockSuccess:^(PNUser * _Nullable responseObject) { User * user = [User currentUser];
NSLog(@"response : %@",responseObject); if ([user isAuthenticated]) {
} failure:^(NSError * _Nonnull error) {
NSLog(@"response : %@",error); [user loginCurrentUserWithEmail:@"packman@giuseppenucifora.com" password:@"asdasdasd" withBlockSuccess:^(PNUser * _Nullable responseObject) {
}];
NSLog(@"response : %@",responseObject);
} failure:^(NSError * _Nonnull error) {
NSLog(@"response : %@",error);
}];
}
} }
- (void)didReceiveMemoryWarning - (void)didReceiveMemoryWarning

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 = "0.3.6" s.version = "0.3.7"
s.summary = "PNObject is a simple replica of the more complex ParseObject" s.summary = "PNObject is a simple replica of the more complex ParseObject"
# This description is used to generate tags and improve search results. # This description is used to generate tags and improve search results.

2
Pod/Classes/PNClasses/PNUser.h
View File

@ -96,7 +96,7 @@
* *
* @return <#return value description#> * @return <#return value description#>
*/ */
- (BOOL) autenticated; - (BOOL) isAuthenticated;
//- (void) setPassword:(NSString * _Nonnull)password inBackGroundWithBlock:(nullable void (^)(BOOL saveStatus, id responseObject, NSError * error)) responseBlock; //- (void) setPassword:(NSString * _Nonnull)password inBackGroundWithBlock:(nullable void (^)(BOOL saveStatus, id responseObject, NSError * error)) responseBlock;

16
Pod/Classes/PNClasses/PNUser.m
View File

@ -19,6 +19,8 @@
@interface PNUser() <PNObjectSubclassing> @interface PNUser() <PNObjectSubclassing>
@property (nonatomic) BOOL authenticated;
@end @end
@implementation PNUser @implementation PNUser
@ -79,6 +81,10 @@ static bool isFirstAccess = YES;
} }
if (SINGLETON) { if (SINGLETON) {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
[self autoLogin];
});
} }
return SINGLETON; return SINGLETON;
} }
@ -293,10 +299,15 @@ static bool isFirstAccess = YES;
failure:(nullable void (^)(NSError * _Nonnull error))failure { failure:(nullable void (^)(NSError * _Nonnull error))failure {
[[PNObjectConfig sharedInstance] refreshTokenForUserWithEmail:email password:password withBlockSuccess:^(BOOL refreshSuccess) { [[PNObjectConfig sharedInstance] refreshTokenForUserWithEmail:email password:password withBlockSuccess:^(BOOL refreshSuccess) {
if (refreshSuccess) { if (refreshSuccess) {
[self setAuthenticated:YES];
[self setEmail:email];
[self setPassword:password];
[self setConfirmPassword:password];
[self saveLocally];
if (success) { if (success) {
success([PNUser currentUser]); success(self);
} }
} }
} failure:failure]; } failure:failure];
@ -330,6 +341,7 @@ static bool isFirstAccess = YES;
@"facebookAccessToken":@"facebookAccessToken", @"facebookAccessToken":@"facebookAccessToken",
@"isFacebookUser":@"isFacebookUser", @"isFacebookUser":@"isFacebookUser",
@"registeredAt":@"registeredAt", @"registeredAt":@"registeredAt",
@"authenticated":@"authenticated"
}; };
return mapping; return mapping;
} }

9
Pod/Classes/PNObjectConfig.m
View File

@ -293,14 +293,7 @@ static bool isFirstAccess = YES;
[AFOAuthCredential storeCredential:_currentOauthCredential withIdentifier:PNObjectServiceCredentialIdentifier]; [AFOAuthCredential storeCredential:_currentOauthCredential withIdentifier:PNObjectServiceCredentialIdentifier];
[_manager.requestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthCredential]; [_manager.requestSerializer setAuthorizationHeaderFieldWithCredential:_currentOauthCredential];
PNUser *user = [PNUser currentUser];
[user setEmail:email];
[user setPassword:password];
[user setConfirmPassword:password];
[user saveLocally];
if (success) { if (success) {
success(YES); success(YES);
} }