Merge remote-tracking branch 'origin/main' into ah/vertex-testapp-scheme

andrewheard · andrewheard · commit d94b92679b83 · 2024-10-29T14:57:54.000-04:00
diff --git a/.github/workflows/vertexai.yml b/.github/workflows/vertexai.yml
@@ -90,41 +90,6 @@ jobs:
         retry_wait_seconds: 120
         command: scripts/build.sh FirebaseVertexAIUnit ${{ matrix.target }} spm
 
-  spm-integration:
-    strategy:
-      matrix:
-        target: [iOS]
-        os: [macos-14]
-        include:
-          - os: macos-14
-            xcode: Xcode_15.2
-    runs-on: ${{ matrix.os }}
-    needs: spm-package-resolved
-    env:
-      TEST_RUNNER_VertexAIRunIntegrationTests: 1
-      FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
-      plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/cache/restore@v4
-      with:
-        path: .build
-        key: ${{needs.spm-package-resolved.outputs.cache_key}}
-    - name: Install Secret GoogleService-Info.plist
-      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/vertexai-integration.plist.gpg \
-        FirebaseVertexAI/Tests/Integration/Resources/GoogleService-Info.plist "$plist_secret"
-    - name: Xcode
-      run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
-    - name: Initialize xcodebuild
-      run: scripts/setup_spm_tests.sh
-    - uses: nick-fields/retry@v3
-      with:
-        timeout_minutes: 120
-        max_attempts: 3
-        retry_on: error
-        retry_wait_seconds: 120
-        command: scripts/build.sh FirebaseVertexAIIntegration ${{ matrix.target }} spm
-
   testapp-integration:
     strategy:
       matrix:
diff --git a/FirebaseAuth/Sources/Swift/Auth/AuthDataResult.swift b/FirebaseAuth/Sources/Swift/Auth/AuthDataResult.swift
@@ -54,7 +54,7 @@ extension AuthDataResult: NSSecureCoding {}
   private let kUserCodingKey = "user"
   private let kCredentialCodingKey = "credential"
 
-  public static var supportsSecureCoding = true
+  public static let supportsSecureCoding = true
 
   public func encode(with coder: NSCoder) {
     coder.encode(user, forKey: kUserCodingKey)
diff --git a/FirebaseAuth/Sources/Swift/Auth/AuthTokenResult.swift b/FirebaseAuth/Sources/Swift/Auth/AuthTokenResult.swift
@@ -129,9 +129,7 @@ extension AuthTokenResult: NSSecureCoding {}
 
   private static let kTokenKey = "token"
 
-  public static var supportsSecureCoding: Bool {
-    return true
-  }
+  public static let supportsSecureCoding = true
 
   public func encode(with coder: NSCoder) {
     coder.encode(token, forKey: AuthTokenResult.kTokenKey)
diff --git a/FirebaseAuth/Sources/Swift/AuthProvider/EmailAuthProvider.swift b/FirebaseAuth/Sources/Swift/AuthProvider/EmailAuthProvider.swift
@@ -62,7 +62,7 @@ import Foundation
 
   // MARK: Secure Coding
 
-  static var supportsSecureCoding = true
+  static let supportsSecureCoding = true
 
   func encode(with coder: NSCoder) {
     coder.encode(email, forKey: "email")
diff --git a/FirebaseAuth/Sources/Swift/AuthProvider/FacebookAuthProvider.swift b/FirebaseAuth/Sources/Swift/AuthProvider/FacebookAuthProvider.swift
@@ -48,7 +48,7 @@ import Foundation
 
   // MARK: Secure Coding
 
-  static var supportsSecureCoding = true
+  static let supportsSecureCoding = true
 
   func encode(with coder: NSCoder) {
     coder.encode(accessToken, forKey: "accessToken")
diff --git a/FirebaseAuth/Sources/Swift/AuthProvider/GameCenterAuthProvider.swift b/FirebaseAuth/Sources/Swift/AuthProvider/GameCenterAuthProvider.swift
@@ -163,7 +163,7 @@
 
     // MARK: Secure Coding
 
-    static var supportsSecureCoding = true
+    static let supportsSecureCoding = true
 
     func encode(with coder: NSCoder) {
       coder.encode(playerID, forKey: "playerID")
diff --git a/FirebaseAuth/Sources/Swift/AuthProvider/GitHubAuthProvider.swift b/FirebaseAuth/Sources/Swift/AuthProvider/GitHubAuthProvider.swift
@@ -48,7 +48,7 @@ import Foundation
 
   // MARK: Secure Coding
 
-  public static var supportsSecureCoding = true
+  public static let supportsSecureCoding = true
 
   func encode(with coder: NSCoder) {
     coder.encode(token, forKey: "token")
diff --git a/FirebaseAuth/Sources/Swift/AuthProvider/GoogleAuthProvider.swift b/FirebaseAuth/Sources/Swift/AuthProvider/GoogleAuthProvider.swift
@@ -53,7 +53,7 @@ import Foundation
 
   // MARK: Secure Coding
 
-  static var supportsSecureCoding = true
+  static let supportsSecureCoding = true
 
   func encode(with coder: NSCoder) {
     coder.encode(idToken, forKey: "idToken")
diff --git a/FirebaseAuth/Sources/Swift/AuthProvider/OAuthCredential.swift b/FirebaseAuth/Sources/Swift/AuthProvider/OAuthCredential.swift
@@ -96,7 +96,7 @@ import Foundation
 
   // MARK: Secure Coding
 
-  public static var supportsSecureCoding: Bool = true
+  public static let supportsSecureCoding: Bool = true
 
   public func encode(with coder: NSCoder) {
     coder.encode(idToken, forKey: "IDToken")
diff --git a/FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthCredential.swift b/FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthCredential.swift
@@ -39,7 +39,7 @@ import Foundation
 
   // MARK: Secure Coding
 
-  public static var supportsSecureCoding = true
+  public static let supportsSecureCoding = true
 
   public func encode(with coder: NSCoder) {
     switch credentialKind {
diff --git a/FirebaseAuth/Sources/Swift/AuthProvider/TwitterAuthProvider.swift b/FirebaseAuth/Sources/Swift/AuthProvider/TwitterAuthProvider.swift
@@ -52,7 +52,7 @@ import Foundation
 
   // MARK: Secure Coding
 
-  static var supportsSecureCoding = true
+  static let supportsSecureCoding = true
 
   func encode(with coder: NSCoder) {
     coder.encode(token, forKey: "token")
diff --git a/FirebaseAuth/Sources/Swift/MultiFactor/MultiFactor.swift b/FirebaseAuth/Sources/Swift/MultiFactor/MultiFactor.swift
@@ -282,9 +282,7 @@ import Foundation
 
     private let kEnrolledFactorsCodingKey = "enrolledFactors"
 
-    public static var supportsSecureCoding: Bool {
-      true
-    }
+    public static let supportsSecureCoding = true
 
     public func encode(with coder: NSCoder) {
       coder.encode(enrolledFactors, forKey: kEnrolledFactorsCodingKey)
diff --git a/FirebaseAuth/Sources/Swift/SystemService/AuthAppCredential.swift b/FirebaseAuth/Sources/Swift/SystemService/AuthAppCredential.swift
@@ -38,9 +38,7 @@ class AuthAppCredential: NSObject, NSSecureCoding {
   private static let kReceiptKey = "receipt"
   private static let kSecretKey = "secret"
 
-  static var supportsSecureCoding: Bool {
-    true
-  }
+  static let supportsSecureCoding = true
 
   required convenience init?(coder: NSCoder) {
     guard let receipt = coder.decodeObject(of: NSString.self,
diff --git a/FirebaseAuth/Sources/Swift/SystemService/SecureTokenService.swift b/FirebaseAuth/Sources/Swift/SystemService/SecureTokenService.swift
@@ -164,9 +164,7 @@ class SecureTokenService: NSObject, NSSecureCoding {
   private static let kAccessTokenKey = "accessToken"
   private static let kAccessTokenExpirationDateKey = "accessTokenExpirationDate"
 
-  static var supportsSecureCoding: Bool {
-    true
-  }
+  static let supportsSecureCoding = true
 
   required convenience init?(coder: NSCoder) {
     guard let refreshToken = coder.decodeObject(of: [NSString.self],
diff --git a/FirebaseAuth/Sources/Swift/User/AdditionalUserInfo.swift b/FirebaseAuth/Sources/Swift/User/AdditionalUserInfo.swift
@@ -49,9 +49,7 @@ extension AdditionalUserInfo: NSSecureCoding {}
   private static let usernameCodingKey = "username"
   private static let newUserKey = "newUser"
 
-  public static var supportsSecureCoding: Bool {
-    return true
-  }
+  public static let supportsSecureCoding = true
 
   public required init?(coder aDecoder: NSCoder) {
     guard let providerID = aDecoder.decodeObject(
diff --git a/FirebaseAuth/Sources/Swift/User/User.swift b/FirebaseAuth/Sources/Swift/User/User.swift
@@ -1680,9 +1680,7 @@ extension User: NSSecureCoding {}
   private let kMultiFactorCodingKey = "multiFactor"
   private let kTenantIDCodingKey = "tenantID"
 
-  public static var supportsSecureCoding: Bool {
-    return true
-  }
+  public static let supportsSecureCoding = true
 
   public func encode(with coder: NSCoder) {
     coder.encode(uid, forKey: kUserIDCodingKey)
diff --git a/FirebaseAuth/Sources/Swift/User/UserInfoImpl.swift b/FirebaseAuth/Sources/Swift/User/UserInfoImpl.swift
@@ -72,9 +72,7 @@ extension UserInfoImpl: NSSecureCoding {}
   private static let kEmailCodingKey = "email"
   private static let kPhoneNumberCodingKey = "phoneNumber"
 
-  static var supportsSecureCoding: Bool {
-    return true
-  }
+  static let supportsSecureCoding = true
 
   func encode(with coder: NSCoder) {
     coder.encode(providerID, forKey: UserInfoImpl.kProviderIDCodingKey)
diff --git a/FirebaseAuth/Sources/Swift/User/UserMetadata.swift b/FirebaseAuth/Sources/Swift/User/UserMetadata.swift
@@ -36,9 +36,7 @@ extension UserMetadata: NSSecureCoding {}
   private static let kCreationDateCodingKey = "creationDate"
   private static let kLastSignInDateCodingKey = "lastSignInDate"
 
-  public static var supportsSecureCoding: Bool {
-    return true
-  }
+  public static let supportsSecureCoding = true
 
   public func encode(with coder: NSCoder) {
     coder.encode(creationDate, forKey: UserMetadata.kCreationDateCodingKey)
diff --git a/FirebaseCombineSwift/Sources/Auth/GameCenterAuthProvider+Combine.swift b/FirebaseCombineSwift/Sources/Auth/GameCenterAuthProvider+Combine.swift
@@ -12,14 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if canImport(Combine) && swift(>=5.0)
+#if canImport(Combine) && !os(watchOS)
 
   import Combine
   import FirebaseAuth
 
   @available(swift 5.0)
   @available(iOS 13.0, macOS 10.15, macCatalyst 13.0, tvOS 13.0, *)
-  @available(watchOS, unavailable)
   public extension GameCenterAuthProvider {
     /// Creates an `AuthCredential` for a Game Center sign in.
     ///
diff --git a/FirebaseFunctions/Sources/Internal/FunctionsContext.swift b/FirebaseFunctions/Sources/Internal/FunctionsContext.swift
@@ -36,12 +36,53 @@ struct FunctionsContextProvider {
     self.appCheck = appCheck
   }
 
-  // TODO: Implement async await version
-//  @available(macOS 10.15.0, *)
-//  internal func getContext() async throws -> FunctionsContext {
-//    return FunctionsContext(authToken: nil, fcmToken: nil, appCheckToken: nil)
-//
-//  }
+  @available(iOS 13, macCatalyst 13, macOS 10.15, tvOS 13, watchOS 7, *)
+  func context(options: HTTPSCallableOptions?) async throws -> FunctionsContext {
+    async let authToken = auth?.getToken(forcingRefresh: false)
+    async let appCheckToken = getAppCheckToken(options: options)
+    async let limitedUseAppCheckToken = getLimitedUseAppCheckToken(options: options)
+
+    // Only `authToken` is throwing, but the formatter script removes the `try`
+    // from `try authToken` and puts it in front of the initializer call.
+    return try await FunctionsContext(
+      authToken: authToken,
+      fcmToken: messaging?.fcmToken,
+      appCheckToken: appCheckToken,
+      limitedUseAppCheckToken: limitedUseAppCheckToken
+    )
+  }
+
+  @available(iOS 13, macCatalyst 13, macOS 10.15, tvOS 13, watchOS 7, *)
+  private func getAppCheckToken(options: HTTPSCallableOptions?) async -> String? {
+    guard
+      options?.requireLimitedUseAppCheckTokens != true,
+      let tokenResult = await appCheck?.getToken(forcingRefresh: false),
+      tokenResult.error == nil
+    else { return nil }
+    return tokenResult.token
+  }
+
+  @available(iOS 13, macCatalyst 13, macOS 10.15, tvOS 13, watchOS 7, *)
+  private func getLimitedUseAppCheckToken(options: HTTPSCallableOptions?) async -> String? {
+    // At the moment, `await` doesn’t get along with Objective-C’s optional protocol methods.
+    await withCheckedContinuation { (continuation: CheckedContinuation<String?, Never>) in
+      guard
+        options?.requireLimitedUseAppCheckTokens == true,
+        let appCheck,
+        // `getLimitedUseToken(completion:)` is an optional protocol method. Optional binding
+        // is performed to make sure `continuation` is called even if the method’s not implemented.
+        let limitedUseTokenClosure = appCheck.getLimitedUseToken
+      else {
+        return continuation.resume(returning: nil)
+      }
+
+      limitedUseTokenClosure { tokenResult in
+        // Make sure there’s no error and the token is valid:
+        guard tokenResult.error == nil else { return continuation.resume(returning: nil) }
+        continuation.resume(returning: tokenResult.token)
+      }
+    }
+  }
 
   func getContext(options: HTTPSCallableOptions? = nil,
                   _ completion: @escaping ((FunctionsContext, Error?) -> Void)) {
diff --git a/FirebaseFunctions/Tests/Unit/ContextProviderTests.swift b/FirebaseFunctions/Tests/Unit/ContextProviderTests.swift
diff --git a/FirebaseVertexAI/Tests/Integration/IntegrationTests.swift b/FirebaseVertexAI/Tests/Integration/IntegrationTests.swift
diff --git a/FirebaseVertexAI/Tests/Integration/Resources/placeholder.txt b/FirebaseVertexAI/Tests/Integration/Resources/placeholder.txt
diff --git a/Package.swift b/Package.swift
diff --git a/scripts/build.sh b/scripts/build.sh
diff --git a/scripts/spm_test_schemes/FirebaseVertexAIIntegration.xcscheme b/scripts/spm_test_schemes/FirebaseVertexAIIntegration.xcscheme
