From c5d4c953463120a6ed26b3ba1ec52a3e855d51b3 Mon Sep 17 00:00:00 2001
From: Apoorva <apoorvasingh05@gmail.com>
Date: Tue, 27 Jun 2023 19:25:00 +0530
Subject: [PATCH] Latest Update with Start time fix.

---
 ...clude_f60f0ee047131110328ca368436d43ba.xml |    2 +-
 ...clude_716c87ad471f1110328ca368436d438a.xml |   14 +-
 ...clude_891d8fed471f1110328ca368436d4334.xml |    2 +-
 ...clude_ba2b3da69769e510026f72021153af1b.xml |    9 +-
 ...clude_508f0d54471f1110328ca368436d43f8.xml |    2 +-
 ...clude_5c0f0d18471f1110328ca368436d4357.xml |    2 +-
 ...clude_d7f2d2e447131110328ca368436d4321.xml |    2 +-
 ...clude_ec0e828f47f42110328ca368436d433b.xml |   20 +-
 ...clude_1980bcb147935110328ca368436d435a.xml | 1143 ++++++++---------
 ...clude_afffecb147935110328ca368436d43ea.xml |   28 +
 10 files changed, 631 insertions(+), 593 deletions(-)
 create mode 100644 Scripts/CheckmarxOneUtil_sys_script_include_afffecb147935110328ca368436d43ea.xml

diff --git a/Scripts/CheckmarxOneAppListIntegration_sys_script_include_f60f0ee047131110328ca368436d43ba.xml b/Scripts/CheckmarxOneAppListIntegration_sys_script_include_f60f0ee047131110328ca368436d43ba.xml
index 11ca578..e05c82f 100644
--- a/Scripts/CheckmarxOneAppListIntegration_sys_script_include_f60f0ee047131110328ca368436d43ba.xml
+++ b/Scripts/CheckmarxOneAppListIntegration_sys_script_include_f60f0ee047131110328ca368436d43ba.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<unload unload_date="2023-06-26 17:41:59">
+<unload unload_date="2023-06-27 13:48:20">
 <sys_script_include action="INSERT_OR_UPDATE">
 <access>public</access>
 <active>true</active>
diff --git a/Scripts/CheckmarxOneAppListProcessor_sys_script_include_716c87ad471f1110328ca368436d438a.xml b/Scripts/CheckmarxOneAppListProcessor_sys_script_include_716c87ad471f1110328ca368436d438a.xml
index ed7ba21..6c29c7d 100644
--- a/Scripts/CheckmarxOneAppListProcessor_sys_script_include_716c87ad471f1110328ca368436d438a.xml
+++ b/Scripts/CheckmarxOneAppListProcessor_sys_script_include_716c87ad471f1110328ca368436d438a.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<unload unload_date="2023-06-27 13:48:59">
 <sys_script_include action="INSERT_OR_UPDATE">
 <access>public</access>
 <active>true</active>
@@ -59,12 +59,13 @@ CheckmarxOneAppListProcessor.prototype = Object.extendsObject(sn_vul.Application
 
         } catch (ex) {
             errorMessage = gs.getMessage("Error in retriving data for app list integration!");
-            gs.error(this.MSG + " " + errorMessage + " " + ex.message);
-            errorProcess += " | " + ex.message;
+            gs.error(this.MSG + "errorMessage " + ex);
+            errorProcess += " | " + ex.getMessage();
         }
 		}
+
         if (!gs.nil(errorProcess))
-            gs.error(this.MSG + " All errors that occurred while processing project lists: " + errorProcess);
+            gs.error(this.MSG + "All errors that occurred while processing project lists: " + errorProcess);
         this.completeProcess(this.integrationProcessGr, this.import_counts);
     },
 
@@ -74,12 +75,13 @@ CheckmarxOneAppListProcessor.prototype = Object.extendsObject(sn_vul.Application
 <sys_created_by>admin</sys_created_by>
 <sys_created_on>2022-11-21 12:03:00</sys_created_on>
 <sys_id>716c87ad471f1110328ca368436d438a</sys_id>
-
+<sys_mod_count>48</sys_mod_count>
 <sys_name>CheckmarxOneAppListProcessor</sys_name>
 <sys_package display_value="Checkmarx One Vulnerability Integration" source="x_chec3_chexone">3d20e92d47471110328ca368436d436a</sys_package>
 <sys_policy/>
 <sys_scope display_value="Checkmarx One Vulnerability Integration">3d20e92d47471110328ca368436d436a</sys_scope>
 <sys_update_name>sys_script_include_716c87ad471f1110328ca368436d438a</sys_update_name>
-
+<sys_updated_by>apoorva.singh@checkmarx.com</sys_updated_by>
+<sys_updated_on>2023-06-26 17:18:16</sys_updated_on>
 </sys_script_include>
 </unload>
diff --git a/Scripts/CheckmarxOneAppVulItemIntegration_sys_script_include_891d8fed471f1110328ca368436d4334.xml b/Scripts/CheckmarxOneAppVulItemIntegration_sys_script_include_891d8fed471f1110328ca368436d4334.xml
index ef571c8..2052091 100644
--- a/Scripts/CheckmarxOneAppVulItemIntegration_sys_script_include_891d8fed471f1110328ca368436d4334.xml
+++ b/Scripts/CheckmarxOneAppVulItemIntegration_sys_script_include_891d8fed471f1110328ca368436d4334.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<unload unload_date="2023-06-26 18:06:49">
+<unload unload_date="2023-06-27 13:49:35">
 <sys_script_include action="INSERT_OR_UPDATE">
 <access>public</access>
 <active>true</active>
diff --git a/Scripts/CheckmarxOneAppVulItemProcessor_sys_script_include_ba2b3da69769e510026f72021153af1b.xml b/Scripts/CheckmarxOneAppVulItemProcessor_sys_script_include_ba2b3da69769e510026f72021153af1b.xml
index 509a114..6035102 100644
--- a/Scripts/CheckmarxOneAppVulItemProcessor_sys_script_include_ba2b3da69769e510026f72021153af1b.xml
+++ b/Scripts/CheckmarxOneAppVulItemProcessor_sys_script_include_ba2b3da69769e510026f72021153af1b.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<unload unload_date="2023-06-27 13:50:10">
 <sys_script_include action="INSERT_OR_UPDATE">
 <access>public</access>
 <active>true</active>
@@ -143,12 +144,13 @@ CheckmarxOneAppVulItemProcessor.prototype = Object.extendsObject(sn_vul.Applicat
                         errorMessage = gs.getMessage("Error in retriving data for app vulnerability item integration!");
                         gs.error(this.MSG + " " + errorMessage + " " + ex.message);
                         errorProcess += " | " + ex.message;
+
                     }
 
                 }
             }
             if (!gs.nil(errorProcess))
-                gs.error(this.MSG + " All errors that occurred while processing Vulnerability lists: " + errorProcess);
+                gs.error(this.MSG + "All errors that occurred while processing Vulnerability lists: " + errorProcess);
             this.completeProcess(this.integrationProcessGr, this.import_counts);
         } else
             gs.warn(this.MSG + ':process called with no attachment');
@@ -217,12 +219,13 @@ CheckmarxOneAppVulItemProcessor.prototype = Object.extendsObject(sn_vul.Applicat
 <sys_created_by>apoorva.singh@checkmarx.com</sys_created_by>
 <sys_created_on>2023-03-16 05:04:10</sys_created_on>
 <sys_id>ba2b3da69769e510026f72021153af1b</sys_id>
-
+<sys_mod_count>23</sys_mod_count>
 <sys_name>CheckmarxOneAppVulItemProcessor</sys_name>
 <sys_package display_value="Checkmarx One Vulnerability Integration" source="x_chec3_chexone">3d20e92d47471110328ca368436d436a</sys_package>
 <sys_policy/>
 <sys_scope display_value="Checkmarx One Vulnerability Integration">3d20e92d47471110328ca368436d436a</sys_scope>
 <sys_update_name>sys_script_include_ba2b3da69769e510026f72021153af1b</sys_update_name>
-
+<sys_updated_by>apoorva.singh@checkmarx.com</sys_updated_by>
+<sys_updated_on>2023-06-26 16:47:43</sys_updated_on>
 </sys_script_include>
 </unload>
diff --git a/Scripts/CheckmarxOneConfigUtilBase_sys_script_include_508f0d54471f1110328ca368436d43f8.xml b/Scripts/CheckmarxOneConfigUtilBase_sys_script_include_508f0d54471f1110328ca368436d43f8.xml
index 9022fb9..c0fa33c 100644
--- a/Scripts/CheckmarxOneConfigUtilBase_sys_script_include_508f0d54471f1110328ca368436d43f8.xml
+++ b/Scripts/CheckmarxOneConfigUtilBase_sys_script_include_508f0d54471f1110328ca368436d43f8.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<unload unload_date="2023-06-26 17:37:09">
+<unload unload_date="2023-06-27 13:51:05">
 <sys_script_include action="INSERT_OR_UPDATE">
 <access>package_private</access>
 <active>true</active>
diff --git a/Scripts/CheckmarxOneConfigUtil_sys_script_include_5c0f0d18471f1110328ca368436d4357.xml b/Scripts/CheckmarxOneConfigUtil_sys_script_include_5c0f0d18471f1110328ca368436d4357.xml
index 90ee940..29403fb 100644
--- a/Scripts/CheckmarxOneConfigUtil_sys_script_include_5c0f0d18471f1110328ca368436d4357.xml
+++ b/Scripts/CheckmarxOneConfigUtil_sys_script_include_5c0f0d18471f1110328ca368436d4357.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<unload unload_date="2023-06-02 11:13:23">
+<unload unload_date="2023-06-27 13:50:41">
 <sys_script_include action="INSERT_OR_UPDATE">
 <access>public</access>
 <active>true</active>
diff --git a/Scripts/CheckmarxOneScanSummaryIntegration_sys_script_include_d7f2d2e447131110328ca368436d4321.xml b/Scripts/CheckmarxOneScanSummaryIntegration_sys_script_include_d7f2d2e447131110328ca368436d4321.xml
index 0101428..5dbf23b 100644
--- a/Scripts/CheckmarxOneScanSummaryIntegration_sys_script_include_d7f2d2e447131110328ca368436d4321.xml
+++ b/Scripts/CheckmarxOneScanSummaryIntegration_sys_script_include_d7f2d2e447131110328ca368436d4321.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<unload unload_date="2023-06-26 17:42:49">
+<unload unload_date="2023-06-27 13:51:33">
 <sys_script_include action="INSERT_OR_UPDATE">
 <access>public</access>
 <active>true</active>
diff --git a/Scripts/CheckmarxOneScanSummaryProcessor_sys_script_include_ec0e828f47f42110328ca368436d433b.xml b/Scripts/CheckmarxOneScanSummaryProcessor_sys_script_include_ec0e828f47f42110328ca368436d433b.xml
index 01e7552..def49ca 100644
--- a/Scripts/CheckmarxOneScanSummaryProcessor_sys_script_include_ec0e828f47f42110328ca368436d433b.xml
+++ b/Scripts/CheckmarxOneScanSummaryProcessor_sys_script_include_ec0e828f47f42110328ca368436d433b.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<unload unload_date="2023-06-27 13:52:04">
 <sys_script_include action="INSERT_OR_UPDATE">
 <access>public</access>
 <active>true</active>
@@ -46,9 +47,10 @@ CheckmarxOneScanSummaryProcessor.prototype = Object.extendsObject(sn_vul.Applica
                         sastdata['scan_summary_name'] = Sastattributes.app_name + ' ' + sastdata['last_scan_date'];
                         this._upsert(sastdata);
                     } catch (ex) {
-                        errorMessage = gs.getMessage("Error in retriving data for CxOneSast scan list integration!");
-                        gs.error(this.MSG + " " + errorMessage + " " + ex.message);
-                        errorProcess += " | " + ex.message;
+                        errorMessage = gs.getMessage("Error in retriving data for scan list integration!");
+                        gs.error(this.MSG + "errorMessage " + ex);
+                        errorProcess += " | " + ex.getMessage();
+                        //throw ex;
                     }
                 }
             }
@@ -73,14 +75,15 @@ CheckmarxOneScanSummaryProcessor.prototype = Object.extendsObject(sn_vul.Applica
                         data['scan_summary_name'] = attributes.app_name + ' ' + data['last_scan_date'];
                         this._upsert(data);
                     } catch (ex) {
-                        errorMessage = gs.getMessage("Error in retriving data for CxOneSca scan list integration!");
-                        gs.error(this.MSG + " " + errorMessage + " " + ex.message);
-                        errorProcess += " | " + ex.message;
+                        errorMessage = gs.getMessage("Error in retriving data for scan list integration!");
+                        gs.error(this.MSG + "errorMessage " + ex);
+                        errorProcess += " | " + ex.getMessage();
+                        //throw ex;
                     }
                 }
             }
             if (!gs.nil(errorProcess))
-                gs.error(this.MSG + " All errors that occurred while processing scan summary: " + errorProcess);
+                gs.error(this.MSG + "All errors that occurred while processing scan summary: " + errorProcess);
             this.completeProcess(this.integrationProcessGr, this.import_counts);
 
         } else
@@ -131,10 +134,13 @@ CheckmarxOneScanSummaryProcessor.prototype = Object.extendsObject(sn_vul.Applica
 <sys_created_by>admin</sys_created_by>
 <sys_created_on>2023-02-08 12:56:43</sys_created_on>
 <sys_id>ec0e828f47f42110328ca368436d433b</sys_id>
+<sys_mod_count>9</sys_mod_count>
 <sys_name>CheckmarxOneScanSummaryProcessor</sys_name>
 <sys_package display_value="Checkmarx One Vulnerability Integration" source="x_chec3_chexone">3d20e92d47471110328ca368436d436a</sys_package>
 <sys_policy/>
 <sys_scope display_value="Checkmarx One Vulnerability Integration">3d20e92d47471110328ca368436d436a</sys_scope>
 <sys_update_name>sys_script_include_ec0e828f47f42110328ca368436d433b</sys_update_name>
+<sys_updated_by>apoorva.singh@checkmarx.com</sys_updated_by>
+<sys_updated_on>2023-06-26 17:22:27</sys_updated_on>
 </sys_script_include>
 </unload>
diff --git a/Scripts/CheckmarxOneUtilBase_sys_script_include_1980bcb147935110328ca368436d435a.xml b/Scripts/CheckmarxOneUtilBase_sys_script_include_1980bcb147935110328ca368436d435a.xml
index f3d17aa..a66b8e1 100644
--- a/Scripts/CheckmarxOneUtilBase_sys_script_include_1980bcb147935110328ca368436d435a.xml
+++ b/Scripts/CheckmarxOneUtilBase_sys_script_include_1980bcb147935110328ca368436d435a.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<unload unload_date="2023-06-26 18:17:11">
+<unload unload_date="2023-06-27 13:53:01">
 <sys_script_include action="INSERT_OR_UPDATE">
 <access>public</access>
 <active>true</active>
@@ -8,603 +8,602 @@
 <client_callable>false</client_callable>
 <description>Wrapper class to assemble the components for Checkmarx One integration calls.</description>
 <name>CheckmarxOneUtilBase</name>
-<script>
-	<![CDATA[var CheckmarxOneUtilBase = Class.create();
+<script><![CDATA[var CheckmarxOneUtilBase = Class.create();
 
 CheckmarxOneUtilBase.prototype = {
-        MSG: 'CheckmarxOneUtilBase:',
-        initialize: function() {},
-
-        //get all project list
-        getProjectList: function(configId) {
-            try {
-                var request = new sn_ws.RESTMessageV2();
-                var config = this._getConfig(configId);
-                var baseUrl = config.checkmarxone_server_url;
-                var apiurl = config.checkmarxone_api_base_url + '/api/';
-                var method = "post";
-                var token = this.getAccessToken(baseUrl, config, method, request);
-            } catch (err) {
-                gs.error(this.MSG + " getProjectList : Error while getting the project list." + err);
-                throw err;
+    MSG: 'CheckmarxOneUtilBase:',
+    initialize: function() {},
+
+    //get all project list
+    getProjectList: function(configId) {
+        try {
+            var request = new sn_ws.RESTMessageV2();
+            var config = this._getConfig(configId);
+            var baseUrl = config.checkmarxone_server_url;
+            var apiurl = config.checkmarxone_api_base_url + '/api/';
+            var method = "post";
+            var token = this.getAccessToken(baseUrl, config, method, request);
+        } catch (err) {
+            gs.error(this.MSG + " getProjectList : Error while getting the project list." + err);
+            throw err;
+        }
+        return this._makeRestCall(apiurl, configId, token, 'projects', "get");
+    },
+    //get one project from project list
+    getProject: function(configId) {
+        try {
+            var request = new sn_ws.RESTMessageV2();
+            var config = this._getConfig(configId);
+            var accesscontrolbaseUrl = config.checkmarxone_server_url;
+            var apibaseurl = config.checkmarxone_api_base_url;
+            var method = "post";
+            var token = this.getAccessToken(accesscontrolbaseUrl, config, method, request);
+            var query = '/api/projects/?offset=0&limit=1';
+        } catch (err) {
+            gs.error(this.MSG + " getProject: Error while getting project." + err);
+            throw err;
+        }
+        return this._makeRestApiCall(apibaseurl, configId, token, query, "get");
+    },
+    //get new project list
+    getNewProjectList: function(configId) {
+        try {
+            var request = new sn_ws.RESTMessageV2();
+            var config = this._getConfig(configId);
+            var accesscontrolbaseUrl = config.checkmarxone_server_url;
+            var apibaseurl = config.checkmarxone_api_base_url;
+            var method = "post";
+            var token = this.getAccessToken(accesscontrolbaseUrl, config, method, request);
+            var query = '/api/projects/?offset=0&limit=0';
+            var resp = this._makeRestApiCall(apibaseurl, configId, token, query, "get");
+            var body = resp.getBody();
+            var projectJSON = JSON.parse(body);
+        } catch (err) {
+            gs.error(this.MSG + " getProjectInfo: Error while getting the project info." + err);
+            throw err;
+        }
+        return projectJSON;
+    },
+    //get 50 project list at a time
+    getNextProjectList: function(configId, offsetno) {
+        try {
+            var request = new sn_ws.RESTMessageV2();
+            var config = this._getConfig(configId);
+            var accesscontrolbaseUrl = config.checkmarxone_server_url;
+            var apibaseurl = config.checkmarxone_api_base_url;
+            var limit_val = config.limit;
+            var method = "post";
+            var token = this.getAccessToken(accesscontrolbaseUrl, config, method, request);
+            var query = '/api/projects/?offset=' + offsetno + '&limit=' + limit_val;
+            var resp = this._makeRestApiCall(apibaseurl, configId, token, query, "get");
+            var body = resp.getBody();
+            var projectJSON = JSON.parse(body);
+
+        } catch (err) {
+            gs.error(this.MSG + " getProjectInfo: Error while getting the project info." + err);
+            throw err;
+        }
+        return projectJSON;
+    },
+
+    //List of scanIds for a given app/project
+    getScanList: function(configId, projectId, last_run_date) {
+        try {
+            var request = new sn_ws.RESTMessageV2();
+            var config = this._getConfig(configId);
+            var accesscontrolbaseUrl = config.checkmarxone_server_url;
+            var apibaseurl = config.checkmarxone_api_base_url;
+            var method = "post";
+            var token = this.getAccessToken(accesscontrolbaseUrl, config, method, request);
+            var query = '/api/scans/?offset=0&limit=1&statuses=Completed&project-id=' + projectId + '&from-date=' + last_run_date + '&sort=%2Bcreated_at&sort=%2Bstatus&field=scan-ids';
+
+        } catch (err) {
+            gs.error(this.MSG + " :getScanList :Error in getting status of the report." + err);
+            throw err;
+        }
+        return this._makeRestApiCall(apibaseurl, configId, token, query, "get");
+    },
+
+    // last  scan details of a given appId 
+    getScanInfo: function(configId, appId, offset, last_run_date) {
+        try {
+            var request = new sn_ws.RESTMessageV2();
+            var config = this._getConfig(configId);
+            var accesscontrolbaseUrl = config.checkmarxone_server_url;
+            var apibaseurl = config.checkmarxone_api_base_url;
+            var limit_val = config.limit;
+            var method = "post";
+            var token = this.getAccessToken(accesscontrolbaseUrl, config, method, request);
+            var query = '/api/scans/?offset=0&limit=1&statuses=Completed&project-id=' + appId + '&from-date=' + last_run_date + '&sort=%2Bcreated_at&sort=%2Bstatus&field=scan-ids';
+        } catch (err) {
+            gs.error(this.MSG + " getScanInfo: Error while getting the scan Ids." + err);
+            throw err;
+        }
+        return this._makeRestApiCall(apibaseurl, configId, token, query, "get");
+
+    },
+    // to fetch scan details of particular scanId
+    getScanDetails: function(configId, scanId) {
+        try {
+            var request = new sn_ws.RESTMessageV2();
+            var config = this._getConfig(configId);
+            var accesscontrolbaseUrl = config.checkmarxone_server_url;
+            var apibaseurl = config.checkmarxone_api_base_url;
+            var method = "post";
+            var token = this.getAccessToken(accesscontrolbaseUrl, config, method, request);
+            var query = '/api/scans/?offset=0&limit=2000&scan-ids=' + scanId + '&sort=%2Bcreated_at&sort=%2Bstatus&field=scan-ids';
+
+
+        } catch (err) {
+            gs.error(this.MSG + " getScanDetails: Error while getting the scan Ids." + err);
+            throw err;
+        }
+        return this._makeRestApiCall(apibaseurl, configId, token, query, "get");
+
+    },
+
+    //to get total  vul item 
+    getTotalVulcount: function(configId, scanId) {
+        try {
+            var request = new sn_ws.RESTMessageV2();
+            var config = this._getConfig(configId);
+            var accesscontrolbaseUrl = config.checkmarxone_server_url;
+            var apibaseurl = config.checkmarxone_api_base_url;
+            var method = "post";
+            var token = this.getAccessToken(accesscontrolbaseUrl, config, method, request);
+
+            var query = '/api/scan-summary/?scan-ids=' + scanId + '&include-severity-status=true&include-status-counters=true&include-queries=true&include-files=true&apply-predicates=true';
+            var resp = this._makeRestApiCall(apibaseurl, configId, token, query, "get");
+            var body = resp.getBody();
+            var ScanSummaryJson = JSON.parse(body);
+
+            for (var item in ScanSummaryJson.scansSummaries) {
+                var count = ScanSummaryJson.scansSummaries[item].scaCounters.totalCounter + ScanSummaryJson.scansSummaries[item].sastCounters.totalCounter;
             }
-            return this._makeRestCall(apiurl, configId, token, 'projects', "get");
-        },
-        //get one project from project list
-        getProject: function(configId) {
-            try {
-                var request = new sn_ws.RESTMessageV2();
-                var config = this._getConfig(configId);
-                var accesscontrolbaseUrl = config.checkmarxone_server_url;
-                var apibaseurl = config.checkmarxone_api_base_url;
-                var method = "post";
-                var token = this.getAccessToken(accesscontrolbaseUrl, config, method, request);
-                var query = '/api/projects/?offset=0&limit=1';
-            } catch (err) {
-                gs.error(this.MSG + " getProject: Error while getting project." + err);
-                throw err;
-            }
-            return this._makeRestApiCall(apibaseurl, configId, token, query, "get");
-        },
-        //get new project list
-        getNewProjectList: function(configId) {
-            try {
-                var request = new sn_ws.RESTMessageV2();
-                var config = this._getConfig(configId);
-                var accesscontrolbaseUrl = config.checkmarxone_server_url;
-                var apibaseurl = config.checkmarxone_api_base_url;
-                var method = "post";
-                var token = this.getAccessToken(accesscontrolbaseUrl, config, method, request);
-                var query = '/api/projects/?offset=0&limit=0';
-                var resp = this._makeRestApiCall(apibaseurl, configId, token, query, "get");
-                var body = resp.getBody();
-                var projectJSON = JSON.parse(body);
-            } catch (err) {
-                gs.error(this.MSG + " getProjectInfo: Error while getting the project info." + err);
-                throw err;
-            }
-            return projectJSON;
-        },
-        //get 50 project list at a time
-        getNextProjectList: function(configId, offsetno) {
-            try {
-                var request = new sn_ws.RESTMessageV2();
-                var config = this._getConfig(configId);
-                var accesscontrolbaseUrl = config.checkmarxone_server_url;
-                var apibaseurl = config.checkmarxone_api_base_url;
-                var limit_val = config.limit;
-                var method = "post";
-                var token = this.getAccessToken(accesscontrolbaseUrl, config, method, request);
-                var query = '/api/projects/?offset=' + offsetno + '&limit=' + limit_val;
-                var resp = this._makeRestApiCall(apibaseurl, configId, token, query, "get");
-                var body = resp.getBody();
-                var projectJSON = JSON.parse(body);
-
-            } catch (err) {
-                gs.error(this.MSG + " getProjectInfo: Error while getting the project info." + err);
-                throw err;
-            }
-            return projectJSON;
-        },
-
-        //List of scanIds for a given app/project
-        getScanList: function(configId, projectId, last_run_date) {
-            try {
-                var request = new sn_ws.RESTMessageV2();
-                var config = this._getConfig(configId);
-                var accesscontrolbaseUrl = config.checkmarxone_server_url;
-                var apibaseurl = config.checkmarxone_api_base_url;
-                var method = "post";
-                var token = this.getAccessToken(accesscontrolbaseUrl, config, method, request);
-                var query = '/api/scans/?offset=0&limit=1&statuses=Completed&project-id=' + projectId + '&from-date=' + last_run_date + '&sort=%2Bcreated_at&sort=%2Bstatus&field=scan-ids';
-
-            } catch (err) {
-                gs.error(this.MSG + " :getScanList :Error in getting status of the report." + err);
-                throw err;
-            }
-            return this._makeRestApiCall(apibaseurl, configId, token, query, "get");
-        },
-
-        // last  scan details of a given appId 
-        getScanInfo: function(configId, appId, offset, last_run_date) {
-            try {
-                var request = new sn_ws.RESTMessageV2();
-                var config = this._getConfig(configId);
-                var accesscontrolbaseUrl = config.checkmarxone_server_url;
-                var apibaseurl = config.checkmarxone_api_base_url;
-                var limit_val = config.limit;
-                var method = "post";
-                var token = this.getAccessToken(accesscontrolbaseUrl, config, method, request);
-                var query = '/api/scans/?offset=0&limit=1&statuses=Completed&project-id=' + appId + '&from-date=' + last_run_date + '&sort=%2Bcreated_at&sort=%2Bstatus&field=scan-ids';
-            } catch (err) {
-                gs.error(this.MSG + " getScanInfo: Error while getting the scan Ids." + err);
-                throw err;
-            }
-            return this._makeRestApiCall(apibaseurl, configId, token, query, "get");
-
-        },
-        // to fetch scan details of particular scanId
-        getScanDetails: function(configId, scanId) {
-            try {
-                var request = new sn_ws.RESTMessageV2();
-                var config = this._getConfig(configId);
-                var accesscontrolbaseUrl = config.checkmarxone_server_url;
-                var apibaseurl = config.checkmarxone_api_base_url;
-                var method = "post";
-                var token = this.getAccessToken(accesscontrolbaseUrl, config, method, request);
-                var query = '/api/scans/?offset=0&limit=2000&scan-ids=' + scanId + '&sort=%2Bcreated_at&sort=%2Bstatus&field=scan-ids';
-
-
-            } catch (err) {
-                gs.error(this.MSG + " getScanDetails: Error while getting the scan Ids." + err);
-                throw err;
-            }
-            return this._makeRestApiCall(apibaseurl, configId, token, query, "get");
-
-        },
-
-        //to get total  vul item 
-        getTotalVulcount: function(configId, scanId) {
-            try {
-                var request = new sn_ws.RESTMessageV2();
-                var config = this._getConfig(configId);
-                var accesscontrolbaseUrl = config.checkmarxone_server_url;
-                var apibaseurl = config.checkmarxone_api_base_url;
-                var method = "post";
-                var token = this.getAccessToken(accesscontrolbaseUrl, config, method, request);
-
-                var query = '/api/scan-summary/?scan-ids=' + scanId + '&include-severity-status=true&include-status-counters=true&include-queries=true&include-files=true&apply-predicates=true';
-                var resp = this._makeRestApiCall(apibaseurl, configId, token, query, "get");
-                var body = resp.getBody();
-                var ScanSummaryJson = JSON.parse(body);
-
-                for (var item in ScanSummaryJson.scansSummaries) {
-                    var count = ScanSummaryJson.scansSummaries[item].scaCounters.totalCounter + ScanSummaryJson.scansSummaries[item].sastCounters.totalCounter;
-                }
-            } catch (err) {
-                gs.error(this.MSG + " getTotalVulcount: Error while getting the total vul count." + err + scanId);
-                return -1;
-            }
-
-            return count;
-
-        },
-        // to get vulnerabilities information of scanId
-        getVulInfo: function(configId, scanId, offsetId) {
-            try {
-                var request = new sn_ws.RESTMessageV2();
-                var config = this._getConfig(configId);
-                var includesca = this.importScaFlaw(configId);
-                var includesast = this.importSastFlaw(configId);
-                var limit_val = config.limit;
-                //var query = '/api/results/?scan-id=' + scanId + '&offset=' + offsetId + '&limit=' + limit_val; 
-                var query = '/api/results/?scan-id=' + scanId + '&offset=' + offsetId + '&limit=' + limit_val + '&sort=%2Bstatus&sort=%2Bseverity';
-                //var query = '/api/results/?scan-id=' + scanId + '&offset=' + offsetId + '&limit=20' +'&sort=%2Bstatus&sort=%2Bseverity' ;      
-                var accesscontrolbaseUrl = config.checkmarxone_server_url;
-                var apibaseurl = config.checkmarxone_api_base_url;
-                var method = "post";
-                var token = this.getAccessToken(accesscontrolbaseUrl, config, method, request);
-
-            } catch (err) {
-                gs.error(this.MSG + " getVulInfo: Error while getting the vul Info." + err);
-                throw err;
-            }
-            return this._makeRestApiCall(apibaseurl, configId, token, query, "get");
-
-        },
-
-        //Sca scan details of a given scanId
-        getScanSummaryInfo: function(configId, scanId) {
-            try {
-                var request = new sn_ws.RESTMessageV2();
-                var config = this._getConfig(configId);
-                var accesscontrolbaseUrl = config.checkmarxone_server_url;
-                var apibaseurl = config.checkmarxone_api_base_url;
-                var method = "post";
-                var token = this.getAccessToken(accesscontrolbaseUrl, config, method, request);
-
-                var query = '/api/scan-summary/?scan-ids=' + scanId + '&include-severity-status=true&include-status-counters=true&include-queries=true&include-files=true&apply-predicates=true';
-                var resp = this._makeRestApiCall(apibaseurl, configId, token, query, "get");
-                var body = resp.getBody();
-                var ScanSummaryJson = JSON.parse(body);
-                var flaws = 0;
-                var vulnerabilityCountThresholdLevel = config.vulnerability_threshold_level;
-                for (var item in ScanSummaryJson.scansSummaries) {
-                    for (var value in ScanSummaryJson.scansSummaries[item].scaCounters.severityCounters) {
-                        var severity = ScanSummaryJson.scansSummaries[item].scaCounters.severityCounters[value].severity;
-
-                        if ((vulnerabilityCountThresholdLevel == 'LOW') ||
-                            (severity.toUpperCase() == 'HIGH') ||
-                            (severity.toUpperCase() == vulnerabilityCountThresholdLevel)) {
-                            var counts = ScanSummaryJson.scansSummaries[item].scaCounters.severityCounters[value].counter;
-                            flaws += counts;
-                        }
+        } catch (err) {
+            gs.error(this.MSG + " getTotalVulcount: Error while getting the total vul count." + err + scanId);
+            return -1;
+        }
+
+        return count;
+
+    },
+    // to get vulnerabilities information of scanId
+    getVulInfo: function(configId, scanId, offsetId) {
+        try {
+            var request = new sn_ws.RESTMessageV2();
+            var config = this._getConfig(configId);
+            var includesca = this.importScaFlaw(configId);
+            var includesast = this.importSastFlaw(configId);
+            var limit_val = config.limit;
+            //var query = '/api/results/?scan-id=' + scanId + '&offset=' + offsetId + '&limit=' + limit_val; 
+            var query = '/api/results/?scan-id=' + scanId + '&offset=' + offsetId + '&limit=' + limit_val + '&sort=%2Bstatus&sort=%2Bseverity';
+            //var query = '/api/results/?scan-id=' + scanId + '&offset=' + offsetId + '&limit=20' +'&sort=%2Bstatus&sort=%2Bseverity' ;      
+            var accesscontrolbaseUrl = config.checkmarxone_server_url;
+            var apibaseurl = config.checkmarxone_api_base_url;
+            var method = "post";
+            var token = this.getAccessToken(accesscontrolbaseUrl, config, method, request);
+
+        } catch (err) {
+            gs.error(this.MSG + " getVulInfo: Error while getting the vul Info." + err);
+            throw err;
+        }
+        return this._makeRestApiCall(apibaseurl, configId, token, query, "get");
+
+    },
+
+    //Sca scan details of a given scanId
+    getScanSummaryInfo: function(configId, scanId) {
+        try {
+            var request = new sn_ws.RESTMessageV2();
+            var config = this._getConfig(configId);
+            var accesscontrolbaseUrl = config.checkmarxone_server_url;
+            var apibaseurl = config.checkmarxone_api_base_url;
+            var method = "post";
+            var token = this.getAccessToken(accesscontrolbaseUrl, config, method, request);
+
+            var query = '/api/scan-summary/?scan-ids=' + scanId + '&include-severity-status=true&include-status-counters=true&include-queries=true&include-files=true&apply-predicates=true';
+            var resp = this._makeRestApiCall(apibaseurl, configId, token, query, "get");
+            var body = resp.getBody();
+            var ScanSummaryJson = JSON.parse(body);
+            var flaws = 0;
+            var vulnerabilityCountThresholdLevel = config.vulnerability_threshold_level;
+            for (var item in ScanSummaryJson.scansSummaries) {
+                for (var value in ScanSummaryJson.scansSummaries[item].scaCounters.severityCounters) {
+                    var severity = ScanSummaryJson.scansSummaries[item].scaCounters.severityCounters[value].severity;
+
+                    if ((vulnerabilityCountThresholdLevel == 'LOW') ||
+                        (severity.toUpperCase() == 'HIGH') ||
+                        (severity.toUpperCase() == vulnerabilityCountThresholdLevel)) {
+                        var counts = ScanSummaryJson.scansSummaries[item].scaCounters.severityCounters[value].counter;
+                        flaws += counts;
                     }
                 }
-            } catch (err) {
-                gs.error(this.MSG + " getScanSummaryInfo: Error while getting the scan summary Ids." + err + scanId);
-                return -1;
-
             }
-            return flaws;
-
-        },
-        //Sast scan details of a given scanId
-        getSastScanSummaryInfo: function(configId, scanId) {
-            try {
-                var request = new sn_ws.RESTMessageV2();
-                var config = this._getConfig(configId);
-                var accesscontrolbaseUrl = config.checkmarxone_server_url;
-                var apibaseurl = config.checkmarxone_api_base_url;
-                var method = "post";
-                var token = this.getAccessToken(accesscontrolbaseUrl, config, method, request);
-
-                var query = '/api/scan-summary/?scan-ids=' + scanId + '&include-severity-status=true&include-status-counters=true&include-queries=true&include-files=true&apply-predicates=true';
-                var resp = this._makeRestApiCall(apibaseurl, configId, token, query, "get");
-                var body = resp.getBody();
-                var ScanSummaryJson = JSON.parse(body);
-                var flaws = 0;
-                var vulnerabilityCountThresholdLevel = config.vulnerability_threshold_level;
-                for (var item in ScanSummaryJson.scansSummaries) {
-                    for (var value in ScanSummaryJson.scansSummaries[item].sastCounters.severityCounters) {
-                        var severity = ScanSummaryJson.scansSummaries[item].sastCounters.severityCounters[value].severity;
-                        if ((vulnerabilityCountThresholdLevel == 'LOW') ||
-                            (severity.toUpperCase() == 'HIGH') ||
-                            (severity.toUpperCase() == vulnerabilityCountThresholdLevel)) {
-                            var counts = ScanSummaryJson.scansSummaries[item].sastCounters.severityCounters[value].counter;
-                            flaws += counts;
-                        }
+        } catch (err) {
+            gs.error(this.MSG + " getScanSummaryInfo: Error while getting the scan summary Ids." + err + scanId);
+            return -1;
+
+        }
+        return flaws;
+
+    },
+    //Sast scan details of a given scanId
+    getSastScanSummaryInfo: function(configId, scanId) {
+        try {
+            var request = new sn_ws.RESTMessageV2();
+            var config = this._getConfig(configId);
+            var accesscontrolbaseUrl = config.checkmarxone_server_url;
+            var apibaseurl = config.checkmarxone_api_base_url;
+            var method = "post";
+            var token = this.getAccessToken(accesscontrolbaseUrl, config, method, request);
+
+            var query = '/api/scan-summary/?scan-ids=' + scanId + '&include-severity-status=true&include-status-counters=true&include-queries=true&include-files=true&apply-predicates=true';
+            var resp = this._makeRestApiCall(apibaseurl, configId, token, query, "get");
+            var body = resp.getBody();
+            var ScanSummaryJson = JSON.parse(body);
+            var flaws = 0;
+            var vulnerabilityCountThresholdLevel = config.vulnerability_threshold_level;
+            for (var item in ScanSummaryJson.scansSummaries) {
+                for (var value in ScanSummaryJson.scansSummaries[item].sastCounters.severityCounters) {
+                    var severity = ScanSummaryJson.scansSummaries[item].sastCounters.severityCounters[value].severity;
+                    if ((vulnerabilityCountThresholdLevel == 'LOW') ||
+                        (severity.toUpperCase() == 'HIGH') ||
+                        (severity.toUpperCase() == vulnerabilityCountThresholdLevel)) {
+                        var counts = ScanSummaryJson.scansSummaries[item].sastCounters.severityCounters[value].counter;
+                        flaws += counts;
                     }
-				}
-                } catch (err) {
-                    gs.error(this.MSG + " getScanSummaryInfo: Error while getting the scan summary Ids." + err + scanId);
-                    return -1;
                 }
-                return flaws;
-
-            },
-            //To get remediation status for state mapping
-            getSASTRemediationStatus: function(status, state) {
-                    try {
-
-                        if (state == 'TO_VERIFY' || status == 'FIXED' || status == 'RESOLVED') {
-                            var remediation_status = status;
-                        } else {
-                            remediation_status = state;
-                        }
-                    } catch (err) {
-                        gs.error(this.MSG + " getRemediationStatus: Error while getting the status." + err);
+            }
+        } catch (err) {
+            gs.error(this.MSG + " getScanSummaryInfo: Error while getting the scan summary Ids." + err + scanId);
+            return -1;
+        }
+        return flaws;
+
+    },
+    //To get remediation status for state mapping
+    getSASTRemediationStatus: function(status, state) {
+        try {
+
+            if (state == 'TO_VERIFY' || status == 'FIXED' || status == 'RESOLVED') {
+                var remediation_status = status;
+            } else {
+                remediation_status = state;
+            }
+        } catch (err) {
+            gs.error(this.MSG + " getRemediationStatus: Error while getting the status." + err);
 
-                    }
-                    return remediation_status;
+        }
+        return remediation_status;
 
-                },
-                //To get remediation status for state mapping
-                getSCARemediationStatus: function(status, state) {
-                    try {
+    },
+    //To get remediation status for state mapping
+    getSCARemediationStatus: function(status, state) {
+        try {
 
-                        if (state == 'NOT_IGNORED' || status == 'FIXED' || status == 'RESOLVED') {
-                            var remediation_status = status;
-                        } else {
-                            remediation_status = state;
-                        }
-                    } catch (err) {
-                        gs.error(this.MSG + " getRemediationStatus: Error while getting the status." + err);
+            if (state == 'NOT_IGNORED' || status == 'FIXED' || status == 'RESOLVED') {
+                var remediation_status = status;
+            } else {
+                remediation_status = state;
+            }
+        } catch (err) {
+            gs.error(this.MSG + " getRemediationStatus: Error while getting the status." + err);
+
+        }
+        return remediation_status;
+
+    },
+
+    getFirstDetectionDate: function() {
+        try {
+            var configId = 'getconfig';
+            var config = this._getConfig(configId);
+            var include_first_found = config.include_first_detection_date;
+        } catch (err) {
+            gs.error(this.MSG + " getFirstDetectionDate: Error while getting the status of getFirstDetectionDate." + err);
+
+        }
+        return include_first_found;
+    },
+
+    _getConfig: function(configId) {
+        try {
+            var gr = new GlideRecord("x_chec3_chexone_checkmarxone_configuration");
+            gr.query();
+            gr.next();
+            var newconfig = {
+                "client_secret": gr.client_secret.getDecryptedValue(),
+                "client_id": gr.getValue("client_id"),
+                "tenant": gr.getValue("tenant"),
+                "checkmarxone_api_base_url": gr.getValue("checkmarxone_api_base_url"),
+                "checkmarxone_server_url": gr.getValue("checkmarxone_server_url"),
+                "limit": gr.getValue("limit"),
+                "include_first_detection_date": gr.getValue("include_first_detection_date") === "1",
+                "import_sca": gr.getValue("import_sca") === "1",
+                "import_sast": gr.getValue("import_sast") === "1",
+                "triaging_in_snow": gr.getValue("triaging_in_snow") === "1",
+                "access_token": gr.getValue("access_token"),
+                "vulnerability_threshold_level": gr.getValue("vulnerability_threshold_level"),
+            };
+        } catch (err) {
+            gs.error(this.MSG + " :_getConfig :Error in getting the configuration." + err);
+            throw err;
+        }
+        return newconfig;
+    },
+
+    getAccessToken: function(baseUrl, config, method, request) {
+        return this._getToken(baseUrl, config, method, request, config.client_id, config.client_secret, config.ast_client_id, config.tenant, config.access_token);
+    },
+
+    _getToken: function(baseUrl, config, method, request, username, password, ast_client_id, tenant, currentToken) {
+        try {
+            var accessToken = currentToken;
+            if (accessToken == null || accessToken == "" || this._isTokenExpired(this._getExpTimeFromAccessToken(accessToken)) || !this._checkClientId(username, accessToken)) {
+                var fullUrl = baseUrl + '/auth/realms/' + tenant + '/protocol/openid-connect/token';
+                var query = "client_id=" + username + "&grant_type=" + "client_credentials" + "&client_secret=" + password;
+                request.setEndpoint(fullUrl);
+                request.setHttpMethod(method);
+                request.setLogLevel('all');
+                request.setRequestBody(query);
+                request.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+                request.setRequestHeader("Accept", "application/json");
+                //Convert the object to string and set it to Request Body-
+                request.setRequestBody(query);
+                var response = this._checkResponseStatus(request);
+                var responseBody = response.getBody();
+                var tokenResponse = JSON.parse(responseBody);
+                accessToken = tokenResponse.access_token;
+                this.saveInstanceTokens(config, accessToken);
+            }
 
-                    }
-                    return remediation_status;
+        } catch (err) {
+            gs.error(this.MSG + " :_getToken : Error while getting the token." + err);
+            throw err;
+        }
+        return accessToken;
+    },
+
+    //Compare current clientId with accessToken's clientId
+    _checkClientId: function(clientId, accessToken) {
+        try {
+            var tokenPayload = accessToken.split(".")[1];
+            var tokenPayloadJson = JSON.parse(gs.base64Decode(tokenPayload));
+            var clientIdToken = tokenPayloadJson.azp;
+            if (clientId == clientIdToken)
+                return true;
+            return false;
+        } catch (err) {
+            gs.error(this.MSG + " :checkClientId :Error in checkClientId." + err);
+            throw err;
+        }
+
+    },
+    // Get expiry token from JWT access token
+    _getExpTimeFromAccessToken: function(accessToken) {
+        try {
+            var splittedStr = accessToken.split(".");
+            var decodedToken = JSON.parse(gs.base64Decode(splittedStr[1]));
+            var expTime = decodedToken.exp;
+        } catch (err) {
+            gs.error(this.MSG + " :getExpTimeFromAccessToken :Error in getExpTimeFromAccessToken.");
+            throw err;
+        }
+        return expTime;
+    },
+    // This method checks  if access token is expired or not.
+    _isTokenExpired: function(tokenExpTime) {
+        try {
+            var dateTime = new GlideDateTime();
+            var currentTime = dateTime.getNumericValue() / 1000;
+            currentTime = parseInt(currentTime);
+            if (currentTime > tokenExpTime)
+                return true;
+            else
+                return false;
+        } catch (err) {
+            gs.error(this.MSG + " :isTokenExpired :Error in isTokenExpired()." + err);
+            throw err;
+        }
+    },
+
+    _makeRestCall: function(apiurl, configId, token, apiPath, method, params) {
+        var request;
+        try {
+            request = this.setRequestParams(apiurl, configId, token, apiPath, method, params);
+        } catch (err) {
+            gs.error(this.MSG + " :_makeRestCall :Error in making the REST call");
+            throw err;
+        }
+        return this._checkResponseStatus(request);
+    },
+
+    setRequestParams: function(baseUrl, configId, token, apiPath, method, params) {
+        try {
+            var fullUrl = baseUrl + apiPath;
+            var r = new sn_ws.RESTMessageV2();
+            r.setEndpoint(fullUrl);
+            r.setHttpMethod(method);
+
+            if (params) {
+                fullUrl += '/?';
+                Object.keys(params).forEach(function(key) {
+                    r.setQueryParameter(key, params[key]);
+                    fullUrl += key + '=' + gs.urlEncode(params[key]) + '&';
+                });
+                fullUrl = fullUrl.slice(0, fullUrl.length - 1);
+            }
+            var newHeader = "Bearer " + token;
+            r.setRequestHeader('Authorization', newHeader);
+            r.setHttpTimeout(30000);
+            r.setLogLevel('all');
+        } catch (err) {
+            gs.error(this.MSG + " :setRequestParams :Error in setting the reuest params for REST API call");
+            throw err;
+        }
+        return r;
+    },
+
+    _checkResponseStatus: function(request) {
+        try {
+            var endpoint = request.getEndpoint();
+            var response = request.execute();
+            var status = response.getStatusCode();
+            if (status == 200 || status == 202)
+                return response;
+
+            if (status <= 0)
+                throw gs.getMessage("Request could not be completed: {0} Reason : {1}", [endpoint, response.getErrorMessage()]);
+            if (status == 400)
+                throw gs.getMessage("Bad request: {0} Reason : {1}", [endpoint, response.getErrorMessage()]);
+            if (status == 401)
+                throw gs.getMessage("Request not authorized: {0}", [endpoint, response.getErrorMessage()]);
+            if (status == 403)
+                throw gs.getMessage("Request forbidden: {0}", [endpoint, response.getErrorMessage()]);
+            if (status == 404)
+                throw gs.getMessage("Request not found: {0}", [endpoint, response.getErrorMessage()]);
+
+            throw gs.getMessage('Checkmarx responded with error code {0} on: {1}', [status, endpoint]);
+        } catch (err) {
+            gs.error(this.MSG + " :_checkResponseStatus :Error in checking the response of the API call.");
+            throw err;
+        }
+    },
+
+    _makeRestApiCall: function(baseUrl, configId, token, name, method, params) {
+        try {
+            var fullUrl = baseUrl + name;
+            var r = new sn_ws.RESTMessageV2();
+            r.setEndpoint(fullUrl);
+            r.setHttpMethod(method);
+
+            var newHeader = "Bearer " + token;
+            r.setRequestHeader("Accept", "application/json");
+            r.setRequestHeader("Authorization", newHeader);
+            r.setHttpTimeout(30000);
+            r.setLogLevel('all');
+        } catch (err) {
+            gs.error(this.MSG + " :_makeRestApiCall :Error in making API call.");
+            throw err;
+        }
+        return this._checkResponseStatus(r);
+    },
+     // 2022-12-08T09:33:00.028555Z to 2022-12-08 09:33:00
+    parseDate: function(str) {
+        var a = str.replace('T', ' ');
+        var b = a.replace('T', ' ');
+        var c = b.split('.')[0];
+        var date = new GlideDateTime(c);
+        return date;
+    },
+
+    //2022-12-08 09:33:00 to 2022-12-08T09:33:00.028555Z
+    parseTZDate: function(str) {
+        str1 = str.slice(0, str.length - 9) + 'T';
+        str2 = str.slice(-8) + '.028555Z';
+        if (str == "" || str == null) {
+            str3 = str;
+        } else {
+            str3 = str1 + str2;
+        }
+        return str3;
+
+    },
+    // Saves the access tokens to Service Now configuration DB
+    saveInstanceTokens: function(config, accessToken) {
+        try {
+            var gr = new GlideRecord("x_chec3_chexone_checkmarxone_configuration");
+            gr.query();
+            gr.next();
+            var instance = gr.getValue("integration_instance");
+            if (accessToken == 'undefined') {
+                tempAccessToken = gr.getValue("access_token"); //config.access_token;				
+            } else {
+                tempAccessToken = accessToken;
+            }
 
-                },
+            gr.setValue("access_token", tempAccessToken);
+            gr.update();
 
-                getFirstDetectionDate: function() {
-                    try {
-                        var configId = 'getconfig';
-                        var config = this._getConfig(configId);
-                        var include_first_found = config.include_first_detection_date;
-                    } catch (err) {
-                        gs.error(this.MSG + " getFirstDetectionDate: Error while getting the status of getFirstDetectionDate." + err);
+            var implConfig = new GlideRecord("sn_sec_int_impl_config");
+            implConfig.addQuery("implementation", instance);
+            implConfig.query();
+            while (implConfig.next()) {
 
-                    }
-                    return include_first_found;
-                },
-
-                _getConfig: function(configId) {
-                    try {
-                        var gr = new GlideRecord("x_chec3_chexone_checkmarxone_configuration");
-                        gr.query();
-                        gr.next();
-                        var newconfig = {
-                            "client_secret": gr.client_secret.getDecryptedValue(),
-                            "client_id": gr.getValue("client_id"),
-                            "tenant": gr.getValue("tenant"),
-                            "checkmarxone_api_base_url": gr.getValue("checkmarxone_api_base_url"),
-                            "checkmarxone_server_url": gr.getValue("checkmarxone_server_url"),
-                            "limit": gr.getValue("limit"),
-                            "include_first_detection_date": gr.getValue("include_first_detection_date") === "1",
-                            "import_sca": gr.getValue("import_sca") === "1",
-                            "import_sast": gr.getValue("import_sast") === "1",
-                            "triaging_in_snow": gr.getValue("triaging_in_snow") === "1",
-                            "access_token": gr.getValue("access_token"),
-                            "vulnerability_threshold_level": gr.getValue("vulnerability_threshold_level"),
-                        };
-                    } catch (err) {
-                        gs.error(this.MSG + " :_getConfig :Error in getting the configuration." + err);
-                        throw err;
-                    }
-                    return newconfig;
-                },
-
-                getAccessToken: function(baseUrl, config, method, request) {
-                    return this._getToken(baseUrl, config, method, request, config.client_id, config.client_secret, config.ast_client_id, config.tenant, config.access_token);
-                },
-
-                _getToken: function(baseUrl, config, method, request, username, password, ast_client_id, tenant, currentToken) {
-                    try {
-                        var accessToken = currentToken;
-                        if (accessToken == null || accessToken == "" || this._isTokenExpired(this._getExpTimeFromAccessToken(accessToken)) || !this._checkClientId(username, accessToken)) {
-                            var fullUrl = baseUrl + '/auth/realms/' + tenant + '/protocol/openid-connect/token';
-                            var query = "client_id=" + username + "&grant_type=" + "client_credentials" + "&client_secret=" + password;
-                            request.setEndpoint(fullUrl);
-                            request.setHttpMethod(method);
-                            request.setLogLevel('all');
-                            request.setRequestBody(query);
-                            request.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
-                            request.setRequestHeader("Accept", "application/json");
-                            //Convert the object to string and set it to Request Body-
-                            request.setRequestBody(query);
-                            var response = this._checkResponseStatus(request);
-                            var responseBody = response.getBody();
-                            var tokenResponse = JSON.parse(responseBody);
-                            accessToken = tokenResponse.access_token;
-                            this.saveInstanceTokens(config, accessToken);
-                        }
-
-                    } catch (err) {
-                        gs.error(this.MSG + " :_getToken : Error while getting the token." + err);
-                        throw err;
-                    }
-                    return accessToken;
-                },
-
-                //Compare current clientId with accessToken's clientId
-                _checkClientId: function(clientId, accessToken) {
-                    try {
-                        var tokenPayload = accessToken.split(".")[1];
-                        var tokenPayloadJson = JSON.parse(gs.base64Decode(tokenPayload));
-                        var clientIdToken = tokenPayloadJson.azp;
-                        if (clientId == clientIdToken)
-                            return true;
-                        return false;
-                    } catch (err) {
-                        gs.error(this.MSG + " :checkClientId :Error in checkClientId." + err);
-                        throw err;
-                    }
+                var configName = implConfig.getDisplayValue("configuration");
+                var configVal = gr.getValue(configName);
 
-                },
-                // Get expiry token from JWT access token
-                _getExpTimeFromAccessToken: function(accessToken) {
-                    try {
-                        var splittedStr = accessToken.split(".");
-                        var decodedToken = JSON.parse(gs.base64Decode(splittedStr[1]));
-                        var expTime = decodedToken.exp;
-                    } catch (err) {
-                        gs.error(this.MSG + " :getExpTimeFromAccessToken :Error in getExpTimeFromAccessToken.");
-                        throw err;
-                    }
-                    return expTime;
-                },
-                // This method checks  if access token is expired or not.
-                _isTokenExpired: function(tokenExpTime) {
-                    try {
-                        var dateTime = new GlideDateTime();
-                        var currentTime = dateTime.getNumericValue() / 1000;
-                        currentTime = parseInt(currentTime);
-                        if (currentTime > tokenExpTime)
-                            return true;
-                        else
-                            return false;
-                    } catch (err) {
-                        gs.error(this.MSG + " :isTokenExpired :Error in isTokenExpired()." + err);
-                        throw err;
-                    }
-                },
-
-                _makeRestCall: function(apiurl, configId, token, apiPath, method, params) {
-                    var request;
-                    try {
-                        request = this.setRequestParams(apiurl, configId, token, apiPath, method, params);
-                    } catch (err) {
-                        gs.error(this.MSG + " :_makeRestCall :Error in making the REST call");
-                        throw err;
-                    }
-                    return this._checkResponseStatus(request);
-                },
-
-                setRequestParams: function(baseUrl, configId, token, apiPath, method, params) {
-                    try {
-                        var fullUrl = baseUrl + apiPath;
-                        var r = new sn_ws.RESTMessageV2();
-                        r.setEndpoint(fullUrl);
-                        r.setHttpMethod(method);
-
-                        if (params) {
-                            fullUrl += '/?';
-                            Object.keys(params).forEach(function(key) {
-                                r.setQueryParameter(key, params[key]);
-                                fullUrl += key + '=' + gs.urlEncode(params[key]) + '&';
-                            });
-                            fullUrl = fullUrl.slice(0, fullUrl.length - 1);
-                        }
-                        var newHeader = "Bearer " + token;
-                        r.setRequestHeader('Authorization', newHeader);
-                        r.setHttpTimeout(30000);
-                        r.setLogLevel('all');
-                    } catch (err) {
-                        gs.error(this.MSG + " :setRequestParams :Error in setting the reuest params for REST API call");
-                        throw err;
-                    }
-                    return r;
-                },
-
-                _checkResponseStatus: function(request) {
-                    try {
-                        var endpoint = request.getEndpoint();
-                        var response = request.execute();
-                        var status = response.getStatusCode();
-                        if (status == 200 || status == 202)
-                            return response;
-
-                        if (status <= 0)
-                            throw gs.getMessage("Request could not be completed: {0} Reason : {1}", [endpoint, response.getErrorMessage()]);
-                        if (status == 400)
-                            throw gs.getMessage("Bad request: {0} Reason : {1}", [endpoint, response.getErrorMessage()]);
-                        if (status == 401)
-                            throw gs.getMessage("Request not authorized: {0}", [endpoint, response.getErrorMessage()]);
-                        if (status == 403)
-                            throw gs.getMessage("Request forbidden: {0}", [endpoint, response.getErrorMessage()]);
-                        if (status == 404)
-                            throw gs.getMessage("Request not found: {0}", [endpoint, response.getErrorMessage()]);
-
-                        throw gs.getMessage('Checkmarx responded with error code {0} on: {1}', [status, endpoint]);
-                    } catch (err) {
-                        gs.error(this.MSG + " :_checkResponseStatus :Error in checking the response of the API call.");
-                        throw err;
-                    }
-                },
-
-                _makeRestApiCall: function(baseUrl, configId, token, name, method, params) {
-                    try {
-                        var fullUrl = baseUrl + name;
-                        var r = new sn_ws.RESTMessageV2();
-                        r.setEndpoint(fullUrl);
-                        r.setHttpMethod(method);
-
-                        var newHeader = "Bearer " + token;
-                        r.setRequestHeader("Accept", "application/json");
-                        r.setRequestHeader("Authorization", newHeader);
-                        r.setHttpTimeout(30000);
-                        r.setLogLevel('all');
-                    } catch (err) {
-                        gs.error(this.MSG + " :_makeRestApiCall :Error in making API call.");
-                        throw err;
-                    }
-                    return this._checkResponseStatus(r);
-                },
-
-                parseDate: function(str) {
-                  var a = str.replace('T', ' ');
-                  var b = a.replace('T', ' ');
-                  var c = b.split('.')[0];
-                  var date = new GlideDateTime(c);
-                  return date;
-                 },
-
-                //2022-12-08 09:33:00 to 2022-12-08T09:33:00.028555Z
-                parseTZDate: function(str) {
-                    str1 = str.slice(0, str.length - 9) + 'T';
-                    str2 = str.slice(-8) + '.028555Z';
-                    if (str == "" || str == null) {
-                        str3 = str;
-                    } else {
-                        str3 = str1 + str2;
-                    }
-                    return str3;
-
-                },
-                // Saves the access tokens to Service Now configuration DB
-                saveInstanceTokens: function(config, accessToken) {
-                    try {
-                        var gr = new GlideRecord("x_chec3_chexone_checkmarxone_configuration");
-                        gr.query();
-                        gr.next();
-                        var instance = gr.getValue("integration_instance");
-                        if (accessToken == 'undefined') {
-                            tempAccessToken = gr.getValue("access_token"); //config.access_token;				
-                        } else {
-                            tempAccessToken = accessToken;
-                        }
-
-                        gr.setValue("access_token", tempAccessToken);
-                        gr.update();
-
-                        var implConfig = new GlideRecord("sn_sec_int_impl_config");
-                        implConfig.addQuery("implementation", instance);
-                        implConfig.query();
-                        while (implConfig.next()) {
-
-                            var configName = implConfig.getDisplayValue("configuration");
-                            var configVal = gr.getValue(configName);
-
-                            if (configName == 'access_token')
-                                configVal = tempAccessToken;
-                            if (implConfig.configuration.elem_type == "boolean")
-                                implConfig.setValue("value", configVal === "1");
-                            else
-                                implConfig.setValue("value", configVal);
-                            implConfig.update();
-                        }
-
-                        var newconfig = {
-                            "client_secret": gr.client_secret.getDecryptedValue(),
-                            "client_id": gr.getValue("client_id"),
-                            "ast_client_id": gr.getValue("ast_client_id"),
-                            "tenant": gr.getValue("tenant"),
-                            "checkmarxone_api_base_url": gr.getValue("checkmarxone_api_base_url"),
-                            "checkmarxone_server_url": gr.getValue("checkmarxone_server_url"),
-                            "include_first_detection_date": gr.getValue("include_first_detection_date") === "1",
-                            "import_sca": gr.getValue("import_dast") === "1",
-                            "import_sast": gr.getValue("import_sast") === "1",
-                            "triaging_in_snow": gr.getValue("triaging_in_snow") === "1",
-							"vulnerability_threshold_level": gr.getValue("vulnerability_threshold_level"),
-                        };
-                        new sn_sec_int.Implementation().setConfiguration(instance, newconfig);
-                        return true;
-                    } catch (err) {
-                        gs.error(this.MSG + " :saveInstanceTokens : Error while saving the access tokens to database.");
-                        throw err;
-                    }
-                },
-                //value of sca checkbox
-                importScaFlaw: function(configId) {
-                    return this._getConfig(configId).import_sca;
-                },
-                //value of sast checkbox
-                importSastFlaw: function(configId) {
-                    return this._getConfig(configId).import_sast;
-                },
-
-                //validate XML
-                validateXML: function(body, errorNodeName) {
-                    if (!body) return;
-                    var doc = new XMLDocument2();
-                    doc.parseXML(body);
-                    var err = null;
-                    try {
-                        var root = doc.getFirstNode('/' + doc.getDocumentElement().getNodeName());
-                        if (errorNodeName && root.getNodeName() == errorNodeName)
-                            err = root.getTextContent();
-                        else
-                            doc.getNextNode(root);
-                    } catch (e) {
-                        throw 'XML document syntax invalid';
-                    }
-                    if (err)
-                        throw this.MSG + 'Error: ' + err;
-                },
+                if (configName == 'access_token')
+                    configVal = tempAccessToken;
+                if (implConfig.configuration.elem_type == "boolean")
+                    implConfig.setValue("value", configVal === "1");
+                else
+                    implConfig.setValue("value", configVal);
+                implConfig.update();
+            }
 
-                type: 'CheckmarxOneUtilBase'
-        };]]></script>
+            var newconfig = {
+                "client_secret": gr.client_secret.getDecryptedValue(),
+                "client_id": gr.getValue("client_id"),
+                "ast_client_id": gr.getValue("ast_client_id"),
+                "tenant": gr.getValue("tenant"),
+                "checkmarxone_api_base_url": gr.getValue("checkmarxone_api_base_url"),
+                "checkmarxone_server_url": gr.getValue("checkmarxone_server_url"),
+                "include_first_detection_date": gr.getValue("include_first_detection_date") === "1",
+                "import_sca": gr.getValue("import_dast") === "1",
+                "import_sast": gr.getValue("import_sast") === "1",
+                "triaging_in_snow": gr.getValue("triaging_in_snow") === "1",
+                "vulnerability_threshold_level": gr.getValue("vulnerability_threshold_level"),
+            };
+            new sn_sec_int.Implementation().setConfiguration(instance, newconfig);
+            return true;
+        } catch (err) {
+            gs.error(this.MSG + " :saveInstanceTokens : Error while saving the access tokens to database.");
+            throw err;
+        }
+    },
+    //value of sca checkbox
+    importScaFlaw: function(configId) {
+        return this._getConfig(configId).import_sca;
+    },
+    //value of sast checkbox
+    importSastFlaw: function(configId) {
+        return this._getConfig(configId).import_sast;
+    },
+
+    //validate XML
+    validateXML: function(body, errorNodeName) {
+        if (!body) return;
+        var doc = new XMLDocument2();
+        doc.parseXML(body);
+        var err = null;
+        try {
+            var root = doc.getFirstNode('/' + doc.getDocumentElement().getNodeName());
+            if (errorNodeName && root.getNodeName() == errorNodeName)
+                err = root.getTextContent();
+            else
+                doc.getNextNode(root);
+        } catch (e) {
+            throw 'XML document syntax invalid';
+        }
+        if (err)
+            throw this.MSG + 'Error: ' + err;
+    },
+
+    type: 'CheckmarxOneUtilBase'
+};]]></script>
 <sys_class_name>sys_script_include</sys_class_name>
 <sys_created_by>admin</sys_created_by>
 <sys_created_on>2022-11-21 19:26:28</sys_created_on>
 <sys_id>1980bcb147935110328ca368436d435a</sys_id>
-<sys_mod_count>151</sys_mod_count>
+<sys_mod_count>152</sys_mod_count>
 <sys_name>CheckmarxOneUtilBase</sys_name>
 <sys_package display_value="Checkmarx One Vulnerability Integration" source="x_chec3_chexone">3d20e92d47471110328ca368436d436a</sys_package>
 <sys_policy/>
 <sys_scope display_value="Checkmarx One Vulnerability Integration">3d20e92d47471110328ca368436d436a</sys_scope>
 <sys_update_name>sys_script_include_1980bcb147935110328ca368436d435a</sys_update_name>
 <sys_updated_by>apoorva.singh@checkmarx.com</sys_updated_by>
-<sys_updated_on>2023-06-26 18:16:03</sys_updated_on>
+<sys_updated_on>2023-06-27 08:25:18</sys_updated_on>
 </sys_script_include>
 </unload>
diff --git a/Scripts/CheckmarxOneUtil_sys_script_include_afffecb147935110328ca368436d43ea.xml b/Scripts/CheckmarxOneUtil_sys_script_include_afffecb147935110328ca368436d43ea.xml
new file mode 100644
index 0000000..f4249d0
--- /dev/null
+++ b/Scripts/CheckmarxOneUtil_sys_script_include_afffecb147935110328ca368436d43ea.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<unload unload_date="2023-06-27 13:52:35">
+<sys_script_include action="INSERT_OR_UPDATE">
+<access>public</access>
+<active>true</active>
+<api_name>x_chec3_chexone.CheckmarxOneUtil</api_name>
+<caller_access/>
+<client_callable>false</client_callable>
+<description/>
+<name>CheckmarxOneUtil</name>
+<script><![CDATA[var CheckmarxOneUtil = Class.create();
+CheckmarxOneUtil.prototype = Object.extendsObject(x_chec3_chexone.CheckmarxOneUtilBase, {
+    type: 'CheckmarxOneUtil'
+});]]></script>
+<sys_class_name>sys_script_include</sys_class_name>
+<sys_created_by>admin</sys_created_by>
+<sys_created_on>2022-11-21 19:19:33</sys_created_on>
+<sys_id>afffecb147935110328ca368436d43ea</sys_id>
+<sys_mod_count>1</sys_mod_count>
+<sys_name>CheckmarxOneUtil</sys_name>
+<sys_package display_value="Checkmarx One Vulnerability Integration" source="x_chec3_chexone">3d20e92d47471110328ca368436d436a</sys_package>
+<sys_policy/>
+<sys_scope display_value="Checkmarx One Vulnerability Integration">3d20e92d47471110328ca368436d436a</sys_scope>
+<sys_update_name>sys_script_include_afffecb147935110328ca368436d43ea</sys_update_name>
+<sys_updated_by>admin</sys_updated_by>
+<sys_updated_on>2022-11-28 05:19:36</sys_updated_on>
+</sys_script_include>
+</unload>