File tree 2 files changed +15
-10
lines changed
2 files changed +15
-10
lines changed Original file line number Diff line number Diff line change 5
5
` Auth.currentUser ` API. This resolves some Firebase 11 issues where the
6
6
current user is unexpectedly ` nil ` at startup.
7
7
- [ fixed] Restore Firebase 10 decoding behavior to prevent user provider data
8
- from being decoded as ` nil ` . (#14011 )
8
+ from always being decoded as ` nil ` . Note that this fix was only needed for
9
+ cases where Firebase 11 was reading data written by Firebase 10. (#14011 )
10
+ - [ fixed] Restore Firebase 10 decoding behavior to prevent user provider data
11
+ from being decoded as ` nil ` when a user has multiple linked providers. Note
12
+ that this fix was only needed for cases where Firebase 11 was reading data
13
+ written by Firebase 10. Note that this fix will not be in the 11.6.0 zip and
14
+ Carthage distributions, but will be included from 11.6.0 onwards. (#14011 )
9
15
10
16
# 11.5.0
11
17
- [ fixed] Restore pre-Firebase 11 decoding behavior to prevent users getting
Original file line number Diff line number Diff line change @@ -88,17 +88,16 @@ class UserInfoImpl: NSObject, UserInfo {
88
88
}
89
89
90
90
required convenience init ? ( coder: NSCoder ) {
91
- guard let providerID = coder. decodeObject (
91
+ let providerID = coder. decodeObject (
92
92
of: [ NSString . self] ,
93
93
forKey: UserInfoImpl . kProviderIDCodingKey
94
- ) as? String ,
95
- let userID = coder. decodeObject (
96
- of: [ NSString . self] ,
97
- forKey: UserInfoImpl . kUserIDCodingKey
98
- ) as? String
99
- else {
100
- return nil
101
- }
94
+ ) as? String ?? " "
95
+ // Not all providers have a corresponding user ID (e.g. phone auth), so
96
+ // fall back to an empty string.
97
+ let userID = coder. decodeObject (
98
+ of: [ NSString . self] ,
99
+ forKey: UserInfoImpl . kUserIDCodingKey
100
+ ) as? String ?? " "
102
101
let displayName = coder. decodeObject (
103
102
of: [ NSString . self] ,
104
103
forKey: UserInfoImpl . kDisplayNameCodingKey
You can’t perform that action at this time.
0 commit comments