diff options
| author |  Yang Gao <yangg@google.com> | 2015-07-23 13:29:01 -0700 |
|---|---|---|
| committer | Yang Gao <yangg@google.com> | 2015-07-23 13:29:01 -0700 |
| commit | 2e7ce156354f77bcbdfe0c096b6fa29ebe320200 (patch) | |
| tree | 04144af9e9fe475c68602d8df78d065895fb04ae /src/cpp | |
| parent | 5126bb6d8261ef07fb8132d5b5937f149cf315c8 (diff) | |
| parent | fe4c3f4f1436e2fc2297d5544859ce14e03659bf (diff) | |
Merge pull request #2617 from jboeuf/jwt_creds_renaming
Renaming jwt_credentials to service_account_jwt_access_credentials.
Diffstat (limited to 'src/cpp')
| -rw-r--r-- | src/cpp/client/secure_credentials.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cpp/client/secure_credentials.cc b/src/cpp/client/secure_credentials.cc index 01c7f14f1a..abf0cb387e 100644 --- a/src/cpp/client/secure_credentials.cc +++ b/src/cpp/client/secure_credentials.cc @@ -99,8 +99,8 @@ std::shared_ptr<Credentials> ServiceAccountCredentials( } // Builds JWT credentials. -std::shared_ptr<Credentials> JWTCredentials(const grpc::string& json_key, - long token_lifetime_seconds) { +std::shared_ptr<Credentials> ServiceAccountJWTAccessCredentials( + const grpc::string& json_key, long token_lifetime_seconds) { if (token_lifetime_seconds <= 0) { gpr_log(GPR_ERROR, "Trying to create JWTCredentials with non-positive lifetime"); @@ -108,8 +108,8 @@ std::shared_ptr<Credentials> JWTCredentials(const grpc::string& json_key, } gpr_timespec lifetime = gpr_time_from_seconds(token_lifetime_seconds, GPR_TIMESPAN); - return WrapCredentials( - grpc_jwt_credentials_create(json_key.c_str(), lifetime)); + return WrapCredentials(grpc_service_account_jwt_access_credentials_create( + json_key.c_str(), lifetime)); } // Builds refresh token credentials. |