Skip to content

Commit 7ff6075

Browse files
committed
[vertex-ai] Rename googleAppID to firebaseAppID
1 parent 0f7ada0 commit 7ff6075

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

FirebaseVertexAI/Sources/FirebaseInfo.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@ struct FirebaseInfo: Sendable {
2626
let auth: AuthInterop?
2727
let projectID: String
2828
let apiKey: String
29-
let googleAppID: String
29+
let firebaseAppID: String
3030
let app: FirebaseApp
3131

3232
init(appCheck: AppCheckInterop? = nil,
3333
auth: AuthInterop? = nil,
3434
projectID: String,
3535
apiKey: String,
36-
googleAppID: String,
36+
firebaseAppID: String,
3737
firebaseApp: FirebaseApp) {
3838
self.appCheck = appCheck
3939
self.auth = auth
4040
self.projectID = projectID
4141
self.apiKey = apiKey
42-
self.googleAppID = googleAppID
42+
self.firebaseAppID = firebaseAppID
4343
app = firebaseApp
4444
}
4545
}

FirebaseVertexAI/Sources/GenerativeAIService.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ struct GenerativeAIService {
194194
}
195195

196196
if firebaseInfo.app.isDataCollectionDefaultEnabled {
197-
urlRequest.setValue(firebaseInfo.googleAppID, forHTTPHeaderField: "X-Firebase-AppId")
197+
urlRequest.setValue(firebaseInfo.firebaseAppID, forHTTPHeaderField: "X-Firebase-AppId")
198198
if let appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String {
199199
urlRequest.setValue(appVersion, forHTTPHeaderField: "X-Firebase-AppVersion")
200200
}

FirebaseVertexAI/Sources/VertexAI.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public class VertexAI {
177177
auth: ComponentType<AuthInterop>.instance(for: AuthInterop.self, in: app.container),
178178
projectID: projectID,
179179
apiKey: apiKey,
180-
googleAppID: app.options.googleAppID,
180+
firebaseAppID: app.options.googleAppID,
181181
firebaseApp: app
182182
)
183183
self.apiConfig = apiConfig

FirebaseVertexAI/Tests/Unit/ChatTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ final class ChatTests: XCTestCase {
6262
firebaseInfo: FirebaseInfo(
6363
projectID: "my-project-id",
6464
apiKey: "API_KEY",
65-
googleAppID: "My app ID",
65+
firebaseAppID: "My app ID",
6666
firebaseApp: app
6767
),
6868
apiConfig: APIConfig(service: .vertexAI, version: .v1beta),

FirebaseVertexAI/Tests/Unit/GenerativeModelTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1478,7 +1478,7 @@ final class GenerativeModelTests: XCTestCase {
14781478
auth: auth,
14791479
projectID: "my-project-id",
14801480
apiKey: "API_KEY",
1481-
googleAppID: "My app ID",
1481+
firebaseAppID: "My app ID",
14821482
firebaseApp: app
14831483
)
14841484
}
@@ -1531,11 +1531,11 @@ final class GenerativeModelTests: XCTestCase {
15311531
XCTAssert(apiClientTags.contains(GenerativeAIService.firebaseVersionTag))
15321532
XCTAssertEqual(request.value(forHTTPHeaderField: "X-Firebase-AppCheck"), appCheckToken)
15331533

1534-
let googleAppID = request.value(forHTTPHeaderField: "X-Firebase-AppId")
1534+
let firebaseAppID = request.value(forHTTPHeaderField: "X-Firebase-AppId")
15351535
let appVersion = request.value(forHTTPHeaderField: "X-Firebase-AppVersion")
15361536
let expectedAppVersion =
15371537
try? XCTUnwrap(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String)
1538-
XCTAssertEqual(googleAppID, dataCollection ? "My app ID" : nil)
1538+
XCTAssertEqual(firebaseAppID, dataCollection ? "My app ID" : nil)
15391539
XCTAssertEqual(appVersion, dataCollection ? expectedAppVersion : nil)
15401540

15411541
if let authToken {

0 commit comments

Comments
 (0)