Merge pull request #1280 from firebase/error-refactor

Author: russellwheatley

FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Services/AccountService+Apple.swift

@@ -44,4 +44,3 @@ class AppleDeleteUserOperation: AuthenticatedOperation,
     }
   }
 }
-

FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Services/AppleProviderAuthUI.swift

@@ -39,17 +39,18 @@ extension ASAuthorizationAppleIDCredential {
 
 // MARK: - Authenticate With Apple Dialog
 
-private func authenticateWithApple(
-  scopes: [ASAuthorization.Scope]
-) async throws -> (ASAuthorizationAppleIDCredential, String) {
+private func authenticateWithApple(scopes: [ASAuthorization.Scope]) async throws -> (
+  ASAuthorizationAppleIDCredential,
+  String
+) {
   return try await AuthenticateWithAppleDialog(scopes: scopes).authenticate()
 }
 
 private class AuthenticateWithAppleDialog: NSObject {
   private var continuation: CheckedContinuation<(ASAuthorizationAppleIDCredential, String), Error>?
   private var currentNonce: String?
   private let scopes: [ASAuthorization.Scope]
-  
+
   init(scopes: [ASAuthorization.Scope]) {
     self.scopes = scopes
     super.init()
@@ -80,10 +81,8 @@ private class AuthenticateWithAppleDialog: NSObject {
 }
 
 extension AuthenticateWithAppleDialog: ASAuthorizationControllerDelegate {
-  func authorizationController(
-    controller: ASAuthorizationController,
-    didCompleteWithAuthorization authorization: ASAuthorization
-  ) {
+  func authorizationController(controller _: ASAuthorizationController,
+                               didCompleteWithAuthorization authorization: ASAuthorization) {
     if let appleIDCredential = authorization.credential as? ASAuthorizationAppleIDCredential {
       if let nonce = currentNonce {
         continuation?.resume(returning: (appleIDCredential, nonce))
@@ -106,10 +105,8 @@ extension AuthenticateWithAppleDialog: ASAuthorizationControllerDelegate {
     continuation = nil
   }
 
-  func authorizationController(
-    controller: ASAuthorizationController,
-    didCompleteWithError error: Error
-  ) {
+  func authorizationController(controller _: ASAuthorizationController,
+                               didCompleteWithError error: Error) {
     continuation?.resume(throwing: AuthServiceError.signInFailed(underlying: error))
     continuation = nil
   }
@@ -160,4 +157,3 @@ public class AppleProviderAuthUI: AuthProviderUI {
     AnyView(SignInWithAppleButton(provider: provider))
   }
 }
-

FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Services/AuthService+Apple.swift

@@ -29,4 +29,3 @@ public extension AuthService {
     return self
   }
 }
-

FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Services/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 {
@@ -50,4 +50,3 @@ enum CryptoUtils {
     return hashString
   }
 }
-

FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Views/SignInWithAppleButton.swift

@@ -29,7 +29,7 @@ extension SignInWithAppleButton: View {
   public var body: some View {
     Button(action: {
       Task {
-        try await authService.signIn(provider)
+        try? await authService.signIn(provider)
       }
     }) {
       HStack {
@@ -51,4 +51,3 @@ extension SignInWithAppleButton: View {
     .accessibilityIdentifier("sign-in-with-apple-button")
   }
 }
-

FirebaseSwiftUI/FirebaseAppleSwiftUI/Tests/FirebaseAppleSwiftUITests/FirebaseAppleSwiftUITests.swift

@@ -18,4 +18,3 @@ import Testing
 @Test func example() async throws {
   // Write your test here and use APIs like `#expect(...)` to check expected conditions.
 }
-

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Auth/MultiFactor.swift

@@ -57,7 +57,7 @@ public struct EnrollmentSession {
   public let expiresAt: Date
 
   // Internal handle to finish TOTP
-  internal let _totpSecret: AnyObject?
+  let _totpSecret: AnyObject?
 
   public enum EnrollmentStatus {
     case initiated
@@ -111,4 +111,4 @@ public struct MFARequired {
   public init(hints: [MFAHint]) {
     self.hints = hints
   }
-}
+}

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/AuthServiceError.swift

@@ -39,7 +39,6 @@ public enum AuthServiceError: LocalizedError {
   case invalidPhoneAuthenticationArguments(String)
   case providerNotFound(String)
   case multiFactorAuth(String)
-  
 
   public var errorDescription: String? {
     switch self {
@@ -62,7 +61,7 @@ public enum AuthServiceError: LocalizedError {
     case let .providerNotFound(description):
       return description
     case let .invalidPhoneAuthenticationArguments(description):
-        return description
+      return description
     case let .multiFactorAuth(description):
       return description
     }

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthConfiguration.swift

@@ -25,7 +25,7 @@ public struct AuthConfiguration {
   public let emailLinkSignInActionCodeSettings: ActionCodeSettings?
   public let verifyEmailActionCodeSettings: ActionCodeSettings?
 
-    // MARK: - MFA Configuration
+  // MARK: - MFA Configuration
 
   public let mfaEnabled: Bool
   public let allowedSecondFactors: Set<SecondFactorType>