Merge branch 'v0.6.2' of github.com:firebase/FirebaseUI-iOS into v0.6.2

Author: morganchen12

FirebaseAuthUI/FIRAuthUI.h

@@ -132,6 +132,20 @@ typedef void (^FIRAuthUIResultCallback)(FIRUser *_Nullable user, NSError *_Nulla
  */
 - (UIViewController *)authViewController;
 
+
+/** @fn signOut:
+ @brief Signs out the current user from Firbase and all providers.
+ @param error Optionally; if an error occurs during Firebase signout, upon return contains an 
+ NSError object that describes the problem; is nil otherwise. If Firebase error occurs all providers
+ are not logged-out and sign-out should be retried.
+ @return @YES when the sign out request was successful. @NO otherwise.
+ @remarks Possible error codes:
+ - @c FIRAuthErrorCodeKeychainError Indicates an error occurred when accessing the keychain.
+ The @c NSLocalizedFailureReasonErrorKey field in the @c NSError.userInfo dictionary
+ will contain more information about the error encountered.
+ */
+- (BOOL)signOut:(NSError *_Nullable *_Nullable)error;
+
 @end
 
 NS_ASSUME_NONNULL_END

FirebaseAuthUI/FIRAuthUI.m

@@ -101,6 +101,19 @@ - (UIViewController *)authViewController {
   return [[UINavigationController alloc] initWithRootViewController:controller];
 }
 
+- (BOOL)signOut:(NSError *_Nullable *_Nullable)error {
+  // sign out from Firebase
+  BOOL success = [self.auth signOut:error];
+  if (!error && success) {
+    // sign out from all providers (wipes provider tokens too)
+    for (id<FIRAuthProviderUI> provider in _providers) {
+      [provider signOut];
+    }
+  }
+
+  return success;
+}
+
 #pragma mark - Internal Methods
 
 - (void)invokeResultCallbackWithUser:(FIRUser *_Nullable)user error:(NSError *_Nullable)error {

samples/objc/FirebaseUI-demo-objc/Samples/Auth/FIRAuthViewController.m

@@ -174,18 +174,11 @@ - (NSString *)getAllIdTokens {
 }
 
 - (void)signOut {
-  // sign out from Firebase
   NSError *error;
-  [self.auth signOut:&error];
+  [self.authUI signOut:&error];
   if (error) {
     [self showAlert:error.localizedDescription];
   }
-
-  // sign out from all providers (wipes provider tokens too)
-  for (id<FIRAuthProviderUI> provider in _authUI.providers) {
-    [provider signOut];
-  }
-
 }
 
 - (void)showAlert:(NSString *)message {

samples/swift/FirebaseUI-demo-swift/Samples/Auth/FIRAuthViewController.swift

@@ -80,18 +80,14 @@ class FIRAuthViewController: UITableViewController {
   @IBAction func onAuthorize(_ sender: AnyObject) {
     if (self.auth?.currentUser) != nil {
       do {
-        try self.auth?.signOut()
+        try self.authUI?.signOut()
       } catch let error {
         // Again, fatalError is not a graceful way to handle errors.
         // This error is most likely a network error, so retrying here
         // makes sense.
         fatalError("Could not sign out: \(error)")
       }
 
-      for provider in self.authUI!.providers {
-        provider.signOut()
-      }
-
     } else {
       let controller = self.authUI!.authViewController()
       self.present(controller, animated: true, completion: nil)