* Fixed util buildPath leaking index state

* Added supporting tests
Okanjo · May 24, 2019 · 341cf0c · 341cf0c
1 parent d15306b
commit 341cf0c
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,9 @@
 
 When stuff changes, it's described here.
 
+## 2.1.0
+ * Fixed util buildPath leaking index state
+
 ## 2.2.0
  * Set Host header on HTTP requests
 

diff --git a/dist/client.js b/dist/client.js
@@ -82,7 +82,7 @@ function Client(config) {
 /**
  * SDK Version
  */
-Client.Version = '2.2.0';
+Client.Version = '2.2.1';
 
 /**
  * Expose the Provider base class

diff --git a/dist/okanjo-sdk.js b/dist/okanjo-sdk.js
@@ -550,8 +550,6 @@ function copy(destination, source) {
 }
 
 
-var extractParams = /\{([a-zA-Z_]+)}/g;
-
 /**
  * Builds the final URL path given replaceable param names
  * @param {string} path - Route path
@@ -560,7 +558,9 @@ var extractParams = /\{([a-zA-Z_]+)}/g;
  */
 function buildPath(path, params) {
 
-    var resultPath = path, p, token, name;
+    var extractParams = /\{([a-zA-Z_]+)}/g,
+        resultPath = path,
+        p, token, name;
 
     // Pull out the expected parameters
     while ((p = extractParams.exec(path)) !== null) {
@@ -1742,7 +1742,7 @@ function Client(config) {
 /**
  * SDK Version
  */
-Client.Version = '2.2.0';
+Client.Version = '2.2.1';
 
 /**
  * Expose the Provider base class

diff --git a/dist/okanjo-sdk.min.js b/dist/okanjo-sdk.min.js
diff --git a/dist/okanjo-sdk.min.js.map b/dist/okanjo-sdk.min.js.map
diff --git a/lib/util.js b/lib/util.js
@@ -63,8 +63,6 @@ function copy(destination, source) {
 }
 
 
-var extractParams = /\{([a-zA-Z_]+)}/g;
-
 /**
  * Builds the final URL path given replaceable param names
  * @param {string} path - Route path
@@ -73,7 +71,9 @@ var extractParams = /\{([a-zA-Z_]+)}/g;
  */
 function buildPath(path, params) {
 
-    var resultPath = path, p, token, name;
+    var extractParams = /\{([a-zA-Z_]+)}/g,
+        resultPath = path,
+        p, token, name;
 
     // Pull out the expected parameters
     while ((p = extractParams.exec(path)) !== null) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okanjo",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Integrate your application with the Okanjo API.",
   "main": "dist/client.js",
   "scripts": {

diff --git a/test/util_test.js b/test/util_test.js
@@ -113,4 +113,21 @@ describe('Utilities', function() {
         res.message.should.match(/Path parameter .* required/);
 
     });
+
+    it('should return an error and then success (no regex leak)', () => {
+        const path = '/accounts/{accountId}/sessions/{sessionId}';
+
+        const res = Util.buildPath(path, {accountId: 'ac_123'});
+
+        res.should.be.instanceof(Error);
+        res.message.should.match(/Path parameter .* required/);
+
+        const path2 = '/products/{product_id}';
+
+        const res2 = Util.buildPath(path2, {product_id: 'product_dev_12n3j123123'});
+
+        res2.should.equal('/products/product_dev_12n3j123123');
+
+
+    });
 });