Merge pull request #72 from nemesis/login_refresh_patch

Fix plain login refresh response serializing
saltedge · Oct 19, 2016 · 6907a66 · 6907a66
2 parents 1dfb540 + 54c8083
commit 6907a66
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/Classes/API/SEAPIRequestManager.h b/Classes/API/SEAPIRequestManager.h
@@ -413,7 +413,7 @@ typedef NS_ENUM(NSUInteger, SEAPIRequestManagerSSLPinningMode) {
  @see https://docs.saltedge.com/reference/#logins-refresh
  */
 - (void)refreshLoginWithSecret:(NSString*)loginSecret
-                       success:(void (^)(NSDictionary* responseObject))success
+                       success:(void (^)(SELogin* login))success
                        failure:(SEAPIRequestFailureBlock)failure
                       delegate:(id<SELoginFetchingDelegate>)delegate;
 

diff --git a/Classes/API/SEAPIRequestManager.m b/Classes/API/SEAPIRequestManager.m
@@ -473,7 +473,7 @@ - (void)reconnectOAuthLoginWithSecret:(NSString*)loginSecret
 }
 
 - (void)refreshLoginWithSecret:(NSString*)loginSecret
-                       success:(void (^)(NSDictionary* responseObject))success
+                       success:(void (^)(SELogin* login))success
                        failure:(SEAPIRequestFailureBlock)failure
                       delegate:(id<SELoginFetchingDelegate>)delegate
 {
@@ -486,10 +486,9 @@ - (void)refreshLoginWithSecret:(NSString*)loginSecret
                                  parameters:nil
                                     headers:[self sessionHeadersWithLoginSecret:loginSecret]
                                     success:^(NSDictionary* responseObject) {
-                                        if (success) {
-                                            success(responseObject);
-                                        }
-                                        if (![responseObject[kDataKey][kRefreshedKey] boolValue]) { return; }
+                                        if (!success) { return; }
+                                        SELogin* fetchedLogin = [SELogin objectFromDictionary:responseObject[kDataKey]];
+                                        success(fetchedLogin);
                                         self.loginFetchingDelegate = delegate;
                                         if ([self isLoginFetchingDelegateSuitableForDelegation]) {
                                             [self pollLoginWithSecret:loginSecret];

diff --git a/Salt Edge API Demo/Controllers/AccountsTVC.m b/Salt Edge API Demo/Controllers/AccountsTVC.m
@@ -121,10 +121,8 @@ - (void)refreshCurrentLoginViaAPI
     SEAPIRequestManager* manager = [SEAPIRequestManager manager];
     if (!self.loginsProvider.isOAuth) {
         [manager refreshLoginWithSecret:self.login.secret
-                                    success:^(NSDictionary* dictionary) {
-                                        if (![dictionary[kDataKey][kRefreshedKey] boolValue]) {
-                                            [SVProgressHUD showErrorWithStatus:@"Could not refresh login."];
-                                        }
+                                    success:^(SELogin* login) {
+                                        // Nothing here. Need to wait for SELoginFetchingDelegate callbacks
                                     }
                                     failure:^(SEError* error) {
                                         [SVProgressHUD showErrorWithStatus:error.errorMessage];