diff options
author | rsgowman <rgowman@google.com> | 2018-03-21 11:04:40 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-21 11:04:40 -0400 |
commit | 308acc09bfaf6dabf4b6d5f5e39f33854df8ce34 (patch) | |
tree | 3706bbbe40d08569795634fd2f30a07fd348b399 /Firestore/core/src/firebase/firestore/auth/credentials_provider.h | |
parent | d924771453d000e708bd5d239da3bae4feb489ac (diff) |
Change CredentialsProvider::TokenListener to use StatusOr<Token> (#945)
* Change CredentialsProvider::TokenListener to use StatusOr
Rather than a token plus error code/msg.
* Eliminate the concept of an invalid Token
Instead, we'll just use StatusOr<Token>. Note that unauthenticated
tokens are handled as a special case; they're created via:
Token::Unauthenticated()
and are otherwise "valid", though attempting to retrieve the raw token
on one of these tokens will cause an assertion failure.
Diffstat (limited to 'Firestore/core/src/firebase/firestore/auth/credentials_provider.h')
-rw-r--r-- | Firestore/core/src/firebase/firestore/auth/credentials_provider.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Firestore/core/src/firebase/firestore/auth/credentials_provider.h b/Firestore/core/src/firebase/firestore/auth/credentials_provider.h index b9a8a24..1aa76df 100644 --- a/Firestore/core/src/firebase/firestore/auth/credentials_provider.h +++ b/Firestore/core/src/firebase/firestore/auth/credentials_provider.h @@ -23,6 +23,7 @@ #include "Firestore/core/include/firebase/firestore/firestore_errors.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/statusor.h" #include "absl/strings/string_view.h" namespace firebase { @@ -30,12 +31,7 @@ namespace firestore { namespace auth { // `TokenErrorListener` is a listener that gets a token or an error. -// token: An auth token as a string, or nullptr if error occurred. -// error_code: The error code if one occurred, or else FirestoreErrorCode::Ok. -// error_msg: The error if one occurred, or else nullptr. -typedef std::function<void( - Token token, const int64_t error_code, const absl::string_view error_msg)> - TokenListener; +typedef std::function<void(util::StatusOr<Token>)> TokenListener; // Listener notified with a User change. typedef std::function<void(User user)> UserChangeListener; |