grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #547 from alexander-fenster/get-request-headers 

grpc-native-core: do not use deprecated getRequestMetadata
This commit is contained in:
Michael Lumish 2018-09-13 17:39:29 -07:00 committed by GitHub
parent 7fc1162be0 10c94a9e1e
commit a4ed8a38a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
packages/grpc-native-core/src/credentials.js
View File

@ -184,6 +184,29 @@ exports.createFromMetadataGenerator = function(metadata_generator) {
}); });
}; };
function getAuthorizationHeaderFromGoogleCredential(google_credential, url, callback) {
// google-auth-library pre-v2.0.0 does not have getRequestHeaders
// but has getRequestMetadata, which is deprecated in v2.0.0
if (typeof google_credential.getRequestHeaders === 'function') {
google_credential.getRequestHeaders(url)
.then(function(header) {
callback(null, header.Authorization);
})
.catch(function(err) {
callback(err);
return;
});
} else {
google_credential.getRequestMetadata(url, function(err, header) {
if (err) {
callback(err);
return;
}
callback(null, header.Authorization);
});
}
}
/** /**
* Create a gRPC credential from a Google credential object. * Create a gRPC credential from a Google credential object.
* @memberof grpc.credentials * @memberof grpc.credentials
@ -195,16 +218,17 @@ exports.createFromMetadataGenerator = function(metadata_generator) {
exports.createFromGoogleCredential = function(google_credential) { exports.createFromGoogleCredential = function(google_credential) {
return exports.createFromMetadataGenerator(function(auth_context, callback) { return exports.createFromMetadataGenerator(function(auth_context, callback) {
var service_url = auth_context.service_url; var service_url = auth_context.service_url;
google_credential.getRequestMetadata(service_url, function(err, header) { getAuthorizationHeaderFromGoogleCredential(google_credential, service_url,
if (err) { function(err, authHeader) {
common.log(constants.logVerbosity.INFO, 'Auth error:' + err); if (err) {
callback(err); common.log(constants.logVerbosity.INFO, 'Auth error:' + err);
return; callback(err);
} return;
var metadata = new Metadata(); }
metadata.add('authorization', header.Authorization); var metadata = new Metadata();
callback(null, metadata); metadata.add('authorization', authHeader);
}); callback(null, metadata);
});
}); });
}; };