Release v1.2.7

AleksandrRogov · Jul 21, 2017 · e05de49 · e05de49
1 parent a1efac2
commit e05de49
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 12 deletions.
diff --git a/dist/dwa.js b/dist/dwa.js
@@ -1,4 +1,4 @@
-/*! dwa v1.2.6 (c) 2017 Aleksandr Rogov */
+/*! dwa v1.2.7 (c) 2017 Aleksandr Rogov */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();

diff --git a/dist/dynamics-web-api-callbacks.js b/dist/dynamics-web-api-callbacks.js
@@ -1,4 +1,4 @@
-/*! dynamics-web-api-callbacks v1.2.6 (c) 2017 Aleksandr Rogov */
+/*! dynamics-web-api-callbacks v1.2.7 (c) 2017 Aleksandr Rogov */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -345,8 +345,17 @@ module.exports = function sendRequest(method, uri, config, data, additionalHeade
     if (data) {
         stringifiedData = JSON.stringify(data, function (key, value) {
             /// <param name="key" type="String">Description</param>
-            if (key.endsWith("@odata.bind") && typeof value === "string" && !value.startsWith(config.webApiUrl)) {
-                value = config.webApiUrl + value;
+            if (key.endsWith("@odata.bind")) {
+                if (typeof value === "string") {
+                    //remove brackets in guid
+                    if (/\(\{[\w\d-]+\}\)/g.test(value)){
+                        value = value.replace(/(.+)\(\{([\w\d-]+)\}\)/g, '$1($2)');
+                    }
+                    //add full web api url if it's not set
+                    if (!value.startsWith(config.webApiUrl)) {
+                        value = config.webApiUrl + value;
+                    }
+                }
             }
 
             return value;

diff --git a/dist/dynamics-web-api-callbacks.min.js b/dist/dynamics-web-api-callbacks.min.js
diff --git a/dist/dynamics-web-api.js b/dist/dynamics-web-api.js
@@ -1,4 +1,4 @@
-/*! dynamics-web-api v1.2.6 (c) 2017 Aleksandr Rogov */
+/*! dynamics-web-api v1.2.7 (c) 2017 Aleksandr Rogov */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -345,8 +345,17 @@ module.exports = function sendRequest(method, uri, config, data, additionalHeade
     if (data) {
         stringifiedData = JSON.stringify(data, function (key, value) {
             /// <param name="key" type="String">Description</param>
-            if (key.endsWith("@odata.bind") && typeof value === "string" && !value.startsWith(config.webApiUrl)) {
-                value = config.webApiUrl + value;
+            if (key.endsWith("@odata.bind")) {
+                if (typeof value === "string") {
+                    //remove brackets in guid
+                    if (/\(\{[\w\d-]+\}\)/g.test(value)){
+                        value = value.replace(/(.+)\(\{([\w\d-]+)\}\)/g, '$1($2)');
+                    }
+                    //add full web api url if it's not set
+                    if (!value.startsWith(config.webApiUrl)) {
+                        value = config.webApiUrl + value;
+                    }
+                }
             }
 
             return value;

diff --git a/dist/dynamics-web-api.min.js b/dist/dynamics-web-api.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dynamics-web-api",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "description": "DynamicsWebApi is a Microsoft Dynamics CRM Web API helper library",
   "keywords": [
     "crm",