Skip to content

[Auth] Add default values for decoding nil properties in UserInfoImpl #14185

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 6 commits into from
Nov 28, 2024
Merged

[Auth] Add default values for decoding nil properties in UserInfoImpl #14185

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4dddfee
[Auth] Add default values for decoding nil properties in UserInfoImpl
ncooke3 Nov 28, 2024
1445fd8
changelog entry
ncooke3 Nov 28, 2024
114223f
Update FirebaseAuth/CHANGELOG.md
ncooke3 Nov 28, 2024
7915db1
Update CHANGELOG.md
ncooke3 Nov 28, 2024
1c78e4b
Apply suggestions from code review
ncooke3 Nov 28, 2024
ca20f81
Update FirebaseAuth/CHANGELOG.md
ncooke3 Nov 28, 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
17 changes: 8 additions & 9 deletions FirebaseAuth/Sources/Swift/User/UserInfoImpl.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,16 @@ class UserInfoImpl: NSObject, UserInfo {
}

required convenience init?(coder: NSCoder) {
guard let providerID = coder.decodeObject(
let providerID = coder.decodeObject(
of: [NSString.self],
forKey: UserInfoImpl.kProviderIDCodingKey
) as? String,
let userID = coder.decodeObject(
of: [NSString.self],
forKey: UserInfoImpl.kUserIDCodingKey
) as? String
else {
return nil
}
) as? String ?? ""
// Not all providers have a corresponding user ID (e.g. phone auth), so
// fall back to an empty string.
let userID = coder.decodeObject(
of: [NSString.self],
forKey: UserInfoImpl.kUserIDCodingKey
) as? String ?? ""
let displayName = coder.decodeObject(
of: [NSString.self],
forKey: UserInfoImpl.kDisplayNameCodingKey
Expand Down
Loading