Skip to content

Commit 1cf4081

Browse files
committed
Fix OAuth sign-in not disabling tvOS correctly
1 parent 19731d9 commit 1cf4081

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

auth/src/ios/credential_ios.mm

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,7 @@ explicit PhoneAuthProviderData(FIRPhoneAuthProvider* objc_provider)
445445
assert(auth_data);
446446
ReferenceCountedFutureImpl& futures = auth_data->future_impl;
447447
const auto handle = futures.SafeAlloc<AuthResult>(kAuthFn_SignInWithProvider, AuthResult());
448+
#if FIREBASE_PLATFORM_IOS
448449
FIROAuthProvider* ios_provider = (FIROAuthProvider*)[FIROAuthProvider
449450
providerWithProviderID:@(provider_data_.provider_id.c_str())
450451
auth:AuthImpl(auth_data)];
@@ -465,6 +466,12 @@ explicit PhoneAuthProviderData(FIRPhoneAuthProvider* objc_provider)
465466
AuthResult());
466467
return future;
467468
}
469+
470+
#else // non-iOS Apple platforms (eg: tvOS)
471+
Future<AuthResult> future = MakeFuture(&futures, handle);
472+
futures.Complete(handle, kAuthErrorApiNotAvailable,
473+
"OAuth provider sign-in is not supported on non-iOS Apple platforms.");
474+
#endif // FIREBASE_PLATFORM_IOS
468475
}
469476

470477
Future<AuthResult> FederatedOAuthProvider::Link(AuthData* auth_data) {

cmake/toolchains/apple.toolchain.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ if(NOT DEFINED DEPLOYMENT_TARGET)
257257
set(DEPLOYMENT_TARGET "13.0")
258258
else()
259259
# Unless specified, SDK version 11.0 is used by default as minimum target version (iOS, tvOS).
260-
set(DEPLOYMENT_TARGET "11.0")
260+
set(DEPLOYMENT_TARGET "13.0")
261261
endif()
262262
message(STATUS "[DEFAULTS] Using the default min-version since DEPLOYMENT_TARGET not provided!")
263263
elseif(DEFINED DEPLOYMENT_TARGET AND PLATFORM STREQUAL "MAC_CATALYST" AND ${DEPLOYMENT_TARGET} VERSION_LESS "13.0")

0 commit comments

Comments
 (0)