Better error handling in Facebook providers.

calebd · Oct 2, 2014 · 9af954c · 9af954c
1 parent 04e99aa
commit 9af954c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/Providers/Facebook/SimpleAuthFacebookProvider.m b/Providers/Facebook/SimpleAuthFacebookProvider.m
@@ -83,11 +83,22 @@ - (RACSignal *)remoteAccountWithSystemAccount:(ACAccount *)account {
                     [subscriber sendCompleted];
                 }
                 else {
-                    [subscriber sendError:parseError];
+                    NSMutableDictionary *dictionary = [NSMutableDictionary new];
+                    if (parseError) {
+                        dictionary[NSUnderlyingErrorKey] = parseError;
+                    }
+                    NSError *error = [NSError errorWithDomain:SimpleAuthErrorDomain code:SimpleAuthErrorInvalidData userInfo:dictionary];
+                    [subscriber sendNext:error];
                 }
             }
             else {
-                [subscriber sendError:connectionError];
+                NSMutableDictionary *dictionary = [NSMutableDictionary new];
+                if (connectionError) {
+                    dictionary[NSUnderlyingErrorKey] = connectionError;
+                }
+                dictionary[SimpleAuthErrorStatusCodeKey] = @(statusCode);
+                NSError *error = [NSError errorWithDomain:SimpleAuthErrorDomain code:SimpleAuthErrorNetwork userInfo:dictionary];
+                [subscriber sendError:error];
             }
         }];
         return nil;

diff --git a/Providers/FacebookWeb/SimpleAuthFaceBookWebProvider.m b/Providers/FacebookWeb/SimpleAuthFaceBookWebProvider.m
@@ -107,8 +107,7 @@ - (RACSignal *)accountWithAccessToken:(NSDictionary *)accessToken {
                                [CMDQueryStringSerialization queryStringWithDictionary:parameters]];
         NSURL *URL = [NSURL URLWithString:URLString];
         NSURLRequest *request = [NSURLRequest requestWithURL:URL];
-        [NSURLConnection sendAsynchronousRequest:request queue:self.operationQueue
-         completionHandler:^(NSURLResponse *response, NSData *data, NSError *connectionError) {
+        [NSURLConnection sendAsynchronousRequest:request queue:self.operationQueue completionHandler:^(NSURLResponse *response, NSData *data, NSError *connectionError) {
              NSIndexSet *indexSet = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(200, 99)];
              NSInteger statusCode = [(NSHTTPURLResponse *)response statusCode];
              if ([indexSet containsIndex:statusCode] && data) {
@@ -119,11 +118,22 @@ - (RACSignal *)accountWithAccessToken:(NSDictionary *)accessToken {
                      [subscriber sendCompleted];
                  }
                  else {
-                     [subscriber sendError:parseError];
+                     NSMutableDictionary *dictionary = [NSMutableDictionary new];
+                     if (parseError) {
+                         dictionary[NSUnderlyingErrorKey] = parseError;
+                     }
+                     NSError *error = [NSError errorWithDomain:SimpleAuthErrorDomain code:SimpleAuthErrorInvalidData userInfo:dictionary];
+                     [subscriber sendNext:error];
                  }
              }
              else {
-                 [subscriber sendError:connectionError];
+                 NSMutableDictionary *dictionary = [NSMutableDictionary new];
+                 if (connectionError) {
+                     dictionary[NSUnderlyingErrorKey] = connectionError;
+                 }
+                 dictionary[SimpleAuthErrorStatusCodeKey] = @(statusCode);
+                 NSError *error = [NSError errorWithDomain:SimpleAuthErrorDomain code:SimpleAuthErrorNetwork userInfo:dictionary];
+                 [subscriber sendError:error];
              }
          }];
         return nil;