refactor: expose string utils on auth service

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

@@ -61,12 +61,14 @@ public final class AuthService {
   public let auth: Auth
   private var listenerManager: AuthListenerManager?
   private let googleProvider: GoogleProviderProtocol?
+  public let string: StringUtils
 
   public init(configuration: AuthConfiguration = AuthConfiguration(), auth: Auth = Auth.auth(),
               googleProvider: GoogleProviderProtocol? = nil) {
     self.auth = auth
     self.configuration = configuration
     self.googleProvider = googleProvider
+    string = StringUtils(bundle: configuration.customStringsBundle ?? Bundle.module)
     listenerManager = AuthListenerManager(auth: auth, authEnvironment: self)
   }
 

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Utils/StringUtils.swift

@@ -14,56 +14,42 @@ let kEmailsDoNotMatchError = "EmailsDoNotMatchError"
 let kUnknownError = "UnknownError"
 
 public class StringUtils {
-  public static func localizedString(forKey key: String,
-                                     configuration: AuthConfiguration) -> String {
-    if let customStringsBundle = configuration.customStringsBundle {
-      let localizedString = customStringsBundle.localizedString(
-        forKey: key,
-        value: kKeyNotFound,
-        table: nil
-      )
-
-      if localizedString != key {
-        return localizedString
-      }
-    }
+  let bundle: Bundle
+  init(bundle: Bundle) {
+    self.bundle = bundle
+  }
 
-    return Bundle.module.localizedString(forKey: key, value: nil, table: nil)
+  public func localizedString(forKey key: String) -> String {
+    return bundle.localizedString(forKey: key, value: nil, table: nil)
   }
 
-  public static func localizedErrorMessage(for error: Error,
-                                           configuration: AuthConfiguration) -> String {
+  public func localizedErrorMessage(for error: Error) -> String {
     let authError = error as NSError
     let errorCode = AuthErrorCode(rawValue: authError.code)
     switch errorCode {
     case .emailAlreadyInUse:
-      return StringUtils.localizedString(
-        forKey: kEmailAlreadyInUseError,
-        configuration: configuration
+      return localizedString(
+        forKey: kEmailAlreadyInUseError
       )
     case .invalidEmail:
-      return StringUtils.localizedString(forKey: kInvalidEmailError, configuration: configuration)
+      return localizedString(forKey: kInvalidEmailError)
     case .weakPassword:
-      return StringUtils.localizedString(forKey: kWeakPasswordError, configuration: configuration)
+      return localizedString(forKey: kWeakPasswordError)
     case .tooManyRequests:
-      return StringUtils.localizedString(
-        forKey: kSignUpTooManyTimesError,
-        configuration: configuration
+      return localizedString(
+        forKey: kSignUpTooManyTimesError
       )
     case .wrongPassword:
-      return StringUtils.localizedString(
-        forKey: kWrongPasswordError,
-        configuration: configuration
+      return localizedString(
+        forKey: kWrongPasswordError
       )
     case .userNotFound:
-      return StringUtils.localizedString(
-        forKey: kUsersNotFoundError,
-        configuration: configuration
+      return localizedString(
+        forKey: kUsersNotFoundError
       )
     case .userDisabled:
-      return StringUtils.localizedString(
-        forKey: kAccountDisabledError,
-        configuration: configuration
+      return localizedString(
+        forKey: kAccountDisabledError
       )
     default:
       return error.localizedDescription

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailAuthView.swift

@@ -37,9 +37,8 @@ public struct EmailAuthView {
     do {
       try await authService.signIn(withEmail: email, password: password)
     } catch {
-      errorMessage = StringUtils.localizedErrorMessage(
-        for: error,
-        configuration: authService.configuration
+      errorMessage = authService.string.localizedErrorMessage(
+        for: error
       )
     }
   }
@@ -48,9 +47,8 @@ public struct EmailAuthView {
     do {
       try await authService.createUser(withEmail: email, password: password)
     } catch {
-      errorMessage = StringUtils.localizedErrorMessage(
-        for: error,
-        configuration: authService.configuration
+      errorMessage = authService.string.localizedErrorMessage(
+        for: error
       )
     }
   }

FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Views/GoogleButtonView.swift

@@ -12,9 +12,8 @@ public struct GoogleButtonView {
     do {
       try await authService.signInWithGoogle()
     } catch {
-      errorMessage = StringUtils.localizedErrorMessage(
-        for: error,
-        configuration: authService.configuration
+      errorMessage = authService.string.localizedErrorMessage(
+        for: error
       )
     }
   }