1 files changed, 4 insertions, 28 deletions
diff --git a/Firestore/Source/Auth/FSTCredentialsProvider.mm b/Firestore/Source/Auth/FSTCredentialsProvider.mm
index cf045e3..084f313 100644
--- a/Firestore/Source/Auth/FSTCredentialsProvider.mm
+++ b/Firestore/Source/Auth/FSTCredentialsProvider.mm
@@ -25,38 +25,16 @@
 #import "Firestore/Source/Util/FSTClasses.h"
 #import "Firestore/Source/Util/FSTDispatchQueue.h"
 
+#include "Firestore/core/src/firebase/firestore/auth/token.h"
 #include "Firestore/core/src/firebase/firestore/auth/user.h"
 #include "Firestore/core/src/firebase/firestore/util/string_apple.h"
 
 namespace util = firebase::firestore::util;
+using firebase::firestore::auth::Token;
 using firebase::firestore::auth::User;
 
 NS_ASSUME_NONNULL_BEGIN
 
-#pragma mark - FSTGetTokenResult
-
-@interface FSTGetTokenResult () {
-  User _user;
-}
-
-@end
-
-@implementation FSTGetTokenResult
-
-- (instancetype)initWithUser:(const User &)user token:(NSString *_Nullable)token {
-  if (self = [super init]) {
-    _user = user;
-    _token = token;
-  }
-  return self;
-}
-
-- (const User &)user {
-  return _user;
-}
-
-@end
-
 #pragma mark - FSTFirebaseCredentialsProvider
 @interface FSTFirebaseCredentialsProvider () {
   /** The current user as reported to us via our AuthStateDidChangeListener. */
@@ -141,11 +119,9 @@ NS_ASSUME_NONNULL_BEGIN
             NSError *cancelError = [NSError errorWithDomain:FIRFirestoreErrorDomain
                                                        code:FIRFirestoreErrorCodeAborted
                                                    userInfo:errorInfo];
-            completion(nil, cancelError);
+            completion(Token::Invalid(), cancelError);
           } else {
-            FSTGetTokenResult *result =
-                [[FSTGetTokenResult alloc] initWithUser:_currentUser token:token];
-            completion(result, error);
+            completion(Token(util::MakeStringView(token), _currentUser), error);
           }
         };
       };