Skip to content

fix for _userAccessGroup being nil when getStoredUserForAccessGroup is called #7472

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 11 commits into from
Mar 2, 2021
Merged

fix for _userAccessGroup being nil when getStoredUserForAccessGroup is called #7472

Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
548de29
shareLoginAcrossDevices
joehinkle11 Nov 8, 2020
5acfb1f
shareLoginAcrossDevices
joehinkle11 Nov 8, 2020
46d8440
shareLoginAcrossDevices
joehinkle11 Nov 8, 2020
c8a5b42
shareLoginAcrossDevices
joehinkle11 Nov 8, 2020
783e489
formatting
joehinkle11 Nov 8, 2020
3cac49c
Merge pull request #1 from firebase/master
joehinkle11 Jan 3, 2021
3464c15
feedback changes
joehinkle11 Jan 3, 2021
74c1a42
linted
joehinkle11 Jan 3, 2021
8fd24d0
Merge pull request #2 from firebase/master
joehinkle11 Feb 6, 2021
629039b
setting _userAccessGroup needs to happen before getStoredUserForAcces…
joehinkle11 Feb 6, 2021
315d2b7
proper fix as suggested by rosalyntan
joehinkle11 Mar 1, 2021
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
11 changes: 6 additions & 5 deletions FirebaseAuth/Sources/Auth/FIRAuth.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2205,6 +2205,12 @@ - (BOOL)internalUseUserAccessGroup:(NSString *_Nullable)accessGroup
return NO;
}

if (_userAccessGroup == nil && accessGroup != nil) {
NSString *userKey = [NSString stringWithFormat:kUserKey, _firebaseAppName];
[_keychainServices removeDataForKey:userKey error:outError];
}
_userAccessGroup = accessGroup;

FIRUser *user = [self getStoredUserForAccessGroup:accessGroup error:outError];
if (!user && outError && *outError) {
return NO;
Expand All @@ -2214,11 +2220,6 @@ - (BOOL)internalUseUserAccessGroup:(NSString *_Nullable)accessGroup
return NO;
}

if (_userAccessGroup == nil && accessGroup != nil) {
NSString *userKey = [NSString stringWithFormat:kUserKey, _firebaseAppName];
[_keychainServices removeDataForKey:userKey error:outError];
}
_userAccessGroup = accessGroup;
self->_lastNotifiedUserToken = user.rawAccessToken;

return YES;
Expand Down