From fd9fd271d0dba3935a6f5611a1554f2c59b696af Mon Sep 17 00:00:00 2001 From: zxu Date: Thu, 15 Feb 2018 17:23:08 -0500 Subject: replacing Auth/FSTUser by C++ auth implementation (#804) * replacing Auth/FSTUser by C++ auth implementation * address changes --- Firestore/Source/Local/FSTLocalStore.mm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Firestore/Source/Local/FSTLocalStore.mm') diff --git a/Firestore/Source/Local/FSTLocalStore.mm b/Firestore/Source/Local/FSTLocalStore.mm index 8a383e5..d12a45b 100644 --- a/Firestore/Source/Local/FSTLocalStore.mm +++ b/Firestore/Source/Local/FSTLocalStore.mm @@ -16,7 +16,6 @@ #import "Firestore/Source/Local/FSTLocalStore.h" -#import "Firestore/Source/Auth/FSTUser.h" #import "Firestore/Source/Core/FSTListenSequence.h" #import "Firestore/Source/Core/FSTQuery.h" #import "Firestore/Source/Core/FSTSnapshotVersion.h" @@ -41,8 +40,10 @@ #import "Firestore/Source/Util/FSTAssert.h" #import "Firestore/Source/Util/FSTLogger.h" +#include "Firestore/core/src/firebase/firestore/auth/user.h" #include "Firestore/core/src/firebase/firestore/core/target_id_generator.h" +using firebase::firestore::auth::User; using firebase::firestore::core::TargetIdGenerator; NS_ASSUME_NONNULL_BEGIN @@ -99,7 +100,7 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)initWithPersistence:(id)persistence garbageCollector:(id)garbageCollector - initialUser:(FSTUser *)initialUser { + initialUser:(const User &)initialUser { if (self = [super init]) { _persistence = persistence; _mutationQueue = [persistence mutationQueueForUser:initialUser]; @@ -166,7 +167,7 @@ NS_ASSUME_NONNULL_BEGIN [self.queryCache shutdown]; } -- (FSTMaybeDocumentDictionary *)userDidChange:(FSTUser *)user { +- (FSTMaybeDocumentDictionary *)userDidChange:(const User &)user { // Swap out the mutation queue, grabbing the pending mutation batches before and after. NSArray *oldBatches = [self.mutationQueue allMutationBatches]; -- cgit v1.2.3