replacing Auth/FSTUser by C++ auth implementation (#804)

* replacing Auth/FSTUser by C++ auth implementation

* address changes

5 files changed, 19 insertions, 12 deletions

diff --git a/Firestore/Example/Tests/Local/FSTLevelDBLocalStoreTests.mm b/Firestore/Example/Tests/Local/FSTLevelDBLocalStoreTests.mm
index f71f5c9..97e3c5b 100644
--- a/Firestore/Example/Tests/Local/FSTLevelDBLocalStoreTests.mm
+++ b/Firestore/Example/Tests/Local/FSTLevelDBLocalStoreTests.mm
@@ -18,7 +18,6 @@
 
 #import <XCTest/XCTest.h>
 
-#import "Firestore/Source/Auth/FSTUser.h"
 #import "Firestore/Source/Local/FSTLevelDB.h"
 
 #import "Firestore/Example/Tests/Local/FSTLocalStoreTests.h"
diff --git a/Firestore/Example/Tests/Local/FSTLevelDBMutationQueueTests.mm b/Firestore/Example/Tests/Local/FSTLevelDBMutationQueueTests.mm
index fe79598..2e24055 100644
--- a/Firestore/Example/Tests/Local/FSTLevelDBMutationQueueTests.mm
+++ b/Firestore/Example/Tests/Local/FSTLevelDBMutationQueueTests.mm
@@ -20,7 +20,6 @@
 #include <leveldb/db.h>
 
 #import "Firestore/Protos/objc/firestore/local/Mutation.pbobjc.h"
-#import "Firestore/Source/Auth/FSTUser.h"
 #import "Firestore/Source/Local/FSTLevelDB.h"
 #import "Firestore/Source/Local/FSTLevelDBKey.h"
 #import "Firestore/Source/Local/FSTWriteGroup.h"
@@ -28,6 +27,7 @@
 #import "Firestore/Example/Tests/Local/FSTMutationQueueTests.h"
 #import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h"
 
+#include "Firestore/core/src/firebase/firestore/auth/user.h"
 #include "Firestore/core/src/firebase/firestore/util/ordered_code.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -37,6 +37,7 @@ using leveldb::Slice;
 using leveldb::Status;
 using leveldb::WriteOptions;
 using Firestore::StringView;
+using firebase::firestore::auth::User;
 using firebase::firestore::util::OrderedCode;
 
 // A dummy mutation value, useful for testing code that's known to examine only mutation keys.
@@ -69,7 +70,7 @@ std::string MutationLikeKey(StringView table, StringView userID, FSTBatchID batc
 - (void)setUp {
   [super setUp];
   _db = [FSTPersistenceTestHelpers levelDBPersistence];
-  self.mutationQueue = [_db mutationQueueForUser:[[FSTUser alloc] initWithUID:@"user"]];
+  self.mutationQueue = [_db mutationQueueForUser:User("user")];
   self.persistence = _db;
 
   FSTWriteGroup *group = [self.persistence startGroupWithAction:@"Start MutationQueue"];
diff --git a/Firestore/Example/Tests/Local/FSTLocalStoreTests.mm b/Firestore/Example/Tests/Local/FSTLocalStoreTests.mm
index 45d1815..f3493ce 100644
--- a/Firestore/Example/Tests/Local/FSTLocalStoreTests.mm
+++ b/Firestore/Example/Tests/Local/FSTLocalStoreTests.mm
@@ -18,7 +18,6 @@
 
 #import <XCTest/XCTest.h>
 
-#import "Firestore/Source/Auth/FSTUser.h"
 #import "Firestore/Source/Core/FSTQuery.h"
 #import "Firestore/Source/Core/FSTTimestamp.h"
 #import "Firestore/Source/Local/FSTEagerGarbageCollector.h"
@@ -42,6 +41,10 @@
 #import "Firestore/third_party/Immutable/Tests/FSTImmutableSortedDictionary+Testing.h"
 #import "Firestore/third_party/Immutable/Tests/FSTImmutableSortedSet+Testing.h"
 
+#include "Firestore/core/src/firebase/firestore/auth/user.h"
+
+using firebase::firestore::auth::User;
+
 NS_ASSUME_NONNULL_BEGIN
 
 /** Creates a document version dictionary mapping the document in @a mutation to @a version. */
@@ -77,7 +80,7 @@ FSTDocumentVersionDictionary *FSTVersionDictionary(FSTMutation *mutation,
   id<FSTGarbageCollector> garbageCollector = [[FSTEagerGarbageCollector alloc] init];
   self.localStore = [[FSTLocalStore alloc] initWithPersistence:persistence
                                               garbageCollector:garbageCollector
-                                                   initialUser:[FSTUser unauthenticatedUser]];
+                                                   initialUser:User::Unauthenticated()];
   [self.localStore start];
 
   _batches = [NSMutableArray array];
@@ -112,7 +115,7 @@ FSTDocumentVersionDictionary *FSTVersionDictionary(FSTMutation *mutation,
   id<FSTGarbageCollector> garbageCollector = [[FSTNoOpGarbageCollector alloc] init];
   self.localStore = [[FSTLocalStore alloc] initWithPersistence:self.localStorePersistence
                                               garbageCollector:garbageCollector
-                                                   initialUser:[FSTUser unauthenticatedUser]];
+                                                   initialUser:User::Unauthenticated()];
   [self.localStore start];
 }
 
diff --git a/Firestore/Example/Tests/Local/FSTMemoryMutationQueueTests.mm b/Firestore/Example/Tests/Local/FSTMemoryMutationQueueTests.mm
index ab7afee..5567078 100644
--- a/Firestore/Example/Tests/Local/FSTMemoryMutationQueueTests.mm
+++ b/Firestore/Example/Tests/Local/FSTMemoryMutationQueueTests.mm
@@ -16,12 +16,15 @@
 
 #import "Firestore/Source/Local/FSTMemoryMutationQueue.h"
 
-#import "Firestore/Source/Auth/FSTUser.h"
 #import "Firestore/Source/Local/FSTMemoryPersistence.h"
 
 #import "Firestore/Example/Tests/Local/FSTMutationQueueTests.h"
 #import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h"
 
+#include "Firestore/core/src/firebase/firestore/auth/user.h"
+
+using firebase::firestore::auth::User;
+
 @interface FSTMemoryMutationQueueTests : FSTMutationQueueTests
 @end
 
@@ -35,8 +38,7 @@
   [super setUp];
 
   self.persistence = [FSTPersistenceTestHelpers memoryPersistence];
-  self.mutationQueue =
-      [self.persistence mutationQueueForUser:[[FSTUser alloc] initWithUID:@"user"]];
+  self.mutationQueue = [self.persistence mutationQueueForUser:User("user")];
 }
 
 @end
diff --git a/Firestore/Example/Tests/Local/FSTMutationQueueTests.mm b/Firestore/Example/Tests/Local/FSTMutationQueueTests.mm
index 020a0a7..62d30fb 100644
--- a/Firestore/Example/Tests/Local/FSTMutationQueueTests.mm
+++ b/Firestore/Example/Tests/Local/FSTMutationQueueTests.mm
@@ -16,7 +16,6 @@
 
 #import "Firestore/Example/Tests/Local/FSTMutationQueueTests.h"
 
-#import "Firestore/Source/Auth/FSTUser.h"
 #import "Firestore/Source/Core/FSTQuery.h"
 #import "Firestore/Source/Core/FSTTimestamp.h"
 #import "Firestore/Source/Local/FSTEagerGarbageCollector.h"
@@ -28,6 +27,10 @@
 
 #import "Firestore/Example/Tests/Util/FSTHelpers.h"
 
+#include "Firestore/core/src/firebase/firestore/auth/user.h"
+
+using firebase::firestore::auth::User;
+
 NS_ASSUME_NONNULL_BEGIN
 
 @implementation FSTMutationQueueTests
@@ -127,8 +130,7 @@ NS_ASSUME_NONNULL_BEGIN
 
   // Restart the queue so that nextBatchID will be reset.
   [self.mutationQueue shutdown];
-  self.mutationQueue =
-      [self.persistence mutationQueueForUser:[[FSTUser alloc] initWithUID:@"user"]];
+  self.mutationQueue = [self.persistence mutationQueueForUser:User("user")];
 
   FSTWriteGroup *group = [self.persistence startGroupWithAction:@"Start MutationQueue"];
   [self.mutationQueue startWithGroup:group];