From d59d4462857c743ae49c0422d57a7390e7fd4d67 Mon Sep 17 00:00:00 2001 From: Giuseppe Nucifora Date: Mon, 15 Feb 2016 16:51:22 +0100 Subject: [PATCH] no message --- Example/PNObject/PNObjectViewController.m | 20 ++++++++++---------- Pod/Classes/PNClasses/PNUser.h | 2 +- Pod/Classes/PNClasses/PNUser.m | 14 ++++++++------ 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/Example/PNObject/PNObjectViewController.m b/Example/PNObject/PNObjectViewController.m index 4b2f121..dcf3247 100644 --- a/Example/PNObject/PNObjectViewController.m +++ b/Example/PNObject/PNObjectViewController.m @@ -118,11 +118,11 @@ NSLog(@"%@",[user JSONFormObject]); //NSLog(@"%@",[user JSONObjectMap]); - [user registerWithBlockSuccess:^(PNUser * _Nullable responseObject) { + /*[user registerWithBlockSuccess:^(PNUser * _Nullable responseObject) { } failure:^(NSError * _Nonnull error) { - }]; + }];*/ /*[[User currentUser] socialLoginWithBlockSuccessFromViewController:self blockSuccess:^(PNUser * _Nullable responseObject) { @@ -131,17 +131,17 @@ }];*/ - /*User * user = [User currentUser]; + //User * user = [User currentUser]; - if ([user isAuthenticated]) { + //if ([user isAuthenticated]) { - [user loginCurrentUserWithEmail:@"packman@giuseppenucifora.com" password:@"asdasdasd" withBlockSuccess:^(PNUser * _Nullable responseObject) { + [User loginCurrentUserWithEmail:@"packman@giuseppenucifora.com" password:@"asdasdasd" withBlockSuccess:^(PNUser * _Nullable responseObject) { + + NSLog(@"response : %@",responseObject); + } failure:^(NSError * _Nonnull error) { + NSLog(@"response : %@",error); + }]; - NSLog(@"response : %@",responseObject); - } failure:^(NSError * _Nonnull error) { - NSLog(@"response : %@",error); - }]; - }*/ } - (void)didReceiveMemoryWarning diff --git a/Pod/Classes/PNClasses/PNUser.h b/Pod/Classes/PNClasses/PNUser.h index b7425e4..9253b42 100644 --- a/Pod/Classes/PNClasses/PNUser.h +++ b/Pod/Classes/PNClasses/PNUser.h @@ -54,7 +54,7 @@ * @param success <#success description#> * @param failure <#failure description#> */ -- (void) loginCurrentUserWithEmail:(NSString * _Nonnull) email ++ (void) loginCurrentUserWithEmail:(NSString * _Nonnull) email password:(NSString * _Nonnull) password withBlockSuccess:(nullable void (^)(PNUser * _Nullable responseObject))success failure:(nullable void (^)(NSError * _Nonnull error))failure; diff --git a/Pod/Classes/PNClasses/PNUser.m b/Pod/Classes/PNClasses/PNUser.m index 042367b..0b4f9bb 100644 --- a/Pod/Classes/PNClasses/PNUser.m +++ b/Pod/Classes/PNClasses/PNUser.m @@ -259,24 +259,26 @@ static bool isFirstAccess = YES; }];*/ } -- (void) loginCurrentUserWithEmail:(NSString * _Nonnull) email ++ (void) loginCurrentUserWithEmail:(NSString * _Nonnull) email password:(NSString * _Nonnull) password withBlockSuccess:(nullable void (^)(PNUser * _Nullable responseObject))success failure:(nullable void (^)(NSError * _Nonnull error))failure { [[PNObjectConfig sharedInstance] refreshTokenForUserWithEmail:email password:password withBlockSuccess:^(BOOL refreshSuccess) { if (refreshSuccess) { + PNUser *user = [[self class] new]; + PNObjcPassword *objectPassword = [PNObjcPassword new]; [objectPassword setPassword:password]; [objectPassword setConfirmPassword:password]; - [self setAuthenticated:YES]; - [self setEmail:email]; - [self setPassword:objectPassword]; - [self saveLocally]; + [user setAuthenticated:YES]; + [user setEmail:email]; + [user setPassword:objectPassword]; + [user saveLocally]; if (success) { - success(self); + success(user); } } } failure:failure];