diff options
author | 2015-08-28 15:51:02 -0700 | |
---|---|---|
committer | 2015-08-28 15:51:02 -0700 | |
commit | 97cd4ae606a39a62c07b0d2ce2687af3ce812645 (patch) | |
tree | 563c81ba4d81c8dc0764ef3557b24dce9a7be5da /include/grpc++ | |
parent | 68ff03a952d1b5395ef1f4ee326f810cd0b55912 (diff) | |
parent | 036bf58b281e4ff65ccc62ea68002a50ddb626cc (diff) |
Merge branch 'master' of github.com:grpc/grpc into cpp_auth_md_processor
Diffstat (limited to 'include/grpc++')
-rw-r--r-- | include/grpc++/credentials.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/include/grpc++/credentials.h b/include/grpc++/credentials.h index d623bcef60..ce5a9e0606 100644 --- a/include/grpc++/credentials.h +++ b/include/grpc++/credentials.h @@ -94,17 +94,7 @@ std::shared_ptr<Credentials> SslCredentials( const SslCredentialsOptions& options); // Builds credentials for use when running in GCE -std::shared_ptr<Credentials> ComputeEngineCredentials(); - -// Builds service account credentials. -// json_key is the JSON key string containing the client's private key. -// scope is a space-delimited list of the requested permissions. -// token_lifetime_seconds is the lifetime in seconds of each token acquired -// through this service account credentials. It should be positive and should -// not exceed grpc_max_auth_token_lifetime or will be cropped to this value. -std::shared_ptr<Credentials> ServiceAccountCredentials( - const grpc::string& json_key, const grpc::string& scope, - long token_lifetime_seconds); +std::shared_ptr<Credentials> GoogleComputeEngineCredentials(); // Builds Service Account JWT Access credentials. // json_key is the JSON key string containing the client's private key. @@ -117,7 +107,7 @@ std::shared_ptr<Credentials> ServiceAccountJWTAccessCredentials( // Builds refresh token credentials. // json_refresh_token is the JSON string containing the refresh token along // with a client_id and client_secret. -std::shared_ptr<Credentials> RefreshTokenCredentials( +std::shared_ptr<Credentials> GoogleRefreshTokenCredentials( const grpc::string& json_refresh_token); // Builds access token credentials. @@ -127,7 +117,7 @@ std::shared_ptr<Credentials> AccessTokenCredentials( const grpc::string& access_token); // Builds IAM credentials. -std::shared_ptr<Credentials> IAMCredentials( +std::shared_ptr<Credentials> GoogleIAMCredentials( const grpc::string& authorization_token, const grpc::string& authority_selector); |