diff options
Diffstat (limited to 'Firestore/Source')
-rw-r--r-- | Firestore/Source/Auth/FSTCredentialsProvider.h | 34 | ||||
-rw-r--r-- | Firestore/Source/Auth/FSTCredentialsProvider.mm | 32 | ||||
-rw-r--r-- | Firestore/Source/Auth/FSTEmptyCredentialsProvider.mm | 5 | ||||
-rw-r--r-- | Firestore/Source/Core/FSTFirestoreClient.mm | 2 | ||||
-rw-r--r-- | Firestore/Source/Remote/FSTDatastore.h | 3 | ||||
-rw-r--r-- | Firestore/Source/Remote/FSTDatastore.mm | 16 | ||||
-rw-r--r-- | Firestore/Source/Remote/FSTStream.mm | 21 |
7 files changed, 36 insertions, 77 deletions
diff --git a/Firestore/Source/Auth/FSTCredentialsProvider.h b/Firestore/Source/Auth/FSTCredentialsProvider.h index 230a22d..d2f04e0 100644 --- a/Firestore/Source/Auth/FSTCredentialsProvider.h +++ b/Firestore/Source/Auth/FSTCredentialsProvider.h @@ -16,6 +16,7 @@ #import <Foundation/Foundation.h> +#include "Firestore/core/src/firebase/firestore/auth/token.h" #include "Firestore/core/src/firebase/firestore/auth/user.h" NS_ASSUME_NONNULL_BEGIN @@ -23,46 +24,19 @@ NS_ASSUME_NONNULL_BEGIN @class FIRApp; @class FSTDispatchQueue; -#pragma mark - FSTGetTokenResult - -/** - * The current User and the authentication token provided by the underlying authentication - * mechanism. This is the result of calling -[FSTCredentialsProvider getTokenForcingRefresh]. - * - * ## Portability notes: no TokenType on iOS - * - * The TypeScript client supports 1st party Oauth tokens (for the Firebase Console to auth as the - * developer) and OAuth2 tokens for the node.js sdk to auth with a service account. We don't have - * plans to support either case on mobile so there's no TokenType here. - */ -// TODO(mcg): Rename FSTToken, change parameter order to line up with the other platforms. -@interface FSTGetTokenResult : NSObject - -- (instancetype)init NS_UNAVAILABLE; -- (instancetype)initWithUser:(const firebase::firestore::auth::User &)user - token:(NSString *_Nullable)token NS_DESIGNATED_INITIALIZER; - -/** The user with which the token is associated (used for persisting user state on disk, etc.). */ -@property(nonatomic, assign, readonly) const firebase::firestore::auth::User &user; - -/** The actual raw token. */ -@property(nonatomic, copy, nullable, readonly) NSString *token; - -@end - #pragma mark - Typedefs /** * `FSTVoidTokenErrorBlock` is a block that gets a token or an error. * - * @param token An auth token as a string. + * @param token An auth token, either valid or invalid when error occurred. * @param error The error if one occurred, or else `nil`. */ -typedef void (^FSTVoidGetTokenResultBlock)(FSTGetTokenResult *_Nullable token, +typedef void (^FSTVoidGetTokenResultBlock)(firebase::firestore::auth::Token token, NSError *_Nullable error); /** Listener block notified with a User. */ -typedef void (^FSTVoidUserBlock)(const firebase::firestore::auth::User &user); +typedef void (^FSTVoidUserBlock)(firebase::firestore::auth::User user); #pragma mark - FSTCredentialsProvider 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); } }; }; diff --git a/Firestore/Source/Auth/FSTEmptyCredentialsProvider.mm b/Firestore/Source/Auth/FSTEmptyCredentialsProvider.mm index 8139d79..77c08d1 100644 --- a/Firestore/Source/Auth/FSTEmptyCredentialsProvider.mm +++ b/Firestore/Source/Auth/FSTEmptyCredentialsProvider.mm @@ -19,8 +19,10 @@ #import "Firestore/Source/Util/FSTAssert.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" +using firebase::firestore::auth::Token; using firebase::firestore::auth::User; NS_ASSUME_NONNULL_BEGIN @@ -29,7 +31,8 @@ NS_ASSUME_NONNULL_BEGIN - (void)getTokenForcingRefresh:(BOOL)forceRefresh completion:(FSTVoidGetTokenResultBlock)completion { - completion(nil, nil); + // Invalid token will force the GRPC fallback to use default settings. + completion(Token::Invalid(), nil); } - (void)setUserChangeListener:(nullable FSTVoidUserBlock)block { diff --git a/Firestore/Source/Core/FSTFirestoreClient.mm b/Firestore/Source/Core/FSTFirestoreClient.mm index 823f488..2ef7279 100644 --- a/Firestore/Source/Core/FSTFirestoreClient.mm +++ b/Firestore/Source/Core/FSTFirestoreClient.mm @@ -103,7 +103,7 @@ NS_ASSUME_NONNULL_BEGIN __block bool initialized = false; __block User initialUser; FSTWeakify(self); - _credentialsProvider.userChangeListener = ^(const User &user) { + _credentialsProvider.userChangeListener = ^(User user) { FSTStrongify(self); if (self) { if (!initialized) { diff --git a/Firestore/Source/Remote/FSTDatastore.h b/Firestore/Source/Remote/FSTDatastore.h index 9edaf96..481b6e8 100644 --- a/Firestore/Source/Remote/FSTDatastore.h +++ b/Firestore/Source/Remote/FSTDatastore.h @@ -20,6 +20,7 @@ #include "Firestore/core/src/firebase/firestore/core/database_info.h" #include "Firestore/core/src/firebase/firestore/model/database_id.h" +#include "absl/strings/string_view.h" @class FSTDocumentKey; @class FSTDispatchQueue; @@ -83,7 +84,7 @@ NS_ASSUME_NONNULL_BEGIN /** Adds headers to the RPC including any OAuth access token if provided .*/ + (void)prepareHeadersForRPC:(GRPCCall *)rpc databaseID:(const firebase::firestore::model::DatabaseId *)databaseID - token:(nullable NSString *)token; + token:(const absl::string_view)token; /** Looks up a list of documents in datastore. */ - (void)lookupDocuments:(NSArray<FSTDocumentKey *> *)keys diff --git a/Firestore/Source/Remote/FSTDatastore.mm b/Firestore/Source/Remote/FSTDatastore.mm index 8017c58..a6029ee 100644 --- a/Firestore/Source/Remote/FSTDatastore.mm +++ b/Firestore/Source/Remote/FSTDatastore.mm @@ -35,11 +35,13 @@ #import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h" +#include "Firestore/core/src/firebase/firestore/auth/token.h" #include "Firestore/core/src/firebase/firestore/core/database_info.h" #include "Firestore/core/src/firebase/firestore/model/database_id.h" #include "Firestore/core/src/firebase/firestore/util/string_apple.h" namespace util = firebase::firestore::util; +using firebase::firestore::auth::Token; using firebase::firestore::core::DatabaseInfo; using firebase::firestore::model::DatabaseId; @@ -301,16 +303,18 @@ typedef GRPCProtoCall * (^RPCFactory)(void); // but I'm not sure how to detect that right now. http://b/32762461 [self.credentials getTokenForcingRefresh:NO - completion:^(FSTGetTokenResult *_Nullable result, NSError *_Nullable error) { + completion:^(Token result, NSError *_Nullable error) { error = [FSTDatastore firestoreErrorForError:error]; [self.workerDispatchQueue dispatchAsyncAllowingSameQueue:^{ if (error) { errorHandler(error); } else { GRPCProtoCall *rpc = rpcFactory(); - [FSTDatastore prepareHeadersForRPC:rpc - databaseID:&self.databaseInfo->database_id() - token:result.token]; + [FSTDatastore + prepareHeadersForRPC:rpc + databaseID:&self.databaseInfo->database_id() + token:(result.is_valid() ? result.token() + : absl::string_view())]; [rpc start]; } }]; @@ -334,8 +338,8 @@ typedef GRPCProtoCall * (^RPCFactory)(void); /** Adds headers to the RPC including any OAuth access token if provided .*/ + (void)prepareHeadersForRPC:(GRPCCall *)rpc databaseID:(const DatabaseId *)databaseID - token:(nullable NSString *)token { - rpc.oauth2AccessToken = token; + token:(const absl::string_view)token { + rpc.oauth2AccessToken = token.data() == nullptr ? nil : util::WrapNSString(token); rpc.requestHeaders[kXGoogAPIClientHeader] = [FSTDatastore googAPIClientHeaderValue]; // This header is used to improve routing and project isolation by the backend. rpc.requestHeaders[kGoogleCloudResourcePrefix] = diff --git a/Firestore/Source/Remote/FSTStream.mm b/Firestore/Source/Remote/FSTStream.mm index f859fbb..079ae72 100644 --- a/Firestore/Source/Remote/FSTStream.mm +++ b/Firestore/Source/Remote/FSTStream.mm @@ -35,11 +35,13 @@ #import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h" +#include "Firestore/core/src/firebase/firestore/auth/token.h" #include "Firestore/core/src/firebase/firestore/core/database_info.h" #include "Firestore/core/src/firebase/firestore/model/database_id.h" #include "Firestore/core/src/firebase/firestore/util/string_apple.h" namespace util = firebase::firestore::util; +using firebase::firestore::auth::Token; using firebase::firestore::core::DatabaseInfo; using firebase::firestore::model::DatabaseId; @@ -256,18 +258,17 @@ static const NSTimeInterval kIdleTimeout = 60.0; FSTAssert(_delegate == nil, @"Delegate must be nil"); _delegate = delegate; - [self.credentials - getTokenForcingRefresh:NO - completion:^(FSTGetTokenResult *_Nullable result, NSError *_Nullable error) { - error = [FSTDatastore firestoreErrorForError:error]; - [self.workerDispatchQueue dispatchAsyncAllowingSameQueue:^{ - [self resumeStartWithToken:result error:error]; - }]; - }]; + [self.credentials getTokenForcingRefresh:NO + completion:^(Token result, NSError *_Nullable error) { + error = [FSTDatastore firestoreErrorForError:error]; + [self.workerDispatchQueue dispatchAsyncAllowingSameQueue:^{ + [self resumeStartWithToken:result error:error]; + }]; + }]; } /** Add an access token to our RPC, after obtaining one from the credentials provider. */ -- (void)resumeStartWithToken:(FSTGetTokenResult *)token error:(NSError *)error { +- (void)resumeStartWithToken:(const Token &)token error:(NSError *)error { if (self.state == FSTStreamStateStopped) { // Streams can be stopped while waiting for authorization. return; @@ -289,7 +290,7 @@ static const NSTimeInterval kIdleTimeout = 60.0; _rpc = [self createRPCWithRequestsWriter:self.requestsWriter]; [FSTDatastore prepareHeadersForRPC:_rpc databaseID:&self.databaseInfo->database_id() - token:token.token]; + token:(token.is_valid() ? token.token() : absl::string_view())]; FSTAssert(_callbackFilter == nil, @"GRX Filter must be nil"); _callbackFilter = [[FSTCallbackFilter alloc] initWithStream:self]; [_rpc startWithWriteable:_callbackFilter]; |