From b62368728469f75310866f69737eec84faa0a8b2 Mon Sep 17 00:00:00 2001
From: Nick Germaine <nickgermaine@icloud.com>
Date: Tue, 6 Oct 2020 16:01:33 -0300
Subject: [PATCH 1/4] fixed config.code not getting set correctly

---
 .idea/modules.xml         |  8 +++++++
 .idea/vcs.xml             |  6 +++++
 .idea/workspace.xml       | 47 +++++++++++++++++++++++++++++++++++++++
 .idea/zcrm-nodejs-sdk.iml | 12 ++++++++++
 lib/js/ZCRMRestClient.js  | 11 ++++++++-
 5 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 .idea/workspace.xml
 create mode 100644 .idea/zcrm-nodejs-sdk.iml

diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..8ea8dcb
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/zcrm-nodejs-sdk.iml" filepath="$PROJECT_DIR$/.idea/zcrm-nodejs-sdk.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..defab5d
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="3627513d-be58-4c4b-8f83-0c81ca27aa1b" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/lib/js/ZCRMRestClient.js" beforeDir="false" afterPath="$PROJECT_DIR$/lib/js/ZCRMRestClient.js" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectId" id="1i6oggLhl0qPqIS5ZE5zyukbQJn" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="nodejs_package_manager_path" value="npm" />
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="3627513d-be58-4c4b-8f83-0c81ca27aa1b" name="Default Changelist" comment="" />
+      <created>1601237514465</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1601237514465</updated>
+      <workItem from="1601237515542" duration="799000" />
+      <workItem from="1601318338141" duration="525000" />
+      <workItem from="1601387733918" duration="485000" />
+      <workItem from="1601402586316" duration="232000" />
+      <workItem from="1601656508910" duration="1028000" />
+      <workItem from="1601842405303" duration="8000" />
+      <workItem from="1602010773608" duration="92000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/zcrm-nodejs-sdk.iml b/.idea/zcrm-nodejs-sdk.iml
new file mode 100644
index 0000000..24643cc
--- /dev/null
+++ b/.idea/zcrm-nodejs-sdk.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/lib/js/ZCRMRestClient.js b/lib/js/ZCRMRestClient.js
index cefbe21..0fc185f 100644
--- a/lib/js/ZCRMRestClient.js
+++ b/lib/js/ZCRMRestClient.js
@@ -110,6 +110,15 @@ var default_user_identifier = "zcrm_default_user";
         }
 
     var config = ZCRMRestClient.getConfig(grant_token);
+        /*
+    // Sometimes config.code isn't set to grant_token.code.  No idea why.  This code fixes it.
+    if(typeof(config.code) == "object") {
+        if (config.code.code) {
+            config.code = config.code.code;
+        }
+    }
+    
+         */
     new OAuth(config,"generate_token");
     var api_url = OAuth.constructurl("generate_token");
 
@@ -200,7 +209,7 @@ ZCRMRestClient.getConfig = function(grant_token){
 
     config.client_id = ZCRMRestClient.getClientId();
     config.client_secret = ZCRMRestClient.getClientSecret();
-    config.code = grant_token;
+    config.code = grant_token.code;
     config.redirect_uri = ZCRMRestClient.getRedirectURL();
     config.grant_type = "authorization_code";
 

From 311b1f3b8689bf90e7f9841b735ccec59051684d Mon Sep 17 00:00:00 2001
From: Nick Germaine <nickgermaine@icloud.com>
Date: Tue, 6 Oct 2020 16:02:45 -0300
Subject: [PATCH 2/4] remove ide files

---
 .gitignore                |  1 +
 .idea/modules.xml         |  8 -------
 .idea/vcs.xml             |  6 -----
 .idea/workspace.xml       | 47 ---------------------------------------
 .idea/zcrm-nodejs-sdk.iml | 12 ----------
 5 files changed, 1 insertion(+), 73 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/vcs.xml
 delete mode 100644 .idea/workspace.xml
 delete mode 100644 .idea/zcrm-nodejs-sdk.iml

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..485dee6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.idea
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 8ea8dcb..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/zcrm-nodejs-sdk.iml" filepath="$PROJECT_DIR$/.idea/zcrm-nodejs-sdk.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index defab5d..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="3627513d-be58-4c4b-8f83-0c81ca27aa1b" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/lib/js/ZCRMRestClient.js" beforeDir="false" afterPath="$PROJECT_DIR$/lib/js/ZCRMRestClient.js" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="ProjectId" id="1i6oggLhl0qPqIS5ZE5zyukbQJn" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="nodejs_package_manager_path" value="npm" />
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="3627513d-be58-4c4b-8f83-0c81ca27aa1b" name="Default Changelist" comment="" />
-      <created>1601237514465</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1601237514465</updated>
-      <workItem from="1601237515542" duration="799000" />
-      <workItem from="1601318338141" duration="525000" />
-      <workItem from="1601387733918" duration="485000" />
-      <workItem from="1601402586316" duration="232000" />
-      <workItem from="1601656508910" duration="1028000" />
-      <workItem from="1601842405303" duration="8000" />
-      <workItem from="1602010773608" duration="92000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/zcrm-nodejs-sdk.iml b/.idea/zcrm-nodejs-sdk.iml
deleted file mode 100644
index 24643cc..0000000
--- a/.idea/zcrm-nodejs-sdk.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file

From 4f2623256244da57d6dc18a47892c993b68ab598 Mon Sep 17 00:00:00 2001
From: Nick Germaine <nickgermaine@icloud.com>
Date: Tue, 6 Oct 2020 16:05:13 -0300
Subject: [PATCH 3/4] fixed config.code not getting set correctly

---
 lib/js/ZCRMRestClient.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/js/ZCRMRestClient.js b/lib/js/ZCRMRestClient.js
index 0fc185f..bf72f52 100644
--- a/lib/js/ZCRMRestClient.js
+++ b/lib/js/ZCRMRestClient.js
@@ -117,7 +117,7 @@ var default_user_identifier = "zcrm_default_user";
             config.code = config.code.code;
         }
     }
-    
+
          */
     new OAuth(config,"generate_token");
     var api_url = OAuth.constructurl("generate_token");

From ecf2ddc3cc7094360c11f19d442acf2e4dc1f49f Mon Sep 17 00:00:00 2001
From: Nick Germaine <nickgermaine@icloud.com>
Date: Tue, 6 Oct 2020 16:16:26 -0300
Subject: [PATCH 4/4] Fixed config.code not getting set correctly in
 generateToken method. Removed unnecessary (test) code

---
 lib/js/ZCRMRestClient.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/lib/js/ZCRMRestClient.js b/lib/js/ZCRMRestClient.js
index bf72f52..d2e4c8a 100644
--- a/lib/js/ZCRMRestClient.js
+++ b/lib/js/ZCRMRestClient.js
@@ -110,15 +110,6 @@ var default_user_identifier = "zcrm_default_user";
         }
 
     var config = ZCRMRestClient.getConfig(grant_token);
-        /*
-    // Sometimes config.code isn't set to grant_token.code.  No idea why.  This code fixes it.
-    if(typeof(config.code) == "object") {
-        if (config.code.code) {
-            config.code = config.code.code;
-        }
-    }
-
-         */
     new OAuth(config,"generate_token");
     var api_url = OAuth.constructurl("generate_token");