Skip to content
Snippets Groups Projects
Commit 70b2e882 authored by Yang Gao's avatar Yang Gao
Browse files

minor fixes

parent 69604587
No related branches found
No related tags found
No related merge requests found
...@@ -31,7 +31,7 @@ Clients should accept these arguments: ...@@ -31,7 +31,7 @@ Clients should accept these arguments:
[ca.pem](https://github.com/grpc/grpc/blob/master/src/core/tsi/test_creds/ca.pem) [ca.pem](https://github.com/grpc/grpc/blob/master/src/core/tsi/test_creds/ca.pem)
as the CA root as the CA root
* --default_service_account=ACCOUNT_EMAIL * --default_service_account=ACCOUNT_EMAIL
* Email in the GCE default service account. Only applicable when running in GCE. * Email of the GCE default service account. Only applicable when running in GCE.
* --oauth_scope=SCOPE * --oauth_scope=SCOPE
* OAuth scope. For example, "https://www.googleapis.com/auth/xapi.zoo" * OAuth scope. For example, "https://www.googleapis.com/auth/xapi.zoo"
* --service_account_key_file=PATH * --service_account_key_file=PATH
...@@ -274,12 +274,12 @@ with desired oauth scope. ...@@ -274,12 +274,12 @@ with desired oauth scope.
Server features: Server features:
* [UnaryCall][] * [UnaryCall][]
* [Compressable Payload][] * [Compressable Payload][]
* Echo authenticated username in SimpeResponse.username * Echoes authenticated username in SimpeResponse.username
* Echo OAuth scope SimpleResponse.oauth_scope * Echoes OAuth scope in SimpleResponse.oauth_scope
Procedure: Procedure:
1. Client sets --default_service_account with GCE service account email and 1. Client sets --default_service_account with GCE service account email and
--oauth_scope with the OAuth scope to use. For testing against grpc-test.sandbox.google.com, "https://www.googleapis.com/auth/xapi.zoo" should be passed in as --oauth_scope. --oauth_scope with the OAuth scope to use. For testing against https://grpc-test.sandbox.google.com, "https://www.googleapis.com/auth/xapi.zoo" should be passed in as --oauth_scope.
2. Client configures channel to use GCECredentials 2. Client configures channel to use GCECredentials
3. Client calls UnaryCall on the channel with: 3. Client calls UnaryCall on the channel with:
...@@ -312,12 +312,12 @@ signing keys (redeemed for OAuth2 access tokens by the auth implementation) ...@@ -312,12 +312,12 @@ signing keys (redeemed for OAuth2 access tokens by the auth implementation)
Server features: Server features:
* [UnaryCall][] * [UnaryCall][]
* [Compressable Payload][ * [Compressable Payload][]
* Echo authenticated username in SimpeResponse.username * Echoes authenticated username in SimpeResponse.username
* Echo OAuth scope SimpleResponse.oauth_scope * Echoes OAuth scope in SimpleResponse.oauth_scope
Procedure: Procedure:
1. Client sets --service_account_key_file with the path to a json key file downloaded from console.developers.google.com, and --oauth_scope to the oauth scope. For testing against grpc-test.sandbox.google.com, "https://www.googleapis.com/auth/xapi.zoo" should be passed in as --oauth_scope. 1. Client sets --service_account_key_file with the path to a json key file downloaded from https://console.developers.google.com, and --oauth_scope to the oauth scope. For testing against https://grpc-test.sandbox.google.com, "https://www.googleapis.com/auth/xapi.zoo" should be passed in as --oauth_scope.
2. Client configures the channel to use ServiceAccountCredentials. 2. Client configures the channel to use ServiceAccountCredentials.
3. Client calls UnaryCall with: 3. Client calls UnaryCall with:
...@@ -356,7 +356,7 @@ Server features: ...@@ -356,7 +356,7 @@ Server features:
* SimpleResponse.oauth_scope * SimpleResponse.oauth_scope
Procedure: Procedure:
1. Client sets flags --service_account_key_file with the path to json key file downloaded from console.developers.google.com. 1. Client sets flags --service_account_key_file with the path to json key file downloaded from https://console.developers.google.com.
2. Client configures the channel to use JWTTokenCredentials. 2. Client configures the channel to use JWTTokenCredentials.
3. Client calls UnaryCall with: 3. Client calls UnaryCall with:
...@@ -685,4 +685,4 @@ Ideally, this would be communicated via metadata and not in the ...@@ -685,4 +685,4 @@ Ideally, this would be communicated via metadata and not in the
request/response, but we want to use this test in code paths that don't yet request/response, but we want to use this test in code paths that don't yet
fully communicate metadata. fully communicate metadata.
The server side auth echoing is only implemented in the server sitting behind grpc-test.sandbox.google.com and is enabled only for UnaryCall. In this case the expected OAuth scope is "https://www.googleapis.com/auth/xapi.zoo". The server side auth echoing is only implemented in the server sitting behind https://grpc-test.sandbox.google.com and is enabled only for UnaryCall. In this case the expected OAuth scope is "https://www.googleapis.com/auth/xapi.zoo".
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment