Skip to content

[Auth] Better keychain error descriptions #13600

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Sep 6, 2024
Merged

[Auth] Better keychain error descriptions #13600

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1dbf4a2
[Auth] Better keychain error descriptions
paulb777 Sep 6, 2024
069c647
review and style
paulb777 Sep 6, 2024
e3bf16e
warning fix
paulb777 Sep 6, 2024
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
3 changes: 2 additions & 1 deletion FirebaseAuth/Sources/Swift/Utilities/AuthErrorUtils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,8 @@ class AuthErrorUtils: NSObject {
}

static func keychainError(function: String, status: OSStatus) -> Error {
let reason = "\(function) (\(status))"
let message = SecCopyErrorMessageString(status, nil)
let reason = "\(function) (\(status)) \(message)"
return error(code: .keychainError, userInfo: [NSLocalizedFailureReasonErrorKey: reason])
}

Expand Down
19 changes: 12 additions & 7 deletions ...Auth/Tests/SampleSwift/AuthenticationExample/ViewControllers/SettingsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,19 @@ class SettingsViewController: UIViewController, DataSourceProviderDelegate {
}

private func toggleAccessGroup() {
if AppManager.shared.auth().userAccessGroup == nil {
guard let bundleDictionary = Bundle.main.infoDictionary,
let group = bundleDictionary["AppIdentifierPrefix"] as? String else {
fatalError("Configure AppIdentifierPrefix in the plist")
do {
if AppManager.shared.auth().userAccessGroup == nil {
guard let bundleDictionary = Bundle.main.infoDictionary,
let group = bundleDictionary["AppIdentifierPrefix"] as? String else {
fatalError("Configure AppIdentifierPrefix in the plist")
}
try AppManager.shared.auth().useUserAccessGroup(group +
".com.google.firebase.auth.keychainGroup1")
} else {
try AppManager.shared.auth().useUserAccessGroup(nil)
}
AppManager.shared.auth().userAccessGroup = group + "com.google.firebase.auth.keychainGroup1"
} else {
AppManager.shared.auth().userAccessGroup = nil
} catch {
fatalError("Failed to set userAccessGroup with error \(error)")
}
}

Expand Down
Loading