Add Appcheck for Dataconnect

firebase · Jul 17, 2024 · 5183bad · 5183bad
1 parent 88d0bef
commit 5183bad
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 11 deletions.
diff --git a/FirebaseDataConnect/Sources/DataConnect.swift b/FirebaseDataConnect/Sources/DataConnect.swift
@@ -14,6 +14,7 @@
 
 import Foundation
 
+import FirebaseAppCheck
 import FirebaseAuth
 import FirebaseCore
 
@@ -59,7 +60,8 @@ public class DataConnect {
       projectId: projectID,
       settings: settings,
       connectorConfig: connectorConfig,
-      auth: Auth.auth(app: app)
+      auth: Auth.auth(app: app),
+      appCheck: AppCheck.appCheck(app: app)
     )
 
     operationsManager = OperationsManager(grpcClient: grpcClient)
@@ -80,7 +82,8 @@ public class DataConnect {
       projectId: projectID,
       settings: settings,
       connectorConfig: connectorConfig,
-      auth: Auth.auth(app: app)
+      auth: Auth.auth(app: app),
+      appCheck: AppCheck.appCheck(app: app)
     )
     operationsManager = OperationsManager(grpcClient: grpcClient)
   }

diff --git a/FirebaseDataConnect/Sources/Internal/GrpcClient.swift b/FirebaseDataConnect/Sources/Internal/GrpcClient.swift
@@ -14,6 +14,7 @@
 
 import Foundation
 
+import FirebaseAppCheck
 import FirebaseAuth
 import FirebaseCoreInternal
 import FirebaseSharedSwift
@@ -23,7 +24,6 @@ import NIOHPACK
 import NIOPosix
 import OSLog
 import SwiftProtobuf
-import FirebaseAppCheck
 
 @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
 actor GrpcClient: CustomStringConvertible {
@@ -40,13 +40,13 @@ actor GrpcClient: CustomStringConvertible {
   private let connectorName: String // Fully qualified connector name
 
   private let auth: Auth
-    
-    private let appCheck: AppCheck
+
+  private let appCheck: AppCheck?
 
   private enum RequestHeaders {
     static let googRequestParamsHeader = "x-goog-request-params"
     static let authorizationHeader = "x-firebase-auth-token"
-      static let appCheckHeader = "x-firebase-appcheck"
+    static let appCheckHeader = "X-Firebase-AppCheck"
   }
 
   private let googRequestHeaderValue: String
@@ -72,12 +72,12 @@ actor GrpcClient: CustomStringConvertible {
 
   init(projectId: String, settings: DataConnectSettings, connectorConfig: ConnectorConfig,
        auth: Auth,
-       appCheck: AppCheck) {
+       appCheck: AppCheck?) {
     self.projectId = projectId
     serverSettings = settings
     self.connectorConfig = connectorConfig
     self.auth = auth
-      self.appCheck = appCheck
+    self.appCheck = appCheck
 
     connectorName =
       "projects/\(projectId)/locations/\(connectorConfig.location)/services/\(connectorConfig.serviceId)/connectors/\(connectorConfig.connector)"
@@ -179,12 +179,11 @@ actor GrpcClient: CustomStringConvertible {
 
     headers.add(name: RequestHeaders.googRequestParamsHeader, value: googRequestHeaderValue)
 
-    // add token if available
-
+    // Add Auth token if available
     do {
       if let token = try await auth.currentUser?.getIDToken() {
         headers.add(name: RequestHeaders.authorizationHeader, value: "\(token)")
-        print("added token \(token)")
+        print("added Auth token \(token)")
 
       } else {
         FirebaseLogger.dataConnect.debug("No auth token available. Not adding auth header.")
@@ -194,6 +193,23 @@ actor GrpcClient: CustomStringConvertible {
         .debug("Cannot get auth token successfully due to: \(error). Not adding auth header.")
     }
 
+    // Add AppCheck token if available
+    do {
+      if let token = try await appCheck?.token(forcingRefresh: false) {
+        headers.add(name: RequestHeaders.appCheckHeader, value: "\(token)")
+        FirebaseLogger.dataConnect
+          .debug("App Check token added: \(token)")
+      } else {
+        FirebaseLogger.dataConnect
+          .debug("App Check token unavailable. Not adding App Check header.")
+      }
+    } catch {
+      FirebaseLogger.dataConnect
+        .debug(
+          "Cannot get App Check token successfully due to: \(error). Not adding App Check header."
+        )
+    }
+
     let options = CallOptions(customMetadata: headers)
     return options
   }

diff --git a/Package.swift b/Package.swift
@@ -671,6 +671,7 @@ let package = Package(
       dependencies: [
         .product(name: "GRPC", package: "grpc-swift"),
         "FirebaseAuth",
+        "FirebaseAppCheck",
         "FirebaseCore",
         "FirebaseCoreExtension",
         "FirebaseSharedSwift",