From 6b99ad1fa2f32e2e9fa08f7be623d04070823b35 Mon Sep 17 00:00:00 2001 From: Nick Cooke <36927374+ncooke3@users.noreply.github.com> Date: Tue, 19 Nov 2024 11:44:24 -0500 Subject: [PATCH] [Auth] Mark AuthRequestConfiguration as final and reduce its mutability (#14147) --- FirebaseAuth/Sources/Swift/Backend/AuthBackend.swift | 3 +-- .../Sources/Swift/Backend/AuthRequestConfiguration.swift | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/FirebaseAuth/Sources/Swift/Backend/AuthBackend.swift b/FirebaseAuth/Sources/Swift/Backend/AuthBackend.swift index 3c54b2792fd..f981701b98e 100644 --- a/FirebaseAuth/Sources/Swift/Backend/AuthBackend.swift +++ b/FirebaseAuth/Sources/Swift/Backend/AuthBackend.swift @@ -71,8 +71,7 @@ final class AuthBackend: AuthBackendProtocol { var request = URLRequest(url: url) request.setValue(contentType, forHTTPHeaderField: "Content-Type") - let additionalFrameworkMarker = requestConfiguration - .additionalFrameworkMarker ?? "FirebaseCore-iOS" + let additionalFrameworkMarker = requestConfiguration.additionalFrameworkMarker let clientVersion = "iOS/FirebaseSDK/\(FirebaseVersion())/\(additionalFrameworkMarker)" request.setValue(clientVersion, forHTTPHeaderField: "X-Client-Version") request.setValue(Bundle.main.bundleIdentifier, forHTTPHeaderField: "X-Ios-Bundle-Identifier") diff --git a/FirebaseAuth/Sources/Swift/Backend/AuthRequestConfiguration.swift b/FirebaseAuth/Sources/Swift/Backend/AuthRequestConfiguration.swift index 510e9287ca0..91f99c266f8 100644 --- a/FirebaseAuth/Sources/Swift/Backend/AuthRequestConfiguration.swift +++ b/FirebaseAuth/Sources/Swift/Backend/AuthRequestConfiguration.swift @@ -19,7 +19,7 @@ import FirebaseCoreExtension /// Defines configurations to be added to a request to Firebase Auth's backend. @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) -class AuthRequestConfiguration { +final class AuthRequestConfiguration { /// The Firebase Auth API key used in the request. let apiKey: String @@ -33,13 +33,13 @@ class AuthRequestConfiguration { weak var auth: Auth? /// The heartbeat logger used to add heartbeats to the corresponding request's header. - var heartbeatLogger: FIRHeartbeatLoggerProtocol? + let heartbeatLogger: FIRHeartbeatLoggerProtocol? /// The appCheck is used to generate a token. var appCheck: AppCheckInterop? /// Additional framework marker that will be added as part of the header of every request. - var additionalFrameworkMarker: String? + let additionalFrameworkMarker: String = "FirebaseCore-iOS" /// If set, the local emulator host and port to point to instead of the remote backend. var emulatorHostAndPort: String?