aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@users.noreply.github.com>2015-12-07 08:20:28 -0800
committerGravatar Jan Tattermusch <jtattermusch@users.noreply.github.com>2015-12-07 08:20:28 -0800
commit63b31dedf70c2ca618f8b1124f35fa6baeee1d12 (patch)
tree6bcd438ad3bb612eb91aaae26e667eedc0673316
parent67140d0703f08dfaecde72a7bb94317539ce0291 (diff)
parentbcf193ec9ef64840c5882b86a6d0a6285ed54b78 (diff)
Merge pull request #4290 from murgatroid99/node_auth_plugin_param_change
Generalize metadata plugin arguments to future-proof it
-rw-r--r--src/node/src/credentials.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/node/src/credentials.js b/src/node/src/credentials.js
index ff10a22e6a..dcbfac18f4 100644
--- a/src/node/src/credentials.js
+++ b/src/node/src/credentials.js
@@ -91,7 +91,7 @@ exports.createSsl = ChannelCredentials.createSsl;
*/
exports.createFromMetadataGenerator = function(metadata_generator) {
return CallCredentials.createFromPlugin(function(service_url, callback) {
- metadata_generator(service_url, function(error, metadata) {
+ metadata_generator({service_url: service_url}, function(error, metadata) {
var code = grpc.status.OK;
var message = '';
if (error) {
@@ -114,7 +114,8 @@ exports.createFromMetadataGenerator = function(metadata_generator) {
* @return {CallCredentials} The resulting credentials object
*/
exports.createFromGoogleCredential = function(google_credential) {
- return exports.createFromMetadataGenerator(function(service_url, callback) {
+ return exports.createFromMetadataGenerator(function(auth_context, callback) {
+ var service_url = auth_context.service_url;
google_credential.getRequestMetadata(service_url, function(err, header) {
if (err) {
callback(err);