cpp updates interop proto for auth interop testing. Update the proto correspondingly.

interop/grpc_testing/test.pb.go

@@ -162,6 +162,10 @@ type SimpleRequest struct {
 	ResponseSize *int32 `protobuf:"varint,2,opt,name=response_size" json:"response_size,omitempty"`
 	// Optional input payload sent along with the request.
 	Payload *Payload `protobuf:"bytes,3,opt,name=payload" json:"payload,omitempty"`
+	// Whether SimpleResponse should include username.
+	FillUsername *bool `protobuf:"varint,4,opt,name=fill_username" json:"fill_username,omitempty"`
+	// Whether SimpleResponse should include OAuth scope.
+	FillOauthScope   *bool  `protobuf:"varint,5,opt,name=fill_oauth_scope" json:"fill_oauth_scope,omitempty"`
 	XXX_unrecognized []byte `json:"-"`
 }
 
@@ -191,13 +195,29 @@ func (m *SimpleRequest) GetPayload() *Payload {
 	return nil
 }
 
+func (m *SimpleRequest) GetFillUsername() bool {
+	if m != nil && m.FillUsername != nil {
+		return *m.FillUsername
+	}
+	return false
+}
+
+func (m *SimpleRequest) GetFillOauthScope() bool {
+	if m != nil && m.FillOauthScope != nil {
+		return *m.FillOauthScope
+	}
+	return false
+}
+
 // Unary response, as configured by the request.
 type SimpleResponse struct {
 	// Payload to increase message size.
 	Payload *Payload `protobuf:"bytes,1,opt,name=payload" json:"payload,omitempty"`
 	// The user the request came from, for verifying authentication was
 	// successful when the client expected it.
-	EffectiveGaiaUserId *int64 `protobuf:"varint,2,opt,name=effective_gaia_user_id" json:"effective_gaia_user_id,omitempty"`
+	Username *string `protobuf:"bytes,2,opt,name=username" json:"username,omitempty"`
+	// OAuth scope.
+	OauthScope       *string `protobuf:"bytes,3,opt,name=oauth_scope" json:"oauth_scope,omitempty"`
 	XXX_unrecognized []byte  `json:"-"`
 }
 
@@ -213,11 +233,18 @@ func (m *SimpleResponse) GetPayload() *Payload {
 	return nil
 }
 
-func (m *SimpleResponse) GetEffectiveGaiaUserId() int64 {
+func (m *SimpleResponse) GetUsername() string {
-	if m != nil && m.EffectiveGaiaUserId != nil {
+	if m != nil && m.Username != nil {
-		return *m.EffectiveGaiaUserId
+		return *m.Username
 	}
-	return 0
+	return ""
+}
+
+func (m *SimpleResponse) GetOauthScope() string {
+	if m != nil && m.OauthScope != nil {
+		return *m.OauthScope
+	}
+	return ""
 }
 
 // Client-streaming request.

interop/grpc_testing/test.proto

@@ -38,15 +38,25 @@ message SimpleRequest {
 
   // Optional input payload sent along with the request.
   optional Payload payload = 3;
+
+  // Whether SimpleResponse should include username.
+  optional bool fill_username = 4;
+
+  // Whether SimpleResponse should include OAuth scope.
+  optional bool fill_oauth_scope = 5;
 }
 
 // Unary response, as configured by the request.
 message SimpleResponse {
   // Payload to increase message size.
   optional Payload payload = 1;
+
   // The user the request came from, for verifying authentication was
   // successful when the client expected it.
-  optional int64 effective_gaia_user_id = 2;
+  optional string username = 2;
+  
+  // OAuth scope.
+  optional string oauth_scope = 3;
 }
 
 // Client-streaming request.

test/grpc_testing/test.pb.go

@@ -162,6 +162,10 @@ type SimpleRequest struct {
 	ResponseSize *int32 `protobuf:"varint,2,opt,name=response_size" json:"response_size,omitempty"`
 	// Optional input payload sent along with the request.
 	Payload *Payload `protobuf:"bytes,3,opt,name=payload" json:"payload,omitempty"`
+	// Whether SimpleResponse should include username.
+	FillUsername *bool `protobuf:"varint,4,opt,name=fill_username" json:"fill_username,omitempty"`
+	// Whether SimpleResponse should include OAuth scope.
+	FillOauthScope   *bool  `protobuf:"varint,5,opt,name=fill_oauth_scope" json:"fill_oauth_scope,omitempty"`
 	XXX_unrecognized []byte `json:"-"`
 }
 
@@ -191,13 +195,29 @@ func (m *SimpleRequest) GetPayload() *Payload {
 	return nil
 }
 
+func (m *SimpleRequest) GetFillUsername() bool {
+	if m != nil && m.FillUsername != nil {
+		return *m.FillUsername
+	}
+	return false
+}
+
+func (m *SimpleRequest) GetFillOauthScope() bool {
+	if m != nil && m.FillOauthScope != nil {
+		return *m.FillOauthScope
+	}
+	return false
+}
+
 // Unary response, as configured by the request.
 type SimpleResponse struct {
 	// Payload to increase message size.
 	Payload *Payload `protobuf:"bytes,1,opt,name=payload" json:"payload,omitempty"`
 	// The user the request came from, for verifying authentication was
 	// successful when the client expected it.
-	EffectiveGaiaUserId *int64 `protobuf:"varint,2,opt,name=effective_gaia_user_id" json:"effective_gaia_user_id,omitempty"`
+	Username *string `protobuf:"bytes,2,opt,name=username" json:"username,omitempty"`
+	// OAuth scope.
+	OauthScope       *string `protobuf:"bytes,3,opt,name=oauth_scope" json:"oauth_scope,omitempty"`
 	XXX_unrecognized []byte  `json:"-"`
 }
 
@@ -213,11 +233,18 @@ func (m *SimpleResponse) GetPayload() *Payload {
 	return nil
 }
 
-func (m *SimpleResponse) GetEffectiveGaiaUserId() int64 {
+func (m *SimpleResponse) GetUsername() string {
-	if m != nil && m.EffectiveGaiaUserId != nil {
+	if m != nil && m.Username != nil {
-		return *m.EffectiveGaiaUserId
+		return *m.Username
 	}
-	return 0
+	return ""
+}
+
+func (m *SimpleResponse) GetOauthScope() string {
+	if m != nil && m.OauthScope != nil {
+		return *m.OauthScope
+	}
+	return ""
 }
 
 // Client-streaming request.

test/grpc_testing/test.proto

@@ -38,15 +38,25 @@ message SimpleRequest {
 
   // Optional input payload sent along with the request.
   optional Payload payload = 3;
+
+  // Whether SimpleResponse should include username.
+  optional bool fill_username = 4;
+
+  // Whether SimpleResponse should include OAuth scope.
+  optional bool fill_oauth_scope = 5;
 }
 
 // Unary response, as configured by the request.
 message SimpleResponse {
   // Payload to increase message size.
   optional Payload payload = 1;
+
   // The user the request came from, for verifying authentication was
   // successful when the client expected it.
-  optional int64 effective_gaia_user_id = 2;
+  optional string username = 2;
+  
+  // OAuth scope.
+  optional string oauth_scope = 3;
 }
 
 // Client-streaming request.