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

chore: address code review

This commit is contained in:
bcoe 2019-11-21 14:55:01 -08:00
parent 782d5acdb2
commit c89d4438be
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grpc-js/src/index.ts
View File

@ -131,7 +131,7 @@ export const credentials = mixin(
getHeaders.then( getHeaders.then(
headers => { headers => {
const metadata = new Metadata(); const metadata = new Metadata();
for (const key in headers) { for (const key of Object.keys(headers)) {
metadata.add(key, headers[key]); metadata.add(key, headers[key]);
} }
callback(null, metadata); callback(null, metadata);

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

@ -187,20 +187,20 @@ function getAuthorizationHeaderFromGoogleCredential(google_credential, url, call
// but has getRequestMetadata, which is deprecated in v2.0.0 // but has getRequestMetadata, which is deprecated in v2.0.0
if (typeof google_credential.getRequestHeaders === 'function') { if (typeof google_credential.getRequestHeaders === 'function') {
google_credential.getRequestHeaders(url) google_credential.getRequestHeaders(url)
.then(function(header) { .then(function(headers) {
callback(null, header.Authorization); callback(null, headers);
}) })
.catch(function(err) { .catch(function(err) {
callback(err); callback(err);
return; return;
}); });
} else { } else {
google_credential.getRequestMetadata(url, function(err, header) { google_credential.getRequestMetadata(url, function(err, headers) {
if (err) { if (err) {
callback(err); callback(err);
return; return;
} }
callback(null, header.Authorization); callback(null, headers);
}); });
} }
} }
@ -217,14 +217,16 @@ 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;
getAuthorizationHeaderFromGoogleCredential(google_credential, service_url, getAuthorizationHeaderFromGoogleCredential(google_credential, service_url,
function(err, authHeader) { function(err, headers) {
if (err) { if (err) {
common.log(constants.logVerbosity.INFO, 'Auth error:' + err); common.log(constants.logVerbosity.INFO, 'Auth error:' + err);
callback(err); callback(err);
return; return;
} }
var metadata = new Metadata(); var metadata = new Metadata();
metadata.add('authorization', authHeader); for (const key of Object.keys(headers)) {
metadata.add(key, headers[key]);
}
callback(null, metadata); callback(null, metadata);
}); });
}); });