Swapped out kFirebaseAuthProvider* string for FAuthProvider* enum, as it's more readable and promotes better language support.

Note, this is technically a backwards incompatible change, so we might want to put it in a separate version (or get it out before people start using 0.3.0).

Author: asciimike

FirebaseUI/Auth/API/FirebaseAuthConstants.h

@@ -36,20 +36,12 @@
 #ifndef FirebaseAuthConstants_h
 #define FirebaseAuthConstants_h
 
-FOUNDATION_EXPORT NSString *const kFWPRequestType;
-
-FOUNDATION_EXPORT NSString *const kTwitterAuthProvider;
 FOUNDATION_EXPORT NSString *const kTwitterApiKey;
 
-FOUNDATION_EXPORT NSString *const kFacebookAuthProvider;
 FOUNDATION_EXPORT NSString *const kFacebookAppId;
 FOUNDATION_EXPORT NSString *const kFacebookDisplayName;
 FOUNDATION_EXPORT NSString *const kFacebookEmailScope;
 
-FOUNDATION_EXPORT NSString *const kGoogleAuthProvider;
-
-FOUNDATION_EXPORT NSString *const kPasswordAuthProvider;
-
 FOUNDATION_EXPORT CGFloat const kHeaderWidth;
 FOUNDATION_EXPORT CGFloat const kHeaderHeight;
 FOUNDATION_EXPORT CGFloat const kHeaderSpace;
@@ -66,4 +58,11 @@ FOUNDATION_EXPORT CGFloat const kSeparatorWidth;
 FOUNDATION_EXPORT CGFloat const kSeparatorHeight;
 FOUNDATION_EXPORT CGFloat const kSeparatorSpace;
 
+typedef NS_ENUM(NSInteger, FAuthProvider) {
+  FAuthProviderFacebook,
+  FAuthProviderGoogle,
+  FAuthProviderTwitter,
+  FAuthProviderPassword
+};
+
 #endif /* FirebaseAuthConstants_h */

FirebaseUI/Auth/API/FirebaseAuthProvider.h

@@ -54,10 +54,10 @@
 @property(strong, nonatomic) FAuthData *authData;
 
 /**
- * A string which represents the chosen authentication provider.
+ * An enum which represents the chosen authentication provider.
  * See FAuthenticationConstants.h for a full list.
  */
-@property(strong, nonatomic) NSString *provider;
+@property(nonatomic) FAuthProvider provider;
 
 /**
  * FirebaseAuthDelegate delegate to handle all login, logout, and error events

FirebaseUI/Auth/API/FirebaseLoginButton.h

@@ -42,15 +42,15 @@
 @interface FirebaseLoginButton : UIButton
 
 /**
- * A string representing a valid identity provider (see FirebaseAuthConstants.h for a full list).
+ * An enum representing a valid identity provider (see FirebaseAuthConstants.h for a full list).
  */
-@property(strong, nonatomic) NSString *provider;
+@property(nonatomic) FAuthProvider provider;
 
 /**
  * Creates a button styled for the appropriate provider.
  * @param provider A string representing the desired identity provider to log in with
  * @return FirebaseLoginButton
  */
-- (instancetype)initWithProvider:(NSString *)provider;
+- (instancetype)initWithProvider:(FAuthProvider)provider;
 
 @end

FirebaseUI/Auth/API/FirebaseLoginViewController.h

@@ -162,10 +162,10 @@
 
 /**
  * Enables a given identity provider and allows for login and logout actions against it.
- * @param provider A string representing the desired identity provider to log in with
+ * @param provider An enum representing the desired identity provider to log in with
  * @return FirebaseLoginViewController
  */
