@google-cloud/common - npm Package Compare versions

Comparing version 0.9.0 to 0.9.1

package.json

 {
   "name": "@google-cloud/common",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "author": "Google Inc.",
@@ -5,0 +5,0 @@ "description": "Common components for Google Cloud APIs Node.js Client Libraries",

src/grpc-service.js

@@ -760,3 +760,5 @@ /*!
 
-    self.projectId = self.projectId || authClient.projectId;
+    if (!self.projectId || self.projectId === '{{projectId}}') {
+      self.projectId = authClient.projectId;
+    }
 
@@ -763,0 +765,0 @@ callback(null, credentials);

src/util.js

@@ -496,19 +496,41 @@ /**
 
-  for (var opt in reqOpts) {
-    if (is.string(reqOpts[opt])) {
-      if (reqOpts[opt].indexOf('{{projectId}}') > -1) {
-        if (!config.projectId) {
-          throw util.missingProjectIdError;
-        }
-        reqOpts[opt] = reqOpts[opt].replace(/{{projectId}}/g, config.projectId);
-      }
-    } else if (is.object(reqOpts[opt])) {
-      decorateRequest(reqOpts[opt], config);
+  return util.replaceProjectIdToken(reqOpts, config.projectId);
+}
+
+util.decorateRequest = decorateRequest;
+
+/**
+ * Populate the `{{projectId}}` placeholder.
+ *
+ * @throws {Error} If a projectId is required, but one is not provided.
+ *
+ * @param {*} - Any input value that may contain a placeholder. Arrays and
+ *     objects will be looped.
+ * @param {string} projectId - A projectId. If not provided
+ * @return {*} - The original argument with all placeholders populated.
+ */
+function replaceProjectIdToken(value, projectId) {
+  if (is.array(value)) {
+    value = value.map(function(val) {
+      return replaceProjectIdToken(val, projectId);
+    });
+  }
+
+  if (is.object(value)) {
+    for (var opt in value) {
+      value[opt] = replaceProjectIdToken(value[opt], projectId);
     }
   }
 
-  return reqOpts;
+  if (is.string(value) && value.indexOf('{{projectId}}') > -1) {
+    if (!projectId) {
+      throw util.missingProjectIdError;
+    }
+    value = value.replace(/{{projectId}}/g, projectId);
+  }
+
+  return value;
 }
 
-util.decorateRequest = decorateRequest;
+util.replaceProjectIdToken = replaceProjectIdToken;
 
@@ -515,0 +537,0 @@ /**

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

91333

increased by0.72%

Lines of code

2458

increased by0.82%

No dependency changes