Fix granter.
Change-Id: If8520b05ff86601dd7511d31f39231d2249a81df
diff --git a/src/gen-vdl/v.io/x/ref/services/wspr/internal/app/index.js b/src/gen-vdl/v.io/x/ref/services/wspr/internal/app/index.js
index 69b7bf9..937907f 100644
--- a/src/gen-vdl/v.io/x/ref/services/wspr/internal/app/index.js
+++ b/src/gen-vdl/v.io/x/ref/services/wspr/internal/app/index.js
@@ -65,7 +65,7 @@
_typeGranterResponse.fields = [{name: "Blessings", type: new principal.BlessingsHandle()._type}, {name: "Err", type: vdl.types.ERROR}];
_typeRpcCallOption.kind = vdl.kind.UNION;
_typeRpcCallOption.name = "v.io/x/ref/services/wspr/internal/app.RpcCallOption";
-_typeRpcCallOption.fields = [{name: "AllowedServersPolicy", type: _type2}, {name: "RetryTimeout", type: new time.Duration()._type}, {name: "UseGranter", type: _typeGranterHandle}];
+_typeRpcCallOption.fields = [{name: "AllowedServersPolicy", type: _type2}, {name: "RetryTimeout", type: new time.Duration()._type}, {name: "Granter", type: _typeGranterHandle}];
_typeRpcRequest.kind = vdl.kind.STRUCT;
_typeRpcRequest.name = "v.io/x/ref/services/wspr/internal/app.RpcRequest";
_typeRpcRequest.fields = [{name: "Name", type: vdl.types.STRING}, {name: "Method", type: vdl.types.STRING}, {name: "NumInArgs", type: vdl.types.INT32}, {name: "NumOutArgs", type: vdl.types.INT32}, {name: "IsStreaming", type: vdl.types.BOOL}, {name: "Deadline", type: new time.WireDeadline()._type}, {name: "TraceRequest", type: new vtrace.Request()._type}, {name: "CallOptions", type: _type1}];
diff --git a/src/rpc/client.js b/src/rpc/client.js
index 1a2d20f..7c8175d 100644
--- a/src/rpc/client.js
+++ b/src/rpc/client.js
@@ -654,10 +654,11 @@
* @param {object} opts Map of call options.
* @param {string[]} opts.allowedServersPolicy Array of blessing patterns that
* the allowed server must match in order for the RPC to be initiated.
+ * @param {function} opts.granter If set, the granter to uses for this call.
*/
Client.prototype.callOption = function(opts) {
// TODO(nlacasse): Support other CallOption types.
- var allowedOptions = ['allowedServersPolicy', 'useGranter'];
+ var allowedOptions = ['allowedServersPolicy', 'granter'];
// Validate opts.
var keys = Object.keys(opts);
@@ -690,7 +691,7 @@
var keys = Object.keys(this.opts);
keys.forEach(function(key) {
var opt = {};
- if (key === 'useGranter') {
+ if (key === 'granter') {
var runtime = ctx.value(SharedContextKeys.RUNTIME);
var granterRouter = runtime._getGranterRouter();
var fn = this.opts[key];
diff --git a/test/integration/test-bless.js b/test/integration/test-bless.js
index 16cc9c5..146513c 100644
--- a/test/integration/test-bless.js
+++ b/test/integration/test-bless.js
@@ -140,7 +140,7 @@
var fiveSecondsInFuture = new Date(Date.now() + 5000);
var granterCalled = false;
var granterOption = client.callOption({
- useGranter: function(ctx, call, cb) {
+ granter: function(ctx, call, cb) {
granterCalled = true;
res.runtime.principal.bless(res.runtime.getContext(),
call.remoteBlessings.publicKey,
