Merge branch 'master' of https://github.com/DigitalFlow/Xrm-WebApi-Client

DigitalFlow · DigitalFlow · commit 69a1604ca2aa · 2017-11-21T23:14:01.000+01:00
diff --git a/docs/WebApiClient.Batch.js.html b/docs/WebApiClient.Batch.js.html
@@ -217,7 +217,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a>
 	
-		on Thu Sep 21st 2017
+		on Wed Oct 18th 2017
 	
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
diff --git a/docs/WebApiClient.BatchRequest.js.html b/docs/WebApiClient.BatchRequest.js.html
@@ -212,7 +212,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a>
 	
-		on Thu Sep 21st 2017
+		on Wed Oct 18th 2017
 	
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
diff --git a/docs/WebApiClient.BatchResponse.js.html b/docs/WebApiClient.BatchResponse.js.html
@@ -230,7 +230,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a>
 	
-		on Thu Sep 21st 2017
+		on Wed Oct 18th 2017
 	
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
diff --git a/docs/WebApiClient.ChangeSet.js.html b/docs/WebApiClient.ChangeSet.js.html
@@ -185,7 +185,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a>
 	
-		on Thu Sep 21st 2017
+		on Wed Oct 18th 2017
 	
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
diff --git a/docs/WebApiClient.Core.js.html b/docs/WebApiClient.Core.js.html
@@ -661,8 +661,13 @@ <h1 class="page-title">Source: WebApiClient.Core.js</h1>
 
         for (var i = 0; i &lt; params.alternateKey.length; i++) {
             var key = params.alternateKey[i];
+            var value = key.value;
+            
+            if (typeof(key.value) !== "number") {
+                value = "'" + key.value + "'";
+            }
 
-            url += key.property + "='" + key.value + "'";
+            url += key.property + "=" + value;
 
             if (i + 1 === params.alternateKey.length) {
                 url += ")";
@@ -1090,7 +1095,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a>
 	
-		on Thu Sep 21st 2017
+		on Wed Oct 18th 2017
 	
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
diff --git a/docs/WebApiClient.Promise.html b/docs/WebApiClient.Promise.html
@@ -250,7 +250,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a>
 	
-		on Thu Sep 21st 2017
+		on Wed Oct 18th 2017
 	
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
diff --git a/docs/WebApiClient.Requests.Request.html b/docs/WebApiClient.Requests.Request.html
@@ -626,7 +626,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a>
 	
-		on Thu Sep 21st 2017
+		on Wed Oct 18th 2017
 	
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
diff --git a/docs/WebApiClient.Requests.js.html b/docs/WebApiClient.Requests.js.html
@@ -5144,7 +5144,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a>
 	
-		on Thu Sep 21st 2017
+		on Wed Oct 18th 2017
 	
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
diff --git a/docs/WebApiClient.Response.js.html b/docs/WebApiClient.Response.js.html
@@ -237,7 +237,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a>
 	
-		on Thu Sep 21st 2017
+		on Wed Oct 18th 2017
 	
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
diff --git a/docs/WebApiClient.js.html b/docs/WebApiClient.js.html
@@ -158,7 +158,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a>
 	
-		on Thu Sep 21st 2017
+		on Wed Oct 18th 2017
 	
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
diff --git a/docs/classes.list.html b/docs/classes.list.html
@@ -224,7 +224,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a>
 	
-		on Thu Sep 21st 2017
+		on Wed Oct 18th 2017
 	
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
diff --git a/docs/index.html b/docs/index.html
@@ -700,7 +700,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a>
 	
-		on Thu Sep 21st 2017
+		on Wed Oct 18th 2017
 	
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
diff --git a/docs/module-Requests.html b/docs/module-Requests.html
@@ -18470,7 +18470,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a>
 	
-		on Thu Sep 21st 2017
+		on Wed Oct 18th 2017
 	
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
diff --git a/docs/module-WebApiClient.Batch.html b/docs/module-WebApiClient.Batch.html
@@ -1367,7 +1367,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a>
 	
-		on Thu Sep 21st 2017
+		on Wed Oct 18th 2017
 	
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
diff --git a/docs/module-WebApiClient.BatchRequest.html b/docs/module-WebApiClient.BatchRequest.html
@@ -1208,7 +1208,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a>
 	
-		on Thu Sep 21st 2017
+		on Wed Oct 18th 2017
 	
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
diff --git a/docs/module-WebApiClient.BatchResponse.html b/docs/module-WebApiClient.BatchResponse.html
@@ -1145,7 +1145,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a>
 	
-		on Thu Sep 21st 2017
+		on Wed Oct 18th 2017
 	
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
diff --git a/docs/module-WebApiClient.ChangeSet.html b/docs/module-WebApiClient.ChangeSet.html
@@ -767,7 +767,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a>
 	
-		on Thu Sep 21st 2017
+		on Wed Oct 18th 2017
 	
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
diff --git a/docs/module-WebApiClient.Response.html b/docs/module-WebApiClient.Response.html
@@ -992,7 +992,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a>
 	
-		on Thu Sep 21st 2017
+		on Wed Oct 18th 2017
 	
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
diff --git a/docs/module-WebApiClient.html b/docs/module-WebApiClient.html
@@ -1322,7 +1322,7 @@ <h6 class="method-params-label method-subparams-label">Properties</h6>
 		<ul class="dummy">
 			<li>
 				<a href="WebApiClient.Core.js.html">WebApiClient.Core.js</a>,
-				 <a href="WebApiClient.Core.js.html#sunlight-1-line-785">line 785</a>
+				 <a href="WebApiClient.Core.js.html#sunlight-1-line-790">line 790</a>
 			</li>
 		</ul>
 	</dd>
@@ -1489,7 +1489,7 @@ <h5>Parameters:</h5>
 		<ul class="dummy">
 			<li>
 				<a href="WebApiClient.Core.js.html">WebApiClient.Core.js</a>,
-				 <a href="WebApiClient.Core.js.html#sunlight-1-line-644">line 644</a>
+				 <a href="WebApiClient.Core.js.html#sunlight-1-line-649">line 649</a>
 			</li>
 		</ul>
 	</dd>
@@ -1841,7 +1841,7 @@ <h6 class="method-params-label method-subparams-label">Properties</h6>
 		<ul class="dummy">
 			<li>
 				<a href="WebApiClient.Core.js.html">WebApiClient.Core.js</a>,
-				 <a href="WebApiClient.Core.js.html#sunlight-1-line-671">line 671</a>
+				 <a href="WebApiClient.Core.js.html#sunlight-1-line-676">line 676</a>
 			</li>
 		</ul>
 	</dd>
@@ -2244,7 +2244,7 @@ <h6 class="method-params-label method-subparams-label">Properties</h6>
 		<ul class="dummy">
 			<li>
 				<a href="WebApiClient.Core.js.html">WebApiClient.Core.js</a>,
-				 <a href="WebApiClient.Core.js.html#sunlight-1-line-761">line 761</a>
+				 <a href="WebApiClient.Core.js.html#sunlight-1-line-766">line 766</a>
 			</li>
 		</ul>
 	</dd>
@@ -2855,7 +2855,7 @@ <h6 class="method-params-label method-subparams-label">Properties</h6>
 		<ul class="dummy">
 			<li>
 				<a href="WebApiClient.Core.js.html">WebApiClient.Core.js</a>,
-				 <a href="WebApiClient.Core.js.html#sunlight-1-line-824">line 824</a>
+				 <a href="WebApiClient.Core.js.html#sunlight-1-line-829">line 829</a>
 			</li>
 		</ul>
 	</dd>
@@ -3118,7 +3118,7 @@ <h6 class="method-params-label method-subparams-label">Properties</h6>
 		<ul class="dummy">
 			<li>
 				<a href="WebApiClient.Core.js.html">WebApiClient.Core.js</a>,
-				 <a href="WebApiClient.Core.js.html#sunlight-1-line-865">line 865</a>
+				 <a href="WebApiClient.Core.js.html#sunlight-1-line-870">line 870</a>
 			</li>
 		</ul>
 	</dd>
@@ -3413,7 +3413,7 @@ <h6 class="method-params-label method-subparams-label">Properties</h6>
 		<ul class="dummy">
 			<li>
 				<a href="WebApiClient.Core.js.html">WebApiClient.Core.js</a>,
-				 <a href="WebApiClient.Core.js.html#sunlight-1-line-914">line 914</a>
+				 <a href="WebApiClient.Core.js.html#sunlight-1-line-919">line 919</a>
 			</li>
 		</ul>
 	</dd>
@@ -3530,7 +3530,7 @@ <h4 class="name" id=".GetApiUrl"><span class="type-signature">&lt;static> </span
 		<ul class="dummy">
 			<li>
 				<a href="WebApiClient.Core.js.html">WebApiClient.Core.js</a>,
-				 <a href="WebApiClient.Core.js.html#sunlight-1-line-661">line 661</a>
+				 <a href="WebApiClient.Core.js.html#sunlight-1-line-666">line 666</a>
 			</li>
 		</ul>
 	</dd>
@@ -4296,7 +4296,7 @@ <h6 class="method-params-label method-subparams-label">Properties</h6>
 		<ul class="dummy">
 			<li>
 				<a href="WebApiClient.Core.js.html">WebApiClient.Core.js</a>,
-				 <a href="WebApiClient.Core.js.html#sunlight-1-line-695">line 695</a>
+				 <a href="WebApiClient.Core.js.html#sunlight-1-line-700">line 700</a>
 			</li>
 		</ul>
 	</dd>
@@ -4559,7 +4559,7 @@ <h6 class="method-params-label method-subparams-label">Properties</h6>
 		<ul class="dummy">
 			<li>
 				<a href="WebApiClient.Core.js.html">WebApiClient.Core.js</a>,
-				 <a href="WebApiClient.Core.js.html#sunlight-1-line-886">line 886</a>
+				 <a href="WebApiClient.Core.js.html#sunlight-1-line-891">line 891</a>
 			</li>
 		</ul>
 	</dd>
@@ -4932,7 +4932,7 @@ <h6 class="method-params-label method-subparams-label">Properties</h6>
 		<ul class="dummy">
 			<li>
 				<a href="WebApiClient.Core.js.html">WebApiClient.Core.js</a>,
-				 <a href="WebApiClient.Core.js.html#sunlight-1-line-599">line 599</a>
+				 <a href="WebApiClient.Core.js.html#sunlight-1-line-604">line 604</a>
 			</li>
 		</ul>
 	</dd>
@@ -5323,7 +5323,7 @@ <h6 class="method-params-label method-subparams-label">Properties</h6>
 		<ul class="dummy">
 			<li>
 				<a href="WebApiClient.Core.js.html">WebApiClient.Core.js</a>,
-				 <a href="WebApiClient.Core.js.html#sunlight-1-line-736">line 736</a>
+				 <a href="WebApiClient.Core.js.html#sunlight-1-line-741">line 741</a>
 			</li>
 		</ul>
 	</dd>
@@ -5441,7 +5441,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a>
 	
-		on Thu Sep 21st 2017
+		on Wed Oct 18th 2017
 	
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
diff --git a/docs/modules.list.html b/docs/modules.list.html
@@ -224,7 +224,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a>
 	
-		on Thu Sep 21st 2017
+		on Wed Oct 18th 2017
 	
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
diff --git a/docs/quicksearch.html b/docs/quicksearch.html
diff --git a/src/js/WebApiClient.BatchResponse.js b/src/js/WebApiClient.BatchResponse.js
@@ -1,5 +1,7 @@
 (function(undefined) {
     "use strict";
+    
+    var WebApiClient = require("./WebApiClient.Core.js");
 
     /**
      * Response returned from WebApiClient.SendBatch method. You will usually not instantiate this yourself.
diff --git a/src/js/WebApiClient.Core.js b/src/js/WebApiClient.Core.js
@@ -576,8 +576,13 @@
 
         for (var i = 0; i < params.alternateKey.length; i++) {
             var key = params.alternateKey[i];
+            var value = key.value;
+            
+            if (typeof(key.value) !== "number") {
+                value = "'" + key.value + "'";
+            }
 
-            url += key.property + "='" + key.value + "'";
+            url += key.property + "=" + value;
 
             if (i + 1 === params.alternateKey.length) {
                 url += ")";
diff --git a/src/spec/WebApiClientSpec.js b/src/spec/WebApiClientSpec.js
@@ -124,6 +124,12 @@ describe("WebApiClient", function() {
             [200, { "Content-Type": "application/json" }, JSON.stringify(contact)]
         );
 
+        // Respond to Retrieve Request for contact with alternate key that contains numbers
+        var retrieveByAlternateKeyNumberUrl = RegExp.escape(fakeUrl + "/api/data/v8.0/contacts(firstname='Joe',contactnumber=1)");
+        xhr.respondWith("GET", new RegExp(retrieveByAlternateKeyNumberUrl),
+            [200, { "Content-Type": "application/json" }, JSON.stringify(contact)]
+        );
+
         // Respond to update Request for contact with alternate key
         xhr.respondWith("PATCH", new RegExp(retrieveByAlternateKeyUrl),
             [204, { "Content-Type": "application/json" }, JSON.stringify(successMock)]
@@ -611,6 +617,29 @@ describe("WebApiClient", function() {
             xhr.respond();
         });
 
+        it("should not use hyphens in alternate key url value if value is number", function(done){
+            WebApiClient.Retrieve(
+            {
+                entityName: "contact",
+                alternateKey:
+                    [
+                        { property: "firstname", value: "Joe" },
+                        { property: "contactnumber", value: 1}
+                    ]
+            })
+            .then(function(response){
+                expect(response).toEqual(contact);
+            })
+            .catch(function(error) {
+                expect(error).toBeUndefined();
+            })
+            // Wait for promise
+            .finally(done);
+
+            xhr.respond();
+        });
+
+
         it("should retrieve by fetch", function(done){
         	var fetchXml = "<fetch mapping='logical'>" +
         						"<entity name='account'>" +
diff --git a/src/types/WebApiClient.d.ts b/src/types/WebApiClient.d.ts
