Skip to content

feat: Implement UseUserAccessGroup for iOS #1756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed
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
5 changes: 5 additions & 0 deletions auth/src/android/auth_android.cc
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,11 @@ void Auth::UseEmulator(std::string host, uint32_t port) {
SetEmulatorJni(auth_data_, host.c_str(), port);
}

AuthError Auth::UseUserAccessGroup(const char* access_group) {
// Not implemented on Android.
return kAuthErrorUnimplemented;
}

// Not implemented for Android.
void EnableTokenAutoRefresh(AuthData* auth_data) {}
void DisableTokenAutoRefresh(AuthData* auth_data) {}
Expand Down
5 changes: 5 additions & 0 deletions auth/src/desktop/auth_desktop.cc
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,11 @@ void Auth::UseEmulator(std::string host, uint32_t port) {
auth_impl->assigned_emulator_url.append(std::to_string(port));
}

AuthError Auth::UseUserAccessGroup(const char* access_group) {
// Not implemented on desktop.
return kAuthErrorUnimplemented;
}

void InitializeTokenRefresher(AuthData* auth_data) {
auto auth_impl = static_cast<AuthImpl*>(auth_data->auth_impl);
auth_impl->token_refresh_thread.Initialize(auth_data);
Expand Down
22 changes: 22 additions & 0 deletions auth/src/include/firebase/auth.h
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,28 @@ class Auth {
/// set_language_code().
void UseAppLanguage();

/// @brief Uses the specified user access group for keychain operations on
/// iOS.
///
/// This method should be called before any other Firebase Auth operations that
/// might interact with the keychain, such as sign-in or sign-out.
///
/// On iOS, this method corresponds to `[FIRAuth useUserAccessGroup:]`.
/// If a value is provided, it will be used to set the user's access group,
/// which will be used to share credentials across apps from the same
/// developer. If `nullptr` is provided, it will clear any previously set
/// access group.
///
/// On other platforms (Android, desktop), this method is a no-op and will
/// always return `kAuthErrorNone`.
///
/// @param[in] access_group The access group to use, or `nullptr` to clear
/// the access group.
///
/// @return `kAuthErrorNone` on success, or an `AuthError` code if an error
/// occurred on iOS (e.g., keychain error).
AuthError UseUserAccessGroup(const char* access_group);

// ----- Providers -------------------------------------------------------
/// Asynchronously requests the IDPs (identity providers) that can be used
/// for the given email address.
Expand Down
20 changes: 20 additions & 0 deletions auth/src/ios/auth_ios.mm
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,26 @@ void SignInCallback(FIRUser *_Nullable user, NSError *_Nullable error,
SetEmulatorJni(auth_data_, host.c_str(), port);
}

AuthError Auth::UseUserAccessGroup(const char* access_group) {
if (!auth_data_) {
return kAuthErrorUninitialized;
}
FIRAuth* fir_auth = AuthImpl(auth_data_);
NSString* ns_access_group = nil;
if (access_group && strlen(access_group) > 0) {
ns_access_group = [NSString stringWithUTF8String:access_group];
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Handle an empty string too

}

NSError* ns_error = nil;
BOOL success = [fir_auth useUserAccessGroup:ns_access_group error:&ns_error];

if (success) {
return kAuthErrorNone;
} else {
return AuthErrorFromNSError(ns_error);
}
}

// Remap iOS SDK errors reported by the UIDelegate. While these errors seem like
// user interaction errors, they are actually caused by bad provider ids.
NSError *RemapBadProviderIDErrors(NSError *_Nonnull error) {
Expand Down
Loading