-- (instancetype)enableProvider:(NSString *)provider;
+- (instancetype)enableProvider:(FAuthProvider)provider;
 
 /**
  * Callback that fires when after the controller is dismissed (either on success or on failure).

FirebaseUI/Auth/Implementation/FirebaseAuthConstants.m

@@ -32,18 +32,12 @@
 
 #import "FirebaseAuthConstants.h"
 
-NSString *const kTwitterAuthProvider = @"twitter";
 NSString *const kTwitterApiKey = @"TwitterApiKey";
 
-NSString *const kFacebookAuthProvider = @"facebook";
 NSString *const kFacebookAppId = @"FacebookAppID";
 NSString *const kFacebookDisplayName = @"FacebookDisplayName";
 NSString *const kFacebookEmailScope = @"email";
 
-NSString *const kGoogleAuthProvider = @"google";
-
-NSString *const kPasswordAuthProvider = @"password";
-
 CGFloat const kHeaderWidth = 258.0f;
 CGFloat const kHeaderHeight = 60.0f;
 CGFloat const kHeaderSpace = 10.0f;

FirebaseUI/Auth/Implementation/FirebaseFacebookAuthProvider.m

@@ -39,7 +39,7 @@ @implementation FirebaseFacebookAuthProvider {
 - (instancetype)initWithRef:(Firebase *)ref authDelegate:(id<FirebaseAuthDelegate>)authDelegate {
   self = [super initWithRef:ref authDelegate:authDelegate];
   if (self) {
-    self.provider = kFacebookAuthProvider;
+    self.provider = FAuthProviderFacebook;
     [self configureProvider];
   }
   return self;
@@ -77,7 +77,7 @@ - (void)login {
                            NSString *accessToken =
                                [[FBSDKAccessToken currentAccessToken] tokenString];
 
-                           [self.ref authWithOAuthProvider:kFacebookAuthProvider
+                           [self.ref authWithOAuthProvider:@"facebook"
                                                      token:accessToken
                                        withCompletionBlock:^(NSError *error, FAuthData *authData) {
                                          if (error) {

FirebaseUI/Auth/Implementation/FirebaseGoogleAuthProvider.m

@@ -39,7 +39,7 @@ - (instancetype)initWithRef:(Firebase *)ref
                  uiDelegate:(UIViewController<GIDSignInUIDelegate> *)uiDelegate {
   self = [super initWithRef:ref authDelegate:authDelegate];
   if (self) {
-    self.provider = kGoogleAuthProvider;
+    self.provider = FAuthProviderGoogle;
     [self configureProvider];
     [GIDSignIn sharedInstance].delegate = self;
     [GIDSignIn sharedInstance].uiDelegate = uiDelegate;
@@ -79,7 +79,7 @@ - (void)logout {
 - (void)signIn:(GIDSignIn *)signIn
     didSignInForUser:(GIDGoogleUser *)user
            withError:(NSError *)error {
-  [self.ref authWithOAuthProvider:kGoogleAuthProvider
+  [self.ref authWithOAuthProvider:@"google"
                             token:user.authentication.accessToken
               withCompletionBlock:^(NSError *error, FAuthData *authData) {
                 if (error) {

FirebaseUI/Auth/Implementation/FirebaseLoginButton.m

@@ -34,7 +34,7 @@
 
 @implementation FirebaseLoginButton
 
-- (instancetype)initWithProvider:(NSString *)provider {
+- (instancetype)initWithProvider:(FAuthProvider)provider {
   self = [super initWithFrame:CGRectZero];
   if (self) {
     self.provider = provider;
@@ -45,43 +45,63 @@ - (instancetype)initWithProvider:(NSString *)provider {
   return self;
 }
 
-- (UIColor *)backgroundColorForProvider:(NSString *)provider {
-  if ([provider isEqualToString:kGoogleAuthProvider]) {
-    return [UIColor colorWithRed:221.0f / 255.0f
-                           green:75.0f / 255.0f
-                            blue:57.0f / 255.0f
-                           alpha:255.0f / 255.0f];
-  } else if ([provider isEqualToString:kFacebookAuthProvider]) {
-    return [UIColor colorWithRed:59.0f / 255.0f
-                           green:89.0f / 255.0f
-                            blue:152.0f / 255.0f
-                           alpha:255.0f / 255.0f];
-  } else if ([provider isEqualToString:kTwitterAuthProvider]) {
-    return [UIColor colorWithRed:0.0f / 255.0f
-                           green:172.0f / 255.0f
-                            blue:237.0f / 255.0f
-                           alpha:255.0f / 255.0f];
-  } else if ([provider isEqualToString:kPasswordAuthProvider]) {
-    return [UIColor colorWithRed:22.0f / 255.0f
-                           green:150.0f / 255.0f
-                            blue:243.0f / 255.0f
-                           alpha:255.0f / 255.0f];
-  } else {
-    return [UIColor blackColor];
+- (UIColor *)backgroundColorForProvider:(FAuthProvider)provider {
+  switch (provider) {
+    case FAuthProviderFacebook:
+      return [UIColor colorWithRed:59.0f / 255.0f
+                             green:89.0f / 255.0f
+                              blue:152.0f / 255.0f
+                             alpha:255.0f / 255.0f];
+      break;
+
+    case FAuthProviderGoogle:
+      return [UIColor colorWithRed:221.0f / 255.0f
+                             green:75.0f / 255.0f
+                              blue:57.0f / 255.0f
+                             alpha:255.0f / 255.0f];
+      break;
+
+    case FAuthProviderTwitter:
+      return [UIColor colorWithRed:0.0f / 255.0f
+                             green:172.0f / 255.0f
+                              blue:237.0f / 255.0f
+                             alpha:255.0f / 255.0f];
+      break;
+
+    case FAuthProviderPassword:
+      return [UIColor colorWithRed:22.0f / 255.0f
+                             green:150.0f / 255.0f
+                              blue:243.0f / 255.0f
+                             alpha:255.0f / 255.0f];
+      break;
+
+    default:
+      return [UIColor blackColor];
+      break;
   }
 }
 
-- (NSString *)titleForProvider:(NSString *)provider {
-  if ([provider isEqualToString:kGoogleAuthProvider]) {
-    return @"Google";
-  } else if ([provider isEqualToString:kFacebookAuthProvider]) {
-    return @"Facebook";
-  } else if ([provider isEqualToString:kTwitterAuthProvider]) {
-    return @"Twitter";
-  } else if ([provider isEqualToString:kPasswordAuthProvider]) {
-    return @"Login";
-  } else {
-    return @"Unknown Provider";
+- (NSString *)titleForProvider:(FAuthProvider)provider {
+  switch (provider) {
+    case FAuthProviderFacebook:
+      return @"Facebook";
+      break;
+
+    case FAuthProviderGoogle:
+      return @"Google";
+      break;
+
+    case FAuthProviderTwitter:
+      return @"Twitter";
+      break;
+
+    case FAuthProviderPassword:
+      return @"Log In";
+      break;
+
+    default:
+      return @"Unknown Provider";
+      break;
   }
 }
 

FirebaseUI/Auth/Implementation/FirebaseLoginViewController.m

@@ -51,6 +51,12 @@ - (instancetype)initWithRef:(Firebase *)ref;
 - (void)viewDidLoad {
   [super viewDidLoad];
 
+  // Throw an exception if no IDPs are enabled
+  if (self.passwordAuthProvider == nil && [_socialProviders count] == 0) {
+    [NSException raise:NSInternalInconsistencyException
+                format:@"Please enable at least one authentication provider in your FirebaseLoginViewController"];
+  }
+
   // Add cancel button
   UIImage *image = [[UIImage imageNamed:@"ic_clear_18pt"]
       imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
@@ -61,22 +67,15 @@ - (void)viewDidLoad {
                         action:@selector(cancelButtonPressed)
               forControlEvents:UIControlEventTouchUpInside];
 
-  // If we're already logged in, cancel this
+  // If we're already logged in, dismiss the view controller and return the currently logged in user
   if (_selectedAuthProvider) {
     [self dismissViewControllerWithUser:self.currentUser andError:nil];
   }
 
-  if (self.passwordAuthProvider == nil && [_socialProviders count] == 0) {
-    NSError *error = [[NSError alloc] initWithDomain:NSStringFromClass(self.class)
-                                                code:FAuthenticationErrorInvalidConfiguration
-                                            userInfo:nil];
-    [self dismissViewControllerWithUser:nil andError:error];
-  }
-
   // Populate email/password view
   if (self.passwordAuthProvider != nil) {
     FirebaseLoginButton *emailLoginButton =
-        [[FirebaseLoginButton alloc] initWithProvider:kPasswordAuthProvider];
+        [[FirebaseLoginButton alloc] initWithProvider:FAuthProviderPassword];
     CGRect buttonFrame =
         CGRectMake(0, 2 * kTextFieldHeight + 2 * kTextFieldSpace, kButtonWidth, kButtonHeight);
     emailLoginButton.frame = buttonFrame;
@@ -98,7 +97,7 @@ - (void)viewDidLoad {
   NSUInteger numProviders = [_socialProviders count];
   if (numProviders == 0) {
     [self.socialView removeFromSuperview];
-    self.totalHeightConstraint.constant -= (3 * kButtonHeight + 2 * kButtonSpace);
+    self.totalHeightConstraint.constant -= (3 * kButtonHeight + 3 * kButtonSpace);
   } else {
     // Add buttons to social view
     CGRect buttonFrame = CGRectMake(0, 0, kButtonWidth, kButtonHeight);
@@ -129,31 +128,44 @@ - (void)viewDidLoad {
   [self.view layoutIfNeeded];
 }
 
-- (instancetype)enableProvider:(NSString *)provider {
-  if ([provider isEqualToString:kGoogleAuthProvider]) {
-    if (!self.googleAuthProvider) {
-      self.googleAuthProvider =
-          [[FirebaseGoogleAuthProvider alloc] initWithRef:self.ref authDelegate:self uiDelegate:self];
-      [_socialProviders addObject:self.googleAuthProvider];
-    }
-  } else if ([provider isEqualToString:kFacebookAuthProvider]) {
-    if (!self.facebookAuthProvider) {
-      self.facebookAuthProvider =
-          [[FirebaseFacebookAuthProvider alloc] initWithRef:self.ref authDelegate:self];
-      [_socialProviders addObject:self.facebookAuthProvider];
-    }
-  } else if ([provider isEqualToString:kTwitterAuthProvider]) {
-    if (!self.twitterAuthProvider) {
-      self.twitterAuthProvider = [[FirebaseTwitterAuthProvider alloc] initWithRef:self.ref
-                                                                 authDelegate:self
-                                                              twitterDelegate:self];
-      [_socialProviders addObject:self.twitterAuthProvider];
-    }
-  } else if ([provider isEqualToString:kPasswordAuthProvider]) {
-    if (!self.passwordAuthProvider) {
-      self.passwordAuthProvider =
-          [[FirebasePasswordAuthProvider alloc] initWithRef:self.ref authDelegate:self];
-    }
+- (instancetype)enableProvider:(FAuthProvider)provider {
+  switch (provider) {
+    case FAuthProviderFacebook:
+      if (!self.facebookAuthProvider) {
+        self.facebookAuthProvider =
+        [[FirebaseFacebookAuthProvider alloc] initWithRef:self.ref authDelegate:self];
+        [_socialProviders addObject:self.facebookAuthProvider];
+      }
+      break;
+
+    case FAuthProviderGoogle:
+      if (!self.googleAuthProvider) {
+        self.googleAuthProvider =
+        [[FirebaseGoogleAuthProvider alloc] initWithRef:self.ref authDelegate:self uiDelegate:self];
+        [_socialProviders addObject:self.googleAuthProvider];
+      }
+      break;
+
+    case FAuthProviderTwitter:
+      if (!self.twitterAuthProvider) {
+        self.twitterAuthProvider = [[FirebaseTwitterAuthProvider alloc] initWithRef:self.ref
+                                                                       authDelegate:self
+                                                                    twitterDelegate:self];
+        [_socialProviders addObject:self.twitterAuthProvider];
+      }
+      break;
+
+    case FAuthProviderPassword:
+      if (!self.passwordAuthProvider) {
+        self.passwordAuthProvider =
+        [[FirebasePasswordAuthProvider alloc] initWithRef:self.ref authDelegate:self];
+      }
+      break;
+
+    default:
+      [NSException raise:NSInternalInconsistencyException
+                  format:@"Cannot enable non-existent provider!"];
+      break;
   }
   return self;
 }
@@ -165,17 +177,27 @@ - (void)didDismissWithBlock:(void (^)(FAuthData *user, NSError *error))callback
 - (void)loginButtonPressed:(id)button {
   if ([button isKindOfClass:[FirebaseLoginButton class]]) {
     FirebaseLoginButton *loginButton = (FirebaseLoginButton *)button;
-    if ([loginButton.provider isEqualToString:kGoogleAuthProvider]) {
-      [self.googleAuthProvider login];
-    } else if ([loginButton.provider isEqualToString:kFacebookAuthProvider]) {
-      [self.facebookAuthProvider login];
-    } else if ([loginButton.provider isEqualToString:kTwitterAuthProvider]) {
-      [self.twitterAuthProvider login];
-    } else if ([loginButton.provider isEqualToString:kPasswordAuthProvider]) {
-      // We assume that if it wasn't a social provider, it was for email/password
-      NSString *email = self.emailTextField.text;
-      NSString *password = self.passwordTextField.text;
-      [self.passwordAuthProvider loginWithEmail:email andPassword:password];
+    switch (loginButton.provider) {
+      case FAuthProviderFacebook:
+        [self.facebookAuthProvider login];
+        break;
+
+      case FAuthProviderGoogle:
+        [self.googleAuthProvider login];
+        break;
+
+      case FAuthProviderTwitter:
+        [self.twitterAuthProvider login];
+        break;
+
+      case FAuthProviderPassword:
+        [self.passwordAuthProvider loginWithEmail:self.emailTextField.text andPassword:self.passwordTextField.text];
+        break;
+
+      default:
+        [NSException raise:NSInternalInconsistencyException
+                    format:@"Cannot log in using non-existent provider!"];
+        break;
     }
   }
 }