Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions FirebaseAuth/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Unreleased
- [removed] **Breaking Change**: Removed
`ActionCodeSettings.dynamicLinkDomain`.

# 11.15.0
- [fixed] Fixed `Sendable` warnings introduced in the Xcode 26 beta. (#14996)

Expand Down
22 changes: 0 additions & 22 deletions FirebaseAuth/Sources/Swift/ActionCode/ActionCodeSettings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,6 @@ import Foundation
set { impl.androidInstallIfNotAvailable.withLock { $0 = newValue } }
}

/// The Firebase Dynamic Link domain used for out of band code flow.
#if !FIREBASE_CI
@available(
*,
deprecated,
message: "Firebase Dynamic Links is deprecated. Migrate to use Firebase Hosting link and use `linkDomain` to set a custom domain instead."
)
#endif // !FIREBASE_CI
@objc open var dynamicLinkDomain: String? {
get { impl.dynamicLinkDomain.value() }
set { impl.dynamicLinkDomain.withLock { $0 = newValue } }
}

/// The out of band custom domain for handling code in app.
@objc public var linkDomain: String? {
get { impl.linkDomain.value() }
Expand Down Expand Up @@ -130,15 +117,6 @@ private extension ActionCodeSettings {

let androidInstallIfNotAvailable = FIRAllocatedUnfairLock<Bool>(initialState: false)

#if !FIREBASE_CI
@available(
*,
deprecated,
message: "Firebase Dynamic Links is deprecated. Migrate to use Firebase Hosting link and use `linkDomain` to set a custom domain instead."
)
#endif // !FIREBASE_CI
let dynamicLinkDomain = FIRAllocatedUnfairLock<String?>(initialState: nil)

let linkDomain = FIRAllocatedUnfairLock<String?>(initialState: nil)

init() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,6 @@ private let kAndroidMinimumVersionKey = "androidMinimumVersion"
/// or not.
private let kCanHandleCodeInAppKey = "canHandleCodeInApp"

/// The key for the "dynamic link domain" value in the request.
private let kDynamicLinkDomainKey = "dynamicLinkDomain"

/// The key for the "link domain" value in the request.
private let kLinkDomainKey = "linkDomain"

Expand Down Expand Up @@ -105,12 +102,6 @@ private let kClientType = "clientType"
/// The key for the "recaptchaVersion" value in the request.
private let kRecaptchaVersion = "recaptchaVersion"

protocol SuppressWarning {
var dynamicLinkDomain: String? { get set }
}

extension ActionCodeSettings: SuppressWarning {}

@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
class GetOOBConfirmationCodeRequest: IdentityToolkitRequest, AuthRPCRequest {
typealias Response = GetOOBConfirmationCodeResponse
Expand Down Expand Up @@ -146,9 +137,6 @@ class GetOOBConfirmationCodeRequest: IdentityToolkitRequest, AuthRPCRequest {
/// redirected from a Firebase owned web widget.
let handleCodeInApp: Bool

/// The Firebase Dynamic Link domain used for out of band code flow.
private let dynamicLinkDomain: String?

/// The Firebase Hosting domain used for out of band code flow.
private(set) var linkDomain: String?

Expand Down Expand Up @@ -183,12 +171,6 @@ class GetOOBConfirmationCodeRequest: IdentityToolkitRequest, AuthRPCRequest {
androidMinimumVersion = actionCodeSettings?.androidMinimumVersion
androidInstallApp = actionCodeSettings?.androidInstallIfNotAvailable ?? false
handleCodeInApp = actionCodeSettings?.handleCodeInApp ?? false
dynamicLinkDomain =
if let actionCodeSettings {
(actionCodeSettings as SuppressWarning).dynamicLinkDomain
} else {
nil
}
linkDomain = actionCodeSettings?.linkDomain

super.init(
Expand Down Expand Up @@ -289,9 +271,6 @@ class GetOOBConfirmationCodeRequest: IdentityToolkitRequest, AuthRPCRequest {
if handleCodeInApp {
body[kCanHandleCodeInAppKey] = true
}
if let dynamicLinkDomain {
body[kDynamicLinkDomainKey] = dynamicLinkDomain
}
if let linkDomain {
body[kLinkDomainKey] = linkDomain
}
Expand Down
3 changes: 0 additions & 3 deletions FirebaseAuth/Tests/Unit/GetOOBConfirmationCodeTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ class GetOOBConfirmationCodeTests: RPCBaseTests {
private let kAndroidInstallAppKey = "androidInstallApp"
private let kAndroidMinimumVersionKey = "androidMinimumVersion"
private let kCanHandleCodeInAppKey = "canHandleCodeInApp"
private let kDynamicLinkDomainKey = "dynamicLinkDomain"
private let kLinkDomainKey = "linkDomain"
private let kExpectedAPIURL =
"https://www.googleapis.com/identitytoolkit/v3/relyingparty/getOobConfirmationCode?key=APIKey"
Expand Down Expand Up @@ -66,7 +65,6 @@ class GetOOBConfirmationCodeTests: RPCBaseTests {
XCTAssertEqual(decodedRequest[kAndroidMinimumVersionKey] as? String, kAndroidMinimumVersion)
XCTAssertEqual(decodedRequest[kAndroidInstallAppKey] as? Bool, true)
XCTAssertEqual(decodedRequest[kCanHandleCodeInAppKey] as? Bool, true)
XCTAssertEqual(decodedRequest[kDynamicLinkDomainKey] as? String, kDynamicLinkDomain)
XCTAssertEqual(decodedRequest[kLinkDomainKey] as? String, kLinkDomain)
}
}
Expand Down Expand Up @@ -111,7 +109,6 @@ class GetOOBConfirmationCodeTests: RPCBaseTests {
XCTAssertEqual(decodedRequest[kAndroidMinimumVersionKey] as? String, kAndroidMinimumVersion)
XCTAssertEqual(decodedRequest[kAndroidInstallAppKey] as? Bool, true)
XCTAssertEqual(decodedRequest[kCanHandleCodeInAppKey] as? Bool, true)
XCTAssertEqual(decodedRequest[kDynamicLinkDomainKey] as? String, kDynamicLinkDomain)
XCTAssertEqual(decodedRequest[kLinkDomainKey] as? String, kLinkDomain)
XCTAssertEqual(decodedRequest[kCaptchaResponseKey] as? String, kTestCaptchaResponse)
XCTAssertEqual(decodedRequest[kClientTypeKey] as? String, kTestClientType)
Expand Down
1 change: 0 additions & 1 deletion FirebaseAuth/Tests/Unit/ObjCAPITests.m
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ - (void)FIRActionCodeSettings_h {
NSString *s = [codeSettings iOSBundleID];
s = [codeSettings androidPackageName];
s = [codeSettings androidMinimumVersion];
s = [codeSettings dynamicLinkDomain];
s = [codeSettings linkDomain];
}

Expand Down
2 changes: 0 additions & 2 deletions FirebaseAuth/Tests/Unit/RPCBaseTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ class RPCBaseTests: XCTestCase {
let kIosBundleID = "testBundleID"
let kAndroidPackageName = "androidpackagename"
let kAndroidMinimumVersion = "3.0"
let kDynamicLinkDomain = "test.page.link"
let kLinkDomain = "link.firebaseapp.com"
let kTestPhotoURL = "https://host.domain/image"
let kCreationDateTimeIntervalInSeconds = 1_505_858_500.0
Expand Down Expand Up @@ -304,7 +303,6 @@ class RPCBaseTests: XCTestCase {
minimumVersion: kAndroidMinimumVersion)
settings.handleCodeInApp = true
settings.url = URL(string: kContinueURL)
settings.dynamicLinkDomain = kDynamicLinkDomain
settings.linkDomain = kLinkDomain
return settings
}
Expand Down
1 change: 0 additions & 1 deletion FirebaseAuth/Tests/Unit/SwiftAPI.swift
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
let _: String = codeSettings.iOSBundleID,
let _: String = codeSettings.androidPackageName,
let _: String = codeSettings.androidMinimumVersion,
let _: String = codeSettings.dynamicLinkDomain,
let _: String = codeSettings.linkDomain {}
codeSettings.linkDomain = nil
codeSettings.linkDomain = ""
Expand Down Expand Up @@ -475,8 +474,8 @@
func FIROAuthProvider_h() {
let _: (String, Auth) -> OAuthProvider = OAuthProvider.init(providerID:auth:)
let _: (AuthProviderID, Auth) -> OAuthProvider = OAuthProvider.init(providerID:auth:)
let _: (String) -> OAuthProvider = OAuthProvider.provider(providerID:)

Check warning on line 477 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.3, macOS)

'provider(providerID:)' is deprecated: Use `provider(providerID: AuthProviderID) -> OAuthProvider` instead.

Check warning on line 477 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.3, tvOS)

'provider(providerID:)' is deprecated: Use `provider(providerID: AuthProviderID) -> OAuthProvider` instead.

Check warning on line 477 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.3, catalyst)

'provider(providerID:)' is deprecated: Use `provider(providerID: AuthProviderID) -> OAuthProvider` instead.

Check warning on line 477 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.3, watchOS)

'provider(providerID:)' is deprecated: Use `provider(providerID: AuthProviderID) -> OAuthProvider` instead.

Check warning on line 477 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.3, iOS)

'provider(providerID:)' is deprecated: Use `provider(providerID: AuthProviderID) -> OAuthProvider` instead.

Check warning on line 477 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-14, Xcode_16.2, iOS)

'provider(providerID:)' is deprecated: Use `provider(providerID: AuthProviderID) -> OAuthProvider` instead.

Check warning on line 477 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.3, visionOS)

'provider(providerID:)' is deprecated: Use `provider(providerID: AuthProviderID) -> OAuthProvider` instead.
let _: (String, Auth) -> OAuthProvider = OAuthProvider.provider(providerID:auth:)

Check warning on line 478 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.3, macOS)

'provider(providerID:auth:)' is deprecated: Use `provider(providerID: AuthProviderID, auth: Auth) -> OAuthProvider` instead.

Check warning on line 478 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.3, tvOS)

'provider(providerID:auth:)' is deprecated: Use `provider(providerID: AuthProviderID, auth: Auth) -> OAuthProvider` instead.

Check warning on line 478 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.3, catalyst)

'provider(providerID:auth:)' is deprecated: Use `provider(providerID: AuthProviderID, auth: Auth) -> OAuthProvider` instead.

Check warning on line 478 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.3, watchOS)

'provider(providerID:auth:)' is deprecated: Use `provider(providerID: AuthProviderID, auth: Auth) -> OAuthProvider` instead.

Check warning on line 478 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.3, iOS)

'provider(providerID:auth:)' is deprecated: Use `provider(providerID: AuthProviderID, auth: Auth) -> OAuthProvider` instead.

Check warning on line 478 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-14, Xcode_16.2, iOS)

'provider(providerID:auth:)' is deprecated: Use `provider(providerID: AuthProviderID, auth: Auth) -> OAuthProvider` instead.

Check warning on line 478 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.3, visionOS)

'provider(providerID:auth:)' is deprecated: Use `provider(providerID: AuthProviderID, auth: Auth) -> OAuthProvider` instead.
let _: (AuthProviderID) -> OAuthProvider = OAuthProvider.provider(providerID:)
let _: (AuthProviderID, Auth) -> OAuthProvider = OAuthProvider.provider(providerID:auth:)
// `auth` defaults to `nil`
Expand All @@ -484,25 +483,25 @@
let _: String = provider.providerID
#if os(iOS)
let _: (String, String, String?) -> OAuthCredential =
OAuthProvider.credential(withProviderID:idToken:accessToken:)

Check warning on line 486 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.3, catalyst)

'credential(withProviderID:idToken:accessToken:)' is deprecated: Use `credential(providerID: AuthProviderID, idToken: String, accessToken: String? = nil) -> OAuthCredential` instead.

Check warning on line 486 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.3, iOS)

'credential(withProviderID:idToken:accessToken:)' is deprecated: Use `credential(providerID: AuthProviderID, idToken: String, accessToken: String? = nil) -> OAuthCredential` instead.

Check warning on line 486 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-14, Xcode_16.2, iOS)

'credential(withProviderID:idToken:accessToken:)' is deprecated: Use `credential(providerID: AuthProviderID, idToken: String, accessToken: String? = nil) -> OAuthCredential` instead.
let _: (AuthProviderID, String, String?) -> OAuthCredential =
OAuthProvider.credential(providerID:idToken:accessToken:)
// `accessToken` defaults to `nil`
let _: OAuthCredential =
OAuthProvider.credential(providerID: .apple, idToken: "")
let _: (String, String) -> OAuthCredential =
OAuthProvider.credential(withProviderID:accessToken:)

Check warning on line 493 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.3, catalyst)

'credential(withProviderID:accessToken:)' is deprecated: Use `credential(providerID: AuthProviderID, accessToken: String) -> OAuthCredential` instead.

Check warning on line 493 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.3, iOS)

'credential(withProviderID:accessToken:)' is deprecated: Use `credential(providerID: AuthProviderID, accessToken: String) -> OAuthCredential` instead.

Check warning on line 493 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-14, Xcode_16.2, iOS)

'credential(withProviderID:accessToken:)' is deprecated: Use `credential(providerID: AuthProviderID, accessToken: String) -> OAuthCredential` instead.
let _: (AuthProviderID, String) -> OAuthCredential = OAuthProvider
.credential(providerID:accessToken:)
let _: (String, String, String, String) -> OAuthCredential =
OAuthProvider.credential(withProviderID:idToken:rawNonce:accessToken:)

Check warning on line 497 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.3, catalyst)

'credential(withProviderID:idToken:rawNonce:accessToken:)' is deprecated: Use `credential(providerID: AuthProviderID, idToken: String, rawNonce: String, accessToken: String? = nil) -> OAuthCredential` instead.

Check warning on line 497 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.3, iOS)

'credential(withProviderID:idToken:rawNonce:accessToken:)' is deprecated: Use `credential(providerID: AuthProviderID, idToken: String, rawNonce: String, accessToken: String? = nil) -> OAuthCredential` instead.

Check warning on line 497 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-14, Xcode_16.2, iOS)

'credential(withProviderID:idToken:rawNonce:accessToken:)' is deprecated: Use `credential(providerID: AuthProviderID, idToken: String, rawNonce: String, accessToken: String? = nil) -> OAuthCredential` instead.
let _: (AuthProviderID, String, String, String?) -> OAuthCredential =
OAuthProvider.credential(providerID:idToken:rawNonce:accessToken:)
// `accessToken` defaults to `nil`
let _: OAuthCredential =
OAuthProvider.credential(providerID: .apple, idToken: "", rawNonce: "")
let _: (String, String, String) -> OAuthCredential =
OAuthProvider.credential(withProviderID:idToken:rawNonce:)

Check warning on line 504 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.3, catalyst)

'credential(withProviderID:idToken:rawNonce:)' is deprecated: Use `credential(providerID: AuthProviderID, idToken: String, rawNonce: String, accessToken: String? = nil) -> OAuthCredential` instead.

Check warning on line 504 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.3, iOS)

'credential(withProviderID:idToken:rawNonce:)' is deprecated: Use `credential(providerID: AuthProviderID, idToken: String, rawNonce: String, accessToken: String? = nil) -> OAuthCredential` instead.

Check warning on line 504 in FirebaseAuth/Tests/Unit/SwiftAPI.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-14, Xcode_16.2, iOS)

'credential(withProviderID:idToken:rawNonce:)' is deprecated: Use `credential(providerID: AuthProviderID, idToken: String, rawNonce: String, accessToken: String? = nil) -> OAuthCredential` instead.

provider.getCredentialWith(provider as? AuthUIDelegate) { credential, error in
}
Expand Down
Loading