fix sessions tests and run style

Author: morganchen12

FirebaseAuth/Interop/Public/FirebaseAuthInterop/FIRAuthInterop.h

@@ -33,8 +33,9 @@ NS_SWIFT_NAME(AuthInterop)
 
 /// Retrieves the Firebase authentication token, possibly refreshing it if it has expired.
 - (void)getTokenForcingRefresh:(BOOL)forceRefresh
-                  withCallback:
-                      (void (^NS_SWIFT_UI_ACTOR)(NSString *_Nullable_result token, NSError *_Nullable error))callback NS_SWIFT_NAME(getToken(forcingRefresh:completion:));
+                  withCallback:(void (^NS_SWIFT_UI_ACTOR)(NSString *_Nullable_result token,
+                                                          NSError *_Nullable error))callback
+    NS_SWIFT_NAME(getToken(forcingRefresh:completion:));
 
 /// Get the current Auth user's UID. Returns nil if there is no user signed in.
 - (nullable NSString *)getUserID;

FirebaseAuth/Sources/Swift/ActionCode/ActionCodeInfo.swift

@@ -15,7 +15,7 @@
 import Foundation
 
 /// Manages information regarding action codes.
-@objc(FIRActionCodeInfo) final public class ActionCodeInfo: NSObject, Sendable {
+@objc(FIRActionCodeInfo) public final class ActionCodeInfo: NSObject, Sendable {
   /// The operation being performed.
   @objc public let operation: ActionCodeOperation
 

FirebaseAuth/Sources/Swift/ActionCode/ActionCodeSettings.swift

@@ -15,7 +15,8 @@
 import Foundation
 
 /// Used to set and retrieve settings related to handling action codes.
-@objc(FIRActionCodeSettings) open class ActionCodeSettings: NSObject, @unchecked Sendable /* TODO: sendable */ {
+@objc(FIRActionCodeSettings) open class ActionCodeSettings: NSObject,
+  @unchecked Sendable /* TODO: sendable */ {
   /// This URL represents the state/Continue URL in the form of a universal link.
   ///
   /// This URL can should be constructed as a universal link that would either directly open

FirebaseAuth/Sources/Swift/Auth/Auth.swift

@@ -17,8 +17,8 @@ import Foundation
 import FirebaseAppCheckInterop
 import FirebaseAuthInterop
 import FirebaseCore
-import FirebaseCoreInternal
 import FirebaseCoreExtension
+import FirebaseCoreInternal
 #if COCOAPODS
   @_implementationOnly import GoogleUtilities
 #else
@@ -82,7 +82,8 @@ extension Auth: AuthInterop {
   /// This method is not for public use. It is for Firebase clients of AuthInterop.
   @objc(getTokenForcingRefresh:withCallback:)
   public func getToken(forcingRefresh forceRefresh: Bool,
-                       completion callback: @escaping @MainActor @Sendable (String?, Error?) -> Void) {
+                       completion callback: @escaping @MainActor @Sendable (String?, Error?)
+                         -> Void) {
     kAuthGlobalWorkQueue.async { [weak self] in
       if let strongSelf = self {
         // Enable token auto-refresh if not already enabled.
@@ -227,7 +228,8 @@ extension Auth: AuthInterop {
   ///   - user: The user object to be set as the current user of the calling Auth instance.
   ///   - completion: Optionally; a block invoked after the user of the calling Auth instance has
   ///             been updated or an error was encountered.
-  @objc open func updateCurrentUser(_ user: User?, completion: (@MainActor (Error?) -> Void)? = nil) {
+  @objc open func updateCurrentUser(_ user: User?,
+                                    completion: (@MainActor (Error?) -> Void)? = nil) {
     kAuthGlobalWorkQueue.async {
       guard let user else {
         let error = AuthErrorUtils.nullUserError(message: nil)
@@ -707,9 +709,8 @@ extension Auth: AuthInterop {
   /// not enabled. Enable them in the Auth section of the Firebase console.
   /// - Parameter completion: Optionally; a block which is invoked when the sign in finishes, or is
   /// canceled. Invoked asynchronously on the main thread in the future.
-  @objc open func signInAnonymously(
-    completion: (@MainActor (AuthDataResult?, Error?) -> Void)? = nil
-  ) {
+  @objc open func signInAnonymously(completion: (@MainActor (AuthDataResult?, Error?) -> Void)? =
+    nil) {
     kAuthGlobalWorkQueue.async {
       let decoratedCallback = self.signInFlowAuthDataResultCallback(byDecorating: completion)
       if let currentUser = self._currentUser, currentUser.isAnonymous {
@@ -1000,7 +1001,8 @@ extension Auth: AuthInterop {
   /// Invoked
   /// asynchronously on the main thread in the future.
   @objc open func checkActionCode(_ code: String,
-                                  completion: @MainActor @escaping (ActionCodeInfo?, Error?) -> Void) {
+                                  completion: @MainActor @escaping (ActionCodeInfo?, Error?)
+                                    -> Void) {
     kAuthGlobalWorkQueue.async {
       let request = ResetPasswordRequest(oobCode: code,
                                          newPassword: nil,
@@ -1045,7 +1047,8 @@ extension Auth: AuthInterop {
   /// - Parameter completion: Optionally; a block which is invoked when the request finishes.
   /// Invoked asynchronously on the main thread in the future.
   @objc open func verifyPasswordResetCode(_ code: String,
-                                          completion: @escaping @MainActor (String?, Error?) -> Void) {
+                                          completion: @escaping @MainActor (String?, Error?)
+                                            -> Void) {
     checkActionCode(code) { info, error in
       if let error {
         completion(nil, error)
@@ -1078,10 +1081,8 @@ extension Auth: AuthInterop {
   /// - Parameter code: The out of band code to be applied.
   /// - Parameter completion: Optionally; a block which is invoked when the request finishes.
   /// Invoked asynchronously on the main thread in the future.
-  @objc open func applyActionCode(
-    _ code: String,
-    completion: @escaping @MainActor (Error?) -> Void
-  ) {
+  @objc open func applyActionCode(_ code: String,
+                                  completion: @escaping @MainActor (Error?) -> Void) {
     kAuthGlobalWorkQueue.async {
       let request = SetAccountInfoRequest(requestConfiguration: self.requestConfiguration)
       request.oobCode = code
@@ -1393,9 +1394,9 @@ extension Auth: AuthInterop {
   /// - Parameter listener: The block to be invoked. The block is always invoked asynchronously on
   /// the main thread, even for it's initial invocation after having been added as a listener.
   /// - Returns: A handle useful for manually unregistering the block as a listener.
-  @objc open func addIDTokenDidChangeListener(_ listener: @MainActor @escaping (Auth, User?) -> Void)
+  @objc open func addIDTokenDidChangeListener(_ listener: @MainActor @escaping (Auth, User?)
+    -> Void)
     -> NSObjectProtocol {
-
     let handle = NotificationCenter.default.addObserver(
       forName: Auth.authStateDidChangeNotification,
       object: self,
@@ -1616,7 +1617,7 @@ extension Auth: AuthInterop {
     /// the URL is for the app (or another library) so the caller should continue handling
     /// this URL as usual.
     @MainActor @objc(canHandleURL:) open func canHandle(_ url: URL) -> Bool {
-      guard let authURLPresenter = self.authURLPresenter as? AuthURLPresenter else {
+      guard let authURLPresenter = authURLPresenter as? AuthURLPresenter else {
         return false
       }
       return authURLPresenter.canHandle(url: url)
@@ -1889,7 +1890,8 @@ extension Auth: AuthInterop {
       if let token, token.count > 0 {
         internalNotificationParameters[FIRAuthStateDidChangeInternalNotificationTokenKey] = token
       }
-      internalNotificationParameters[FIRAuthStateDidChangeInternalNotificationUIDKey] = self._currentUser?
+      internalNotificationParameters[FIRAuthStateDidChangeInternalNotificationUIDKey] = self
+        ._currentUser?
         .uid
       let notifications = NotificationCenter.default
       notifications.post(name: NSNotification.Name.FIRAuthStateDidChangeInternal,
@@ -2251,7 +2253,8 @@ extension Auth: AuthInterop {
   /// Invoked asynchronously on the main thread in the future.
   /// - Returns: Returns a block that updates the current user.
   func signInFlowAuthDataResultCallback(byDecorating callback:
-    (@MainActor (AuthDataResult?, Error?) -> Void)?) -> @Sendable (Result<AuthDataResult, Error>) -> Void {
+    (@MainActor (AuthDataResult?, Error?) -> Void)?)
+    -> @Sendable (Result<AuthDataResult, Error>) -> Void {
     return { result in
       switch result {
       case let .success(authResult):
@@ -2267,10 +2270,8 @@ extension Auth: AuthInterop {
     }
   }
 
-  private func wrapAsyncRPCTask(
-    _ request: any AuthRPCRequest,
-    _ callback: (@MainActor (Error?) -> Void)?
-  ) {
+  private func wrapAsyncRPCTask(_ request: any AuthRPCRequest,
+                                _ callback: (@MainActor (Error?) -> Void)?) {
     Task {
       do {
         let _ = try await self.backend.call(with: request)
@@ -2290,7 +2291,7 @@ extension Auth: AuthInterop {
   }
 
   class func wrapMainAsync<T: Sendable>(callback: (@MainActor (T?, Error?) -> Void)?,
-                                   with result: Result<T, Error>) -> Void {
+                                        with result: Result<T, Error>) -> Void {
     guard let callback else { return }
     DispatchQueue.main.async {
       switch result {

FirebaseAuth/Sources/Swift/Auth/AuthDataResult.swift

@@ -22,7 +22,8 @@ extension AuthDataResult: NSSecureCoding {}
 ///
 /// It contains references to a `User` instance and an `AdditionalUserInfo` instance.
 @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
-@objc(FIRAuthDataResult) open class AuthDataResult: NSObject, @unchecked Sendable /* TODO: sendable */ {
+@objc(FIRAuthDataResult) open class AuthDataResult: NSObject,
+  @unchecked Sendable /* TODO: sendable */ {
   /// The signed in user.
   @objc public let user: User
 

FirebaseAuth/Sources/Swift/Auth/AuthTokenResult.swift

@@ -20,7 +20,8 @@ extension AuthTokenResult: NSSecureCoding {}
 /// A data class containing the ID token JWT string and other properties associated with the
 /// token including the decoded payload claims.
 @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
-@objc(FIRAuthTokenResult) open class AuthTokenResult: NSObject, @unchecked Sendable /* TODO: sendable */ {
+@objc(FIRAuthTokenResult) open class AuthTokenResult: NSObject,
+  @unchecked Sendable /* TODO: sendable */ {
   /// Stores the JWT string of the ID token.
   @objc open var token: String
 

FirebaseAuth/Sources/Swift/AuthProvider/OAuthProvider.swift

@@ -17,7 +17,8 @@ import Foundation
 
 /// Utility class for constructing OAuth Sign In credentials.
 @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
-@objc(FIROAuthProvider) open class OAuthProvider: NSObject, FederatedAuthProvider, @unchecked Sendable /* TODO: sendable */ {
+@objc(FIROAuthProvider) open class OAuthProvider: NSObject, FederatedAuthProvider,
+  @unchecked Sendable /* TODO: sendable */ {
   @objc public static let id = "OAuth"
 
   /// Array used to configure the OAuth scopes.
@@ -281,11 +282,12 @@ import Foundation
         let eventID = AuthWebUtils.randomString(withLength: 10)
         let sessionID = AuthWebUtils.randomString(withLength: 10)
 
-        let callbackOnMainThread: (@MainActor (AuthCredential?, Error?) -> Void) = { credential, error in
-          if let completion {
-            completion(credential, error)
+        let callbackOnMainThread: (@MainActor (AuthCredential?, Error?) -> Void) =
+          { credential, error in
+            if let completion {
+              completion(credential, error)
+            }
           }
-        }
         Task {
           do {
             guard let headfulLiteURL = try await self.getHeadfulLiteUrl(eventID: eventID,
@@ -301,8 +303,8 @@ import Foundation
                                                  callbackScheme: self.callbackScheme)
             }
             await self.auth.authURLPresenter.present(headfulLiteURL,
-                                               uiDelegate: uiDelegate,
-                                               callbackMatcher: callbackMatcher) { callbackURL, error in
+                                                     uiDelegate: uiDelegate,
+                                                     callbackMatcher: callbackMatcher) { callbackURL, error in
               if let error {
                 callbackOnMainThread(nil, error)
                 return

FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift

@@ -19,7 +19,8 @@ import Foundation
 ///
 /// This class is available on iOS only.
 @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
-@objc(FIRPhoneAuthProvider) open class PhoneAuthProvider: NSObject, @unchecked Sendable /* TODO: sendable */ {
+@objc(FIRPhoneAuthProvider) open class PhoneAuthProvider: NSObject,
+  @unchecked Sendable /* TODO: sendable */ {
   /// A string constant identifying the phone identity provider.
   @objc public static let id = "phone"
   private static let recaptchaVersion = "RECAPTCHA_ENTERPRISE"

FirebaseAuth/Sources/Swift/Backend/RPC/CreateAuthURIRequest.swift

@@ -44,7 +44,8 @@ private let kTenantIDKey = "tenantId"
 /// Represents the parameters for the createAuthUri endpoint.
 /// See https://developers.google.com/identity/toolkit/web/reference/relyingparty/createAuthUri
 @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
-class CreateAuthURIRequest: IdentityToolkitRequest, AuthRPCRequest, @unchecked Sendable /* TODO: sendable */ {
+class CreateAuthURIRequest: IdentityToolkitRequest, AuthRPCRequest,
+  @unchecked Sendable /* TODO: sendable */ {
   typealias Response = CreateAuthURIResponse
 
   /// The email or federated ID of the user.

FirebaseAuth/Sources/Swift/Backend/RPC/DeleteAccountRequest.swift

@@ -26,7 +26,8 @@ private let kIDTokenKey = "idToken"
 private let kLocalIDKey = "localId"
 
 @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
-class DeleteAccountRequest: IdentityToolkitRequest, AuthRPCRequest, @unchecked Sendable /* TODO: sendable */ {
+class DeleteAccountRequest: IdentityToolkitRequest, AuthRPCRequest,
+  @unchecked Sendable /* TODO: sendable */ {
   typealias Response = DeleteAccountResponse
 
   /// The STS Access Token of the authenticated user.