Skip to content

Fix keychain issues #3239

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 2 commits into from
Jun 24, 2019
Merged

Fix keychain issues #3239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53e42a5
Fix keychain issues
renkelvin Jun 21, 2019
b0e118c
Simplify auth setting logic
renkelvin Jun 22, 2019
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
2 changes: 1 addition & 1 deletion Firebase/Auth/Source/Auth/FIRAuth.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2020,13 +2020,13 @@ - (nullable FIRUser *)getStoredUserForAccessGroup:(NSString *_Nullable)accessGro
NSKeyedUnarchiver *unarchiver =
[[NSKeyedUnarchiver alloc] initForReadingWithData:encodedUserData];
user = [unarchiver decodeObjectOfClass:[FIRUser class] forKey:userKey];
user.auth = self;
} else {
user = [self.storedUserManager getStoredUserForAccessGroup:self.userAccessGroup
projectIdentifier:self.app.options.APIKey
error:outError];
}

user.auth = self;
return user;
}

Expand Down
2 changes: 1 addition & 1 deletion Firebase/Auth/Source/User/FIRUser.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ - (nullable instancetype)initWithCoder:(NSCoder *)aDecoder {
FIRUserMetadata *metadata =
[aDecoder decodeObjectOfClass:[FIRUserMetadata class] forKey:kMetadataCodingKey];
NSString *APIKey =
[aDecoder decodeObjectOfClass:[FIRUserMetadata class] forKey:kAPIKeyCodingKey];
[aDecoder decodeObjectOfClass:[NSString class] forKey:kAPIKeyCodingKey];
if (!userID || !tokenService) {
return nil;
}
Expand Down