google-gax - npm Package Compare versions

Comparing version 0.13.0 to 0.13.1

lib/api_callable.js

@@ -171,2 +171,8 @@ /*
       otherArgs.metadataBuilder ? otherArgs.metadataBuilder(abTests) : null;
+    var headers = otherArgs.headers || {};
+    for (var key in headers) {
+      if (key !== 'x-goog-api-client' && headers.hasOwnProperty(key)) {
+        metadata.set(key, headers[key]);
+      }
+    }
     return aFunc(argument, metadata, options, callback);
@@ -173,0 +179,0 @@ };

lib/grpc.js

@@ -74,3 +74,3 @@ /*
 /**
- * Creates a gRPC credentials from the authentications.
+ * Creates a gRPC credentials. It asks the auth data if necessary.
  * @private
@@ -80,12 +80,25 @@ * @param {Object} opts - options values for configuring credentials.
  *   of default channel credentials.
- * @param {Object} auth - the authentication object.
- * @return {Object} The gRPC credential object.
+ * @return {Promise} The promise which will be resolved to the gRPC credential.
  */
-GrpcClient.prototype._getCredentials = function _getCredentials(opts, auth) {
-  var sslCreds = opts.sslCreds || this.grpc.credentials.createSsl();
-  var credentials = this.grpc.credentials.combineChannelCredentials(
-      sslCreds,
-      this.grpc.credentials.createFromGoogleCredential(auth)
-  );
-  return credentials;
+GrpcClient.prototype._getCredentials = function _getCredentials(opts) {
+  var PromiseCtor = this.promise;
+  if (opts.sslCreds) {
+    return PromiseCtor.resolve(opts.sslCreds);
+  }
+  var grpc = this.grpc;
+  var getAuthClient = this.auth.getAuthClient;
+  var sslCreds = grpc.credentials.createSsl();
+  return new PromiseCtor(function(resolve, reject) {
+    getAuthClient(function(err, auth) {
+      if (err) {
+        reject(err);
+      } else {
+        var credentials = grpc.credentials.combineChannelCredentials(
+            sslCreds,
+            grpc.credentials.createFromGoogleCredential(auth)
+        );
+        resolve(credentials);
+      }
+    });
+  });
 };
@@ -160,16 +173,4 @@
 GrpcClient.prototype.createStub = function(CreateStub, options) {
-  var self = this;
   var serviceAddress = options.servicePath + ':' + options.port;
-  var PromiseCtor = this.promise;
-  return new PromiseCtor(function(resolve, reject) {
-    self.auth.getAuthClient(function(err, auth) {
-      if (err) {
-        reject(err);
-      } else {
-        resolve(auth);
-      }
-    });
-  }).then(function(auth) {
-    return self._getCredentials(options, auth);
-  }).then(function buildStub(credentials) {
+  return this._getCredentials(options).then(function(credentials) {
     var grpcOptions = {};
@@ -176,0 +177,0 @@ Object.keys(options).forEach(function(key) {

package.json

 {
   "name": "google-gax",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "description": "Google API Extensions",
@@ -5,0 +5,0 @@ "main": "index.js",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

143097

increased by0.16%

Lines of code

3784

increased by0.19%

No dependency changes