From d78c49a648f4672919cca440067a43b7d466304c Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Thu, 13 Sep 2018 10:25:23 -0700 Subject: [PATCH] fix: use getRequestHeaders instead of getRequestMetadata --- packages/grpc-native-core/package.json | 2 +- packages/grpc-native-core/src/credentials.js | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json index b10f9eb8..e079fdbd 100644 --- a/packages/grpc-native-core/package.json +++ b/packages/grpc-native-core/package.json @@ -39,7 +39,7 @@ "body-parser": "^1.15.2", "electron-mocha": "^3.1.1", "express": "^4.14.0", - "google-auth-library": "^0.9.2", + "google-auth-library": "^2.0.0", "google-protobuf": "^3.0.0", "istanbul": "^0.4.4", "lodash": "^4.17.4", diff --git a/packages/grpc-native-core/src/credentials.js b/packages/grpc-native-core/src/credentials.js index 28b668b1..3c05329e 100644 --- a/packages/grpc-native-core/src/credentials.js +++ b/packages/grpc-native-core/src/credentials.js @@ -195,16 +195,17 @@ exports.createFromMetadataGenerator = function(metadata_generator) { exports.createFromGoogleCredential = function(google_credential) { return exports.createFromMetadataGenerator(function(auth_context, callback) { var service_url = auth_context.service_url; - google_credential.getRequestMetadata(service_url, function(err, header) { - if (err) { + google_credential.getRequestHeaders(service_url) + .then(function(header) { + var metadata = new Metadata(); + metadata.add('authorization', header.Authorization); + callback(null, metadata); + }) + .catch(function(err) { common.log(constants.logVerbosity.INFO, 'Auth error:' + err); callback(err); return; - } - var metadata = new Metadata(); - metadata.add('authorization', header.Authorization); - callback(null, metadata); - }); + }); }); };