|
14 | 14 |
|
15 | 15 | import Foundation |
16 | 16 |
|
17 | | -@preconcurrency import FirebaseAppCheck |
| 17 | +@preconcurrency import FirebaseAppCheckInterop |
18 | 18 | @preconcurrency import FirebaseAuth |
19 | 19 | import FirebaseCore |
| 20 | +@preconcurrency import FirebaseCoreExtension |
20 | 21 | import GRPC |
21 | 22 | import Logging |
22 | 23 | import NIOCore |
@@ -47,7 +48,7 @@ actor GrpcClient: CustomStringConvertible { |
47 | 48 |
|
48 | 49 | private let auth: Auth |
49 | 50 |
|
50 | | - private let appCheck: AppCheck? |
| 51 | + private let appCheck: AppCheckInterop? |
51 | 52 |
|
52 | 53 | private let callerSDKType: CallerSDKType |
53 | 54 |
|
@@ -108,7 +109,7 @@ actor GrpcClient: CustomStringConvertible { |
108 | 109 | serverSettings = settings |
109 | 110 | self.connectorConfig = connectorConfig |
110 | 111 | auth = Auth.auth(app: app) |
111 | | - appCheck = AppCheck.appCheck(app: app) |
| 112 | + appCheck = ComponentType<AppCheckInterop>.instance(for: AppCheckInterop.self, in: app.container) |
112 | 113 | self.callerSDKType = callerSDKType |
113 | 114 |
|
114 | 115 | connectorName = |
@@ -258,17 +259,11 @@ actor GrpcClient: CustomStringConvertible { |
258 | 259 | } |
259 | 260 |
|
260 | 261 | // Add AppCheck token if available |
261 | | - do { |
262 | | - if let token = try await appCheck?.token(forcingRefresh: false) { |
263 | | - headers.add(name: RequestHeaders.appCheckHeader, value: token.token) |
264 | | - DataConnectLogger.debug("App Check token added.") |
265 | | - } else { |
266 | | - DataConnectLogger.debug("App Check token unavailable. Not adding App Check header.") |
267 | | - } |
268 | | - } catch { |
269 | | - DataConnectLogger.debug( |
270 | | - "Cannot get App Check token successfully due to: \(error). Not adding App Check header." |
271 | | - ) |
| 262 | + if let token = await appCheck?.getToken(forcingRefresh: false) { |
| 263 | + headers.add(name: RequestHeaders.appCheckHeader, value: token.token) |
| 264 | + DataConnectLogger.debug("App Check token added.") |
| 265 | + } else { |
| 266 | + DataConnectLogger.debug("App Check token unavailable. Not adding App Check header.") |
272 | 267 | } |
273 | 268 |
|
274 | 269 | var options = CallOptions(customMetadata: headers) |
|
0 commit comments