Add better handling for Twitter provider.

Author: calebd

Providers/Twitter/SimpleAuthTwitterProvider.m

@@ -134,7 +134,13 @@ - (RACSignal *)reverseAuthRequestToken {
                  [subscriber sendCompleted];
              }
              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;
@@ -165,11 +171,22 @@ - (RACSignal *)remoteAccountWithSystemAccount:(ACAccount *)account {
                     [subscriber sendCompleted];
                 }
                 else {
-                    [subscriber sendNext: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;
@@ -196,7 +213,13 @@ - (RACSignal *)accessTokenWithReverseAuthRequestToken:(NSString *)token account:
                 [subscriber sendCompleted];
             }
             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;

SimpleAuth/ACAccountStore+SimpleAuth.m

@@ -6,6 +6,7 @@
 //  Copyright (c) 2014 Seesaw Decisions Corporation. All rights reserved.
 //
 
+#import "SimpleAuth.h"
 #import "ACAccountStore+SimpleAuth.h"
 #import <ReactiveCocoa/ReactiveCocoa.h>
 
@@ -25,20 +26,28 @@ + (RACSignal *)SimpleAuth_accountsWithTypeIdentifier:(NSString *)typeIdentifier
     return [RACSignal createSignal:^RACDisposable *(id<RACSubscriber> subscriber) {
         ACAccountStore *store = [self SimpleAuth_sharedAccountStore];
         ACAccountType *type = [store accountTypeWithAccountTypeIdentifier:typeIdentifier];
-        [store requestAccessToAccountsWithType:type options:options completion:^(BOOL granted, NSError *error) {
+        [store requestAccessToAccountsWithType:type options:options completion:^(BOOL granted, NSError *accountsError) {
             if (granted) {
                 NSArray *accounts = [store accountsWithAccountType:type];
                 NSUInteger numberOfAccounts = [accounts count];
                 if (numberOfAccounts == 0) {
-                    [subscriber sendError:(error ?: [[NSError alloc] initWithDomain:ACErrorDomain code:ACErrorAccountNotFound userInfo:nil])];
+                    NSDictionary *dictionary = @{
+                        NSUnderlyingErrorKey: accountsError ?: [[NSError alloc] initWithDomain:ACErrorDomain code:ACErrorAccountNotFound userInfo:nil]
+                    };
+                    NSError *error = [NSError errorWithDomain:SimpleAuthErrorDomain code:SimpleAuthErrorAccounts userInfo:dictionary];
+                    [subscriber sendError:error];
                 }
                 else {
                     [subscriber sendNext:accounts];
                     [subscriber sendCompleted];
                 }
             }
             else {
-                [subscriber sendError:(error ?: [[NSError alloc] initWithDomain:ACErrorDomain code:ACErrorPermissionDenied userInfo:nil])];
+                NSDictionary *dictionary = @{
+                    NSUnderlyingErrorKey: accountsError ?: [[NSError alloc] initWithDomain:ACErrorDomain code:ACErrorPermissionDenied userInfo:nil]
+                };
+                NSError *error = [NSError errorWithDomain:SimpleAuthErrorDomain code:SimpleAuthErrorAccounts userInfo:dictionary];
+                [subscriber sendError:error];
             }
         }];
         return nil;

SimpleAuth/SimpleAuth.h

@@ -7,8 +7,28 @@
 //
 
 extern NSString * const SimpleAuthErrorDomain;
-enum {
-    SimpleAuthErrorUserCancelled
+extern NSString * const SimpleAuthErrorStatusCodeKey;
+typedef NS_ENUM(NSUInteger, SimpleAuthError) {
+    
+    /**
+     The user cancelled authentication.
+     */
+    SimpleAuthErrorUserCancelled,
+    
+    /*
+     An error that occurred as the result of a failed network operation.
+     */
+    SimpleAuthErrorNetwork,
+    
+    /**
+     An error that originated in Accounts.framework.
+     */
+    SimpleAuthErrorAccounts,
+    
+    /**
+     Returned if SimpleAuth was able to parse response data.
+     */
+    SimpleAuthErrorInvalidData
 };
 
 /**

SimpleAuth/SimpleAuth.m

@@ -19,6 +19,7 @@
 NSString * const SimpleAuthPresentInterfaceBlockKey = @"present_interface_block";
 NSString * const SimpleAuthDismissInterfaceBlockKey = @"dismiss_interface_block";
 NSString * const SimpleAuthRedirectURIKey = @"redirect_uri";
+NSString * const SimpleAuthErrorStatusCodeKey = @"SimpleAuthErrorStatusCode";
 
 static SimpleAuthProvider *__currentProvider = nil;