SwiftFormat update

FirebaseAuth/Sources/Swift/Auth/Auth.swift

@@ -14,10 +14,10 @@
 
 import Foundation
 
-import FirebaseCore
-import FirebaseCoreExtension
 import FirebaseAppCheckInterop
 import FirebaseAuthInterop
+import FirebaseCore
+import FirebaseCoreExtension
 #if COCOAPODS
   @_implementationOnly import GoogleUtilities
 #else
@@ -385,8 +385,8 @@ extension Auth: AuthInterop {
    @remarks This is the internal counterpart of this method, which uses a callback that does not
    update the current user.
    */
-  internal func internalSignInUser(withEmail email: String,
-                                   password: String) async throws -> User {
+  func internalSignInUser(withEmail email: String,
+                          password: String) async throws -> User {
     let request = VerifyPasswordRequest(email: email,
                                         password: password,
                                         requestConfiguration: requestConfiguration)
@@ -1969,7 +1969,7 @@ extension Auth: AuthInterop {
     objc_sync_exit(Auth.self)
   }
 
-  internal func signOutByForce(withUserID userID: String) throws {
+  func signOutByForce(withUserID userID: String) throws {
     guard currentUser?.uid == userID else {
       return
     }
@@ -2177,8 +2177,8 @@ extension Auth: AuthInterop {
                                                    isReauthentication: false)
   }
 
-  internal func internalSignInAndRetrieveData(withCredential credential: AuthCredential,
-                                              isReauthentication: Bool) async throws
+  func internalSignInAndRetrieveData(withCredential credential: AuthCredential,
+                                     isReauthentication: Bool) async throws
     -> AuthDataResult {
     if let emailCredential = credential as? EmailAuthCredential {
       // Special case for email/password credentials
@@ -2488,13 +2488,13 @@ extension Auth: AuthInterop {
   /** @property mainBundle
       @brief Allow tests to swap in an alternate mainBundle.
    */
-  internal var mainBundleUrlTypes: [[String: Any]]!
+  var mainBundleUrlTypes: [[String: Any]]!
 
   /** @property requestConfiguration
       @brief The configuration object comprising of parameters needed to make a request to Firebase
           Auth's backend.
    */
-  internal var requestConfiguration: AuthRequestConfiguration
+  var requestConfiguration: AuthRequestConfiguration
 
   #if os(iOS)
     /** @property tokenManager

FirebaseAuth/Sources/Swift/Auth/AuthComponent.swift

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Foundation
 import FirebaseAppCheckInterop
 import FirebaseCore
 import FirebaseCoreExtension
+import Foundation
 
 @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
 @objc(FIRAuthProvider) protocol AuthProvider {

FirebaseAuth/Sources/Swift/Auth/AuthGlobalWorkQueue.swift

@@ -14,4 +14,4 @@
 
 import Foundation
 
-internal let kAuthGlobalWorkQueue = DispatchQueue(label: "com.google.firebase.auth.globalWorkQueue")
+let kAuthGlobalWorkQueue = DispatchQueue(label: "com.google.firebase.auth.globalWorkQueue")

FirebaseAuth/Sources/Swift/AuthProvider/OAuthProvider.swift

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Foundation
 import CommonCrypto
+import Foundation
 
 /**
  @brief Utility class for constructing OAuth Sign In credentials.

FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Foundation
 import FirebaseCore
+import Foundation
 
 /**
  @brief A concrete implementation of `AuthProvider` for phone auth providers.

FirebaseAuth/Sources/Swift/Backend/AuthBackend.swift

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Foundation
 import FirebaseCore
 import FirebaseCoreExtension
 import FirebaseCoreInternal
+import Foundation
 #if COCOAPODS
   import GTMSessionFetcher
 #else

FirebaseAuth/Sources/Swift/Backend/AuthRequestConfiguration.swift

@@ -14,10 +14,10 @@
 
 import Foundation
 
+import FirebaseAppCheckInterop
 // TODO: Investigate how to directly depend on FIRHeartbeatLogger instead of using a protocol so
 // FirebaseCoreExtension can be an implementation only protocol.
 import FirebaseCoreExtension
-import FirebaseAppCheckInterop
 
 /** @class FIRAuthRequestConfiguration
    @brief Defines configurations to be added to a request to Firebase Auth's backend.

FirebaseAuth/Sources/Swift/Storage/AuthKeychainServices.swift

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Foundation
 import FirebaseCoreExtension
+import Foundation
 
 /** @var kAccountPrefix
     @brief The prefix string for keychain item account attribute before the key.

FirebaseAuth/Sources/Swift/User/User.swift

@@ -1999,7 +1999,7 @@ extension User: NSSecureCoding {}
       @param callback The callback to be called in main thread.
       @param error The error to pass to callback.
    */
-  internal class func callInMainThreadWithError(callback: ((Error?) -> Void)?, error: Error?) {
+  class func callInMainThreadWithError(callback: ((Error?) -> Void)?, error: Error?) {
     if let callback {
       DispatchQueue.main.async {
         callback(error)

FirebaseAuth/Sources/Swift/Utilities/AuthLog.swift

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Foundation
 import FirebaseCoreExtension
+import Foundation
 
 enum AuthLog {
   static func logInfo(code: String, message: String) {

FirebaseAuth/Sources/Swift/Utilities/AuthURLPresenter.swift

@@ -15,9 +15,9 @@
 #if os(iOS)
 
   import Foundation
+  import SafariServices
   import UIKit
   import WebKit
-  import SafariServices
 
   /** @class AuthURLPresenter
       @brief A Class responsible for presenting URL via SFSafariViewController or WKWebView.

FirebaseAuth/Tests/SampleSwift/AuthenticationExample/AppDelegate.swift

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import UIKit
-import FirebaseCore
 import FBSDKCoreKit
+import FirebaseCore
 import GoogleSignIn
+import UIKit
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {

FirebaseAuth/Tests/SampleSwift/AuthenticationExample/AppManager.swift

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import UIKit
 @testable import FirebaseAuth
 import FirebaseCore
+import UIKit
 
 /// Manage FirebaseApp instances for the Sample app
 

FirebaseAuth/Tests/SampleSwift/AuthenticationExample/SceneDelegate.swift

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import UIKit
-import FirebaseDynamicLinks
 import FirebaseAuth
+import FirebaseDynamicLinks
+import UIKit
 
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
   var window: UIWindow?

FirebaseAuth/Tests/SampleSwift/AuthenticationExample/Utility/CryptoUtils.swift

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Foundation
 import CryptoKit
+import Foundation
 
 /// Set of utility APIs for generating cryptographical artifacts.
 enum CryptoUtils {

FirebaseAuth/Tests/SampleSwift/AuthenticationExample/Utility/Extensions.swift

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import UIKit
 import FirebaseAuth
+import UIKit
 
 // MARK: - Extending a `Firebase User` to conform to `DataSourceProvidable`
 

FirebaseAuth/Tests/SampleSwift/AuthenticationExample/ViewControllers/AccountLinkingViewController.swift

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import UIKit
-import FirebaseCore
 import FirebaseAuth
+import FirebaseCore
+import UIKit
 
 // For Account Linking with Sign in with Google.
 import GoogleSignIn

FirebaseAuth/Tests/SampleSwift/AuthenticationExample/ViewControllers/AuthViewController.swift

@@ -12,19 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import UIKit
+// For Sign in with Facebook
+import FBSDKLoginKit
+import FirebaseAuth
 // [START auth_import]
 import FirebaseCore
-import FirebaseAuth
-// [END auth_import]
-
 // For Sign in with Google
 // [START google_import]
 import GoogleSignIn
-// [END google_import]
-
-// For Sign in with Facebook
-import FBSDKLoginKit
+import UIKit
 
 // For Sign in with Apple
 import AuthenticationServices

FirebaseAuth/Tests/SampleSwift/AuthenticationExample/ViewControllers/LoginController.swift

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import UIKit
 import FirebaseAuth
+import UIKit
 
 class LoginController: UIViewController {
   weak var delegate: LoginDelegate?

FirebaseAuth/Tests/SampleSwift/AuthenticationExample/ViewControllers/OtherAuthMethodControllers/CustomAuthViewController.swift

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import UIKit
 import FirebaseAuth
+import UIKit
 
 class CustomAuthViewController: OtherAuthViewController {
   override func viewDidLoad() {

FirebaseAuth/Tests/SampleSwift/AuthenticationExample/ViewControllers/OtherAuthMethodControllers/PasswordlessViewController.swift

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import UIKit
 import FirebaseAuth
+import UIKit
 
 class PasswordlessViewController: OtherAuthViewController {
   private var email: String!

FirebaseAuth/Tests/SampleSwift/AuthenticationExample/ViewControllers/OtherAuthMethodControllers/PhoneAuthViewController.swift

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import UIKit
 import FirebaseAuth
+import UIKit
 
 class PhoneAuthViewController: OtherAuthViewController {
   override func viewDidLoad() {

FirebaseAuth/Tests/SampleSwift/AuthenticationExample/ViewControllers/SettingsViewController.swift

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import UIKit
 @testable import FirebaseAuth
 import FirebaseCore
+import UIKit
 
 /// Namespace for performable actions on a Auth Settings view
 enum SettingsAction: String {

FirebaseAuth/Tests/SampleSwift/AuthenticationExample/ViewControllers/UserViewController.swift

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import UIKit
-import FirebaseAuth
 import AuthenticationServices
 import CryptoKit
+import FirebaseAuth
+import UIKit
 
 class UserViewController: UIViewController, DataSourceProviderDelegate {
   var dataSourceProvider: DataSourceProvider<User>!

FirebaseAuth/Tests/SampleSwift/SwiftApiTests/PhoneMultiFactorTests.swift

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import XCTest
 import FirebaseAuth
+import XCTest
 
 let kNoSecondFactorUserEmail = "[email protected]"
 let kNoSecondFactorUserPassword = "aaaaaa"

FirebaseAuth/Tests/Unit/AuthKeychainServicesTests.swift

@@ -29,7 +29,7 @@ class AuthKeychainServicesTests: XCTestCase {
   static let otherData = "OTHER_DATA"
 
   static var account: String {
-    Self.accountPrefix + Self.key
+    accountPrefix + key
   }
 
   var keychain: AuthKeychainServices!

FirebaseAuth/Tests/Unit/AuthProviderIDTests.swift

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import FirebaseAuth
 import Foundation
 import XCTest
-import FirebaseAuth
 
 @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
 final class AuthProviderIDTests: XCTestCase {

FirebaseAuth/Tests/Unit/AuthURLPresenterTests.swift

@@ -17,8 +17,8 @@
   import Foundation
   import XCTest
 
-  import FirebaseCore
   @testable import FirebaseAuth
+  import FirebaseCore
   import SafariServices
 
   @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)

FirebaseAuth/Tests/Unit/Fakes/FakeAppCheck.swift

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Foundation
-@testable import FirebaseAuth
 import FirebaseAppCheckInterop
+@testable import FirebaseAuth
+import Foundation
 
 class FakeAppCheck: NSObject, AppCheckInterop {
   let fakeAppCheckToken = "fakeAppCheckToken"

FirebaseAuth/Tests/Unit/Fakes/FakeAuthKeychainStorage.swift

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Foundation
 @testable import FirebaseAuth
+import Foundation
 import XCTest
 
 /** @class AuthKeychainStorage

FirebaseAuth/Tests/Unit/MultiFactorResolverTests.swift

@@ -15,8 +15,8 @@
 import Foundation
 import XCTest
 
-import FirebaseCore
 @testable import FirebaseAuth
+import FirebaseCore
 
 #if os(iOS)
   @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)

FirebaseAuth/Tests/Unit/OAuthProviderTests.swift

@@ -15,8 +15,8 @@
 import Foundation
 import XCTest
 
-import FirebaseCore
 @testable import FirebaseAuth
+import FirebaseCore
 
 #if os(iOS)
   @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)