diff --git a/client/src/App.vue b/client/src/App.vue index f697e5ca..5518376b 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -167,7 +167,7 @@ }) .catch(function(err){ ref.$toast.error("Failed to check AnsibleForms database schema"); - ref.errorMessage="Failed to check AnsibleForms database schema\n\n" + err + ref.errorMessage="Failed to check AnsibleForms database schema\n\n" + err.toString() ref.$router.replace({name:"Error"}).catch(err => {}); ref.isLoaded=true }); diff --git a/client/src/components/BulmaAdvancedSelect.vue b/client/src/components/BulmaAdvancedSelect.vue index 92220ca3..48086df0 100644 --- a/client/src/components/BulmaAdvancedSelect.vue +++ b/client/src/components/BulmaAdvancedSelect.vue @@ -205,7 +205,7 @@ export default { try{ if(typeof this.values[0]=="object") valueLength=Object.keys(this.values[0]).length - }catch(e){ + }catch(err){ // } var columnsCount=this.columns?.length || valueLength diff --git a/client/src/components/BulmaAdvancedSelect2.vue b/client/src/components/BulmaAdvancedSelect2.vue index 094c0040..a76ac98b 100644 --- a/client/src/components/BulmaAdvancedSelect2.vue +++ b/client/src/components/BulmaAdvancedSelect2.vue @@ -161,7 +161,7 @@ export default { if(typeof obj == "object"){ defaulttype="object" } - }catch(e){ + }catch(err){ obj=undefined } if(typeof this.defaultValue == "object"){ diff --git a/client/src/components/BulmaAdvancedTable.vue b/client/src/components/BulmaAdvancedTable.vue index 01b40ea2..b91887eb 100644 --- a/client/src/components/BulmaAdvancedTable.vue +++ b/client/src/components/BulmaAdvancedTable.vue @@ -337,7 +337,7 @@ if(typeof obj == "object"){ defaulttype="object" } - }catch(e){ + }catch(err){ obj=undefined } if(typeof this.defaultValue == "object"){ @@ -354,8 +354,8 @@ if(this.objectEqual(obj,item)){ ref.select(i) } - }catch(e){ - console.log("Bad defaultvalue : " + e) + }catch(err){ + console.log("Bad defaultvalue : " + err.toString()) } }) } diff --git a/client/src/components/Form.vue b/client/src/components/Form.vue index 43f12eb0..6730ca36 100644 --- a/client/src/components/Form.vue +++ b/client/src/components/Form.vue @@ -808,8 +808,8 @@ Copy(JSON.stringify(v)) } this.$toast.success("Copied to clipboard") - }catch(e){ - this.$toast.error("Error copying to clipboard : \n" + e) + }catch(err){ + this.$toast.error("Error copying to clipboard : \n" + err.toString()) } }, // creates a list of fields per group @@ -983,8 +983,8 @@ try{ r=Helpers.evalSandbox(_value) return r - }catch(e){ - console.log(`Error evaluating default value : ${e}`) + }catch(err){ + console.log(`Error evaluating default value : ${err.toString()}`) } }else{ return _value @@ -1020,10 +1020,10 @@ // set default value Vue.set(this.form,fieldname,this.defaults[fieldname]) - }catch(e){ + }catch(err){ // this error should not hit, unless we have a bug - console.log("Error: " + e) - throw e + console.log("Error: " + err.toString()) + throw err } }, // set dynamic field status, only for expressions,query and table @@ -1444,7 +1444,7 @@ Vue.delete(ref.queryerrors, item.name); }catch(err){ // console.log("Local eval failed : " + err) - Vue.set(ref.queryerrors, item.name,err); + Vue.set(ref.queryerrors, item.name,err.toString()); try{ ref.setFieldToDefault(item.name) }catch(err){ @@ -1781,10 +1781,10 @@ } }) .catch(function(err){ - console.log("error getting job " + err) + console.log("error getting job " + err.toString()) ref.$toast.error("Failed to get job"); if(err.response.status!=401){ - ref.jobResult.message="Error in axios call to get job\n\n" + err + ref.jobResult.message="Error in axios call to get job\n\n" + err.toString() ref.jobResult.status="error"; } }) @@ -1945,19 +1945,19 @@ } if(result.status=="error"){ ref.$toast.error(result.data.error); - throw(new Error(result.data.error)) + throw new Error(result.data.error) } } catch (e) { console.log(e) - throw(new Error("Failed uploading files")) + throw new Error("Failed uploading files") } }); await Promise.all(uploadPromises); // ref.$toast.info(`All files uploaded`); - }catch(e){ - ref.$toast.error(e.message); + }catch(err){ + ref.$toast.error(err.toString()); ref.resetResult() // stop, don't execute job throw new Error("Failed uploading files"); @@ -2047,7 +2047,7 @@ try{ var queryObject=JSON.parse(atob(ref.$route.query.base64values)) // Vue.set(ref,"form",queryObject) - }catch(e){ + }catch(err){ ref.$toast.error("Couldn't parse your querystring") } for (const [key, value] of Object.entries(queryObject)) { @@ -2090,7 +2090,7 @@ if(item.type=="number"){ try{ queryValue=parseInt(queryValue) - }catch(e){ + }catch(err){ queryValue=0 } } @@ -2192,7 +2192,7 @@ ref.startDynamicFieldsLoop() }) .catch(function(err){ - ref.$toast.error("Failed to pull from git " + err) + ref.$toast.error("Failed to pull from git " + err.toString()) ref.pretasksFinished=true // start dynamic field loop (= infinite) ref.startDynamicFieldsLoop() diff --git a/client/src/lib/Form.js b/client/src/lib/Form.js index 46157173..99fe9fa2 100644 --- a/client/src/lib/Form.js +++ b/client/src/lib/Form.js @@ -14,7 +14,7 @@ var Form = { }) .catch(function(err){ if(err.response && err.response.status!=401){ - error("Could not get forms.yaml file\n\n" + err) + error("Could not get forms.yaml file\n\n" + err.toString()) } if(err.response && err.response.status==401){ error(err) @@ -36,7 +36,7 @@ var Form = { }) .catch(function(err){ if(err.response && err.response.status!=401){ - error("Could not get backups\n\n" + err) + error("Could not get backups\n\n" + err.toString()) } if(err.response && err.response.status==401){ error(err) @@ -57,7 +57,7 @@ var Form = { }) .catch(function(err){ if(err.response && err.response.status!=401){ - error("Could not restore\n\n" + err) + error("Could not restore\n\n" + err.toString()) } if(err.response && err.response.status==401){ error(err) diff --git a/client/src/views/Awx.vue b/client/src/views/Awx.vue index cd1ef2bd..077c5b71 100644 --- a/client/src/views/Awx.vue +++ b/client/src/views/Awx.vue @@ -72,8 +72,8 @@ axios.get('/api/v1/awx/',TokenStorage.getAuthentication()) .then((result)=>{ ref.awx=result.data.data.output; - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; },updateAwx(){ var ref= this; @@ -86,8 +86,8 @@ ref.$toast.success("Awx is updated"); ref.loadAwx(); } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }else{ this.$toast.warning("Invalid form data") @@ -102,8 +102,8 @@ }else{ ref.$toast.success(result.data.message); } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; } }, diff --git a/client/src/views/AzureAd.vue b/client/src/views/AzureAd.vue index 45c32216..d9a77063 100644 --- a/client/src/views/AzureAd.vue +++ b/client/src/views/AzureAd.vue @@ -85,8 +85,8 @@ axios.get('/api/v1/settings/',TokenStorage.getAuthentication()) .then((result)=>{ ref.settings=result.data.data.output; - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }, loadAzureAd(){ @@ -94,8 +94,8 @@ axios.get('/api/v1/azuread/',TokenStorage.getAuthentication()) .then((result)=>{ ref.azuread=result.data.data.output; - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; },updateAzureAd(){ var ref= this; @@ -108,8 +108,8 @@ ref.$toast.success("AzureAd is updated"); ref.loadAzureAd(); } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }else{ this.$toast.warning("Invalid form data") @@ -124,8 +124,8 @@ }else{ ref.$toast.success(result.data.message); } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; } }, diff --git a/client/src/views/Credentials.vue b/client/src/views/Credentials.vue index 6d0186af..00e6fd9b 100644 --- a/client/src/views/Credentials.vue +++ b/client/src/views/Credentials.vue @@ -17,7 +17,7 @@
{ ref.credentialList=result.data.data.output; - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }, selectItem(value){ @@ -132,8 +132,8 @@ }else{ ref.$toast.error(result.data.message + "\r\n" + result.data.data.error) } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; } }, @@ -145,8 +145,8 @@ .then((result)=>{ console.log("loaded credential item"); ref.credential=result.data.data.output - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }else{ console.log("No item selected") @@ -166,8 +166,8 @@ ref.credentialItem=undefined; ref.loadAll(); } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; },updateCredential(){ var ref= this; @@ -180,8 +180,8 @@ ref.$toast.success("Credential is updated"); ref.loadAll(); } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }else{ this.$toast.warning("Invalid form data") @@ -198,8 +198,8 @@ ref.$toast.success("Created credential with new id " + result.data.data.output); ref.loadAll(); } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; } },showAlert(type,message){ diff --git a/client/src/views/Designer.vue b/client/src/views/Designer.vue index 939aed9b..dcfa9e4a 100644 --- a/client/src/views/Designer.vue +++ b/client/src/views/Designer.vue @@ -354,7 +354,7 @@ if(result.name){ return result }else { - throw "parsing issue" + throw new Error("parsing issue") } }catch{ return {name:x,source:"Parsing issues"} @@ -368,7 +368,7 @@ if(Array.isArray(result) && result.length>0 && result[0].name && result[0].icon){ return result }else { - throw "parsing issue" + throw new Error("parsing issue") } }catch{ return undefined @@ -384,7 +384,7 @@ if(Array.isArray(result) && result.length>0 && result[0].name && result[0].groups){ return result }else { - throw "parsing issue" + throw new Error("parsing issue") } }catch{ return undefined @@ -423,10 +423,10 @@ if(tmp && tmp.name){ return { id:x,source:tmp.source,name:tmp.name} }else { - throw "A form must have a few basic properties, like 'name'" + throw new Error("A form must have a few basic properties, like 'name'") } - }catch(e){ - return { id:x,source:"Parsing issues",name:x,issue:e} + }catch(err){ + return { id:x,source:"Parsing issues",name:x,issue:err.toString()} } }) @@ -547,7 +547,7 @@ } ref.loaded=true },function(err){ - ref.$toast.error(err) + ref.$toast.error(err.toString()) }) }, loadBackups(){ @@ -556,7 +556,7 @@ ref.backups=backups ref.loaded=true },function(err){ - ref.$toast.error(err) + ref.$toast.error(err.toString()) }) }, restore(){ @@ -568,7 +568,7 @@ ref.loadForms() ref.loadBackups() },function(err){ - ref.$toast.error(err) + ref.$toast.error(err.toString()) }) }, validate() { @@ -580,8 +580,8 @@ }else{ ref.$toast.success(result.data.message); } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }, getLock(){ @@ -597,8 +597,8 @@ }else{ ref.lock=result.data.data.output } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); ref.lock=undefined }; }, @@ -612,8 +612,8 @@ }else{ ref.loadAll() } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); ref.lock=undefined }; }, @@ -641,8 +641,8 @@ // ref.$toast.success(result.data.message); ref.loadAll() } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }, loadAll(){ @@ -668,8 +668,8 @@ ref.loadBackups() } } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }else{ if(ref.warnings.length>0 || !ref.formConfig){ diff --git a/client/src/views/Form.vue b/client/src/views/Form.vue index bdf302ec..0419248e 100644 --- a/client/src/views/Form.vue +++ b/client/src/views/Form.vue @@ -37,7 +37,7 @@ ref.formConfig=formConfig ref.componentKey++; },function(err){ - ref.$toast.error(err) + ref.$toast.error(err.toString()) if(ref.$route.name!="Login"){ ref.$router.replace({name:"Error"}).catch(err => {}); } diff --git a/client/src/views/Forms.vue b/client/src/views/Forms.vue index bfaf3853..0d6d6a82 100644 --- a/client/src/views/Forms.vue +++ b/client/src/views/Forms.vue @@ -40,7 +40,7 @@ Form.load(function(formConfig){ ref.formConfig=formConfig },function(err){ - ref.$toast.error(err) + ref.$toast.error(err.toString()) if(ref.$route.name!="Login"){ ref.$router.replace({name:"Error"}).catch(err => {}); } diff --git a/client/src/views/Groups.vue b/client/src/views/Groups.vue index 81f86f85..6832d793 100644 --- a/client/src/views/Groups.vue +++ b/client/src/views/Groups.vue @@ -126,8 +126,8 @@ axios.get('/api/v1/group/',TokenStorage.getAuthentication()) .then((result)=>{ ref.groupList=result.data.data.output; - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }, loadUserList(){ @@ -136,8 +136,8 @@ axios.get('/api/v1/user/',TokenStorage.getAuthentication()) .then((result)=>{ ref.userList=result.data.data.output; - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }, loadGroup(){ @@ -148,8 +148,8 @@ .then((result)=>{ console.log("loaded group item"); ref.group=result.data.data.output - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }else{ console.log("No item selected") @@ -169,8 +169,8 @@ ref.groupItem=undefined; ref.loadAll(); } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }, newGroup(){ @@ -185,8 +185,8 @@ ref.$toast.success("Created group with new id " + result.data.data.output); ref.loadAll(); } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; } }, diff --git a/client/src/views/Jobs.vue b/client/src/views/Jobs.vue index 88eb0abb..8edf62bd 100644 --- a/client/src/views/Jobs.vue +++ b/client/src/views/Jobs.vue @@ -231,8 +231,8 @@ try{ Copy(v) this.$toast.success("Copied to clipboard") - }catch(e){ - this.$toast.error("Error copying to clipboard : \n" + e) + }catch(err){ + this.$toast.error("Error copying to clipboard : \n" + err.toString()) } }, approvalAllowed(job){ @@ -310,7 +310,7 @@ }) .catch(function(err){ if(err.response && err.response.status!=401){ - ref.errorMessage="Could not get jobs\n\n" + err + ref.errorMessage="Could not get jobs\n\n" + err.toString() }else{ //ref.$toast.error("Failed to load jobs") } @@ -334,7 +334,7 @@ ref.$emit('refreshApprovals') }) .catch(function(err){ - console.error(`Error loading job ${item.id} : ${err}`) + console.error(`Error loading job ${item.id} : ${err.toString()}`) }) }); }, @@ -367,7 +367,7 @@ } }) .catch(function(err){ - console.log("error getting job " + err) + console.log("error getting job " + err.toString()) //ref.$toast.error("Failed to get job output"); }) }, @@ -407,7 +407,7 @@ } }) .catch(function(err){ - console.log("error getting job " + err) + console.log("error getting job " + err.toString()) ref.$toast.error("Failed to get job output"); }) @@ -435,7 +435,7 @@ // the last piece we assign the value to try{ outputValue=master[obj] - }catch(e){ + }catch(err){ outputValue="/bad placeholder/" } @@ -466,7 +466,7 @@ ref.$emit('refreshApprovals') }) .catch(function(err){ - console.log("error deleting job " + err) + console.log("error deleting job " + err.toString()) ref.$toast.error("Failed to delete job"); }) }, @@ -485,7 +485,7 @@ } }) .catch(function(err){ - console.log("error aborting job " + err) + console.log("error aborting job " + err.toString()) ref.$toast.error("Failed to abort job"); }) }, @@ -505,7 +505,7 @@ ref.$emit('refreshApprovals') }) .catch(function(err){ - console.log("error relaunching job " + err) + console.log("error relaunching job " + err.toString()) ref.$toast.error("Failed to relaunch job"); }) }, @@ -526,7 +526,7 @@ } }) .catch(function(err){ - console.log("error approving job " + err) + console.log("error approving job " + err.toString()) ref.$toast.error("Failed to approve job"); }) }, @@ -547,7 +547,7 @@ } }) .catch(function(err){ - console.log("error rejecting job " + err) + console.log("error rejecting job " + err.toString()) ref.$toast.error("Failed to reject job"); }) } diff --git a/client/src/views/KnownHosts.vue b/client/src/views/KnownHosts.vue index 026a4139..af5a8914 100644 --- a/client/src/views/KnownHosts.vue +++ b/client/src/views/KnownHosts.vue @@ -96,8 +96,8 @@ }else{ ref.knownHostsList=result.data.data.output; } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }, reset(){ @@ -123,8 +123,8 @@ ref.knownhostsItem=undefined; ref.loadAll(); } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }, addHost(){ @@ -142,9 +142,9 @@ ref.$toast.success("Added host"); ref.loadAll(); } - }),function(error){ + }),function(err){ ref.loading=false - ref.$toast.error(error.message); + ref.$toast.error(err.toString()); }; } }, diff --git a/client/src/views/Ldap.vue b/client/src/views/Ldap.vue index 842d9a39..b5bb8746 100644 --- a/client/src/views/Ldap.vue +++ b/client/src/views/Ldap.vue @@ -81,8 +81,8 @@ axios.get('/api/v1/ldap/',TokenStorage.getAuthentication()) .then((result)=>{ ref.ldap=result.data.data.output; - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; },updateLdap(){ var ref= this; @@ -95,8 +95,8 @@ ref.$toast.success("Ldap is updated"); ref.loadLdap(); } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }else{ this.$toast.warning("Invalid form data") @@ -111,8 +111,8 @@ }else{ ref.$toast.success(result.data.message); } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; } }, diff --git a/client/src/views/MailSettings.vue b/client/src/views/MailSettings.vue index 271d4b96..1d4cf545 100644 --- a/client/src/views/MailSettings.vue +++ b/client/src/views/MailSettings.vue @@ -82,8 +82,8 @@ axios.get('/api/v1/settings/',TokenStorage.getAuthentication()) .then((result)=>{ ref.settings=result.data.data.output; - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; },updateSettings(){ var ref= this; @@ -96,8 +96,8 @@ ref.$toast.success("Settings are updated"); ref.loadSettings(); } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }else{ this.$toast.warning("Invalid form data") @@ -113,8 +113,8 @@ }else{ ref.$toast.success(result.data.message); } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }else{ this.$toast.warning("Invalid form data") diff --git a/client/src/views/Profile.vue b/client/src/views/Profile.vue index 07967c46..6ae4e689 100644 --- a/client/src/views/Profile.vue +++ b/client/src/views/Profile.vue @@ -56,8 +56,8 @@ ref.$toast.success("Password is changed"); ref.$router.push({name:"Home"}).catch(err => {}); } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }else{ this.$toast.warning("Invalid form data") diff --git a/client/src/views/ReferenceGuide.vue b/client/src/views/ReferenceGuide.vue index d3cceb51..baaa6fbd 100644 --- a/client/src/views/ReferenceGuide.vue +++ b/client/src/views/ReferenceGuide.vue @@ -315,8 +315,8 @@ ref.help=result.data.data.output } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); ref.help=undefined }; }, diff --git a/client/src/views/Repos.vue b/client/src/views/Repos.vue index 35760c32..f462e238 100644 --- a/client/src/views/Repos.vue +++ b/client/src/views/Repos.vue @@ -103,8 +103,8 @@ }else{ ref.repoList=result.data.data.output; } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }, reset(){ @@ -136,8 +136,8 @@ ref.repoStatus=result.data.data.output } ref.loading=false - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); ref.loading=false }; }else{ @@ -156,8 +156,8 @@ ref.repoItem=undefined; ref.loadAll(); } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; },newRepo(){ var ref= this; @@ -173,9 +173,9 @@ ref.$toast.success("Created repository"); ref.loadAll(); } - }),function(error){ + }),function(err){ ref.loading=false - ref.$toast.error(error.message); + ref.$toast.error(err.toString()); }; } } diff --git a/client/src/views/Settings.vue b/client/src/views/Settings.vue index 218e40ac..b28bd7fa 100644 --- a/client/src/views/Settings.vue +++ b/client/src/views/Settings.vue @@ -72,14 +72,14 @@ axios.get('/api/v1/settings/',TokenStorage.getAuthentication()) .then((result)=>{ ref.settings=result.data.data.output; - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; axios.get('/api/v1/config/env',TokenStorage.getAuthentication()) .then((result)=>{ ref.env=result.data.data.output; - }),function(error){ - ref.$toast.error(error.message) + }),function(err){ + ref.$toast.error(err.toString()) } },updateSettings(){ var ref= this; @@ -92,8 +92,8 @@ ref.$toast.success("Settings are updated"); ref.loadSettings(); } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }else{ this.$toast.warning("Invalid form data") diff --git a/client/src/views/Sshkey.vue b/client/src/views/Sshkey.vue index 5ad7bb45..2889c0c7 100644 --- a/client/src/views/Sshkey.vue +++ b/client/src/views/Sshkey.vue @@ -63,8 +63,8 @@ Copy(JSON.stringify(v)) } this.$toast.success("Copied to clipboard") - }catch(e){ - this.$toast.error("Error copying to clipboard : \n" + e) + }catch(err){ + this.$toast.error("Error copying to clipboard : \n" + err.toString()) } }, loadSsh(){ @@ -72,8 +72,8 @@ axios.get('/api/v1/sshkey/',TokenStorage.getAuthentication()) .then((result)=>{ ref.ssh=result.data.data.output; - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; },updateSsh(){ var ref= this; @@ -88,8 +88,8 @@ ref.update=false; ref.loadSsh(); } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }else{ this.$toast.warning("Invalid form data") diff --git a/client/src/views/Users.vue b/client/src/views/Users.vue index 47e60165..2f8bcc3d 100644 --- a/client/src/views/Users.vue +++ b/client/src/views/Users.vue @@ -111,8 +111,8 @@ axios.get('/api/v1/user/',TokenStorage.getAuthentication()) .then((result)=>{ ref.userList=result.data.data.output; - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }, selectItem(value){ @@ -137,8 +137,8 @@ axios.get('/api/v1/group/',TokenStorage.getAuthentication()) .then((result)=>{ ref.groupList=result.data.data.output; - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; } ,groupName(id){ @@ -166,8 +166,8 @@ console.log("loaded user item"); ref.user=result.data.data.output ref.user.password="" - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }else{ this.resetUser() @@ -183,8 +183,8 @@ ref.userItem=undefined; ref.loadAll(); } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; },updateUser(changePassword=false){ var ref= this; @@ -204,8 +204,8 @@ } ref.loadAll(); } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; }else{ this.$toast.warning("Invalid form data") @@ -222,8 +222,8 @@ ref.$toast.success("Created user with new id " + result.data.data.output); ref.loadAll(); } - }),function(error){ - ref.$toast.error(error.message); + }),function(err){ + ref.$toast.error(err.toString()); }; } } diff --git a/server/config/db.config.js b/server/config/db.config.js index ff60d2b2..a8b9e5e6 100644 --- a/server/config/db.config.js +++ b/server/config/db.config.js @@ -13,7 +13,7 @@ if(!process.env["DB_PASSWORD"]){ } if(!(process.env["DB_HOST"] && process.env["DB_PORT"] && process.env["DB_USER"] && process.env["DB_PASSWORD"])){ logger.error("DB_PASSWORD = *******") - throw "You must set the database environment variables (DB_HOST, DB_PORT, DB_USER, DB_PASSWORD)" + throw new Error("You must set the database environment variables (DB_HOST, DB_PORT, DB_USER, DB_PASSWORD)") } var db_config = { name: "ANSIBLEFORMS_DATABASE", diff --git a/server/config/https.config.js b/server/config/https.config.js index 39ebfcf4..bd3a8ebb 100644 --- a/server/config/https.config.js +++ b/server/config/https.config.js @@ -8,8 +8,8 @@ if(process.env.HTTPS=="1"){ privatekey = fs.readFileSync(process.env.HTTPS_KEY || (__dirname + '/../persistent/certificates/key.pem')) certificate = fs.readFileSync(process.env.HTTPS_CERT || (__dirname + '/../persistent/certificates/cert.pem')) }catch(err){ - logger.error("Failed to open https private key and certificate : " + err) - throw "Failed to open https private key and certificate : " + err + logger.error("Failed to open https private key and certificate : ",err) + throw new Error("Failed to open https private key and certificate : " + err.message) } } diff --git a/server/config/log.config.js b/server/config/log.config.js index 2815bf30..fba1081d 100644 --- a/server/config/log.config.js +++ b/server/config/log.config.js @@ -21,7 +21,7 @@ if ( !fs.existsSync( log_config.path ) ) { // Create the directory if it does not exist fs.mkdirSync( log_config.path ); }catch(err){ - throw "Failed to create the path for the log files" + throw new Error("Failed to create the path for the log files") } } diff --git a/server/src/auth/auth_basic.js b/server/src/auth/auth_basic.js index 4effe08c..9281c426 100644 --- a/server/src/auth/auth_basic.js +++ b/server/src/auth/auth_basic.js @@ -48,7 +48,7 @@ passport.use( user.type = 'ldap' user.groups = User.getGroups(user,result) user.roles = User.getRoles(user.groups,user) - logger.info("ldap login is ok => " + user.username) + logger.info("ldap login for " + user.username) return user }) .catch((err)=>{ @@ -57,11 +57,11 @@ passport.use( try{ var errMessage=authConfig.ldapErrors[match[1]] }catch(e){ - throw "Error " + match[1] + throw new Error("Error " + match[1]) } - throw errMessage + throw new Error(errMessage) } - throw err + throw new Error(err) }) // we have an authenticated user return done(null,user) diff --git a/server/src/controllers/awx.controller.js b/server/src/controllers/awx.controller.js index 5b0c2871..bea69c05 100644 --- a/server/src/controllers/awx.controller.js +++ b/server/src/controllers/awx.controller.js @@ -11,7 +11,7 @@ exports.check = function(req, res) { exports.find = function(req, res) { Awx.find() .then((awx)=>{ res.json(new RestResult("success","Awx found",awx,"")); }) - .catch((err)=>{ res.json(new RestResult("error","Failed to find awx",null,err)) }) + .catch((err)=>{ res.json(new RestResult("error","Failed to find awx",null,err.toString())) }) }; exports.update = function(req, res) { if(req.body.constructor === Object && Object.keys(req.body).length === 0){ @@ -19,6 +19,6 @@ exports.update = function(req, res) { }else{ Awx.update(new Awx(req.body)) .then(()=>{ res.json(new RestResult("success","Awx updated",null,"")); }) - .catch((err)=>{ res.json(new RestResult("error","Failed to update awx",null,err)) }) + .catch((err)=>{ res.json(new RestResult("error","Failed to update awx",null,err.toString())) }) } }; diff --git a/server/src/controllers/azuread.controller.js b/server/src/controllers/azuread.controller.js index fa7e7d09..e7a1b80f 100644 --- a/server/src/controllers/azuread.controller.js +++ b/server/src/controllers/azuread.controller.js @@ -7,12 +7,12 @@ const logger = require('../lib/logger'); exports.find = function(req, res) { AzureAd.find() .then((azuread)=>{ res.json(new RestResult("success","AzureAd found",azuread,"")); }) - .catch((err) => { res.json(new RestResult("error","Failed to find azuread",null,err)) }) + .catch((err) => { res.json(new RestResult("error","Failed to find azuread",null,err.toString())) }) }; exports.check = function(req, res) { AzureAd.check(new AzureAd(req.body)) .then(()=>{ res.json(new RestResult("success","AzureAd connection ok")) }) - .catch((err) => { res.json(new RestResult("error","AzureAd check failed",null,err)) }) + .catch((err) => { res.json(new RestResult("error","AzureAd check failed",null,err.toString())) }) }; exports.update = function(req, res) { if(req.body.constructor === Object && Object.keys(req.body).length === 0){ @@ -23,6 +23,6 @@ exports.update = function(req, res) { azureConfig.initialize() res.json(new RestResult("success","AzureAd updated",null,"")); }) - .catch((err) => { res.json(new RestResult("error","Failed to update azuread",null,err)) }) + .catch((err) => { res.json(new RestResult("error","Failed to update azuread",null,err.toString())) }) } }; diff --git a/server/src/controllers/config.controller.js b/server/src/controllers/config.controller.js index 699aa869..39c80964 100644 --- a/server/src/controllers/config.controller.js +++ b/server/src/controllers/config.controller.js @@ -65,9 +65,9 @@ exports.restore = async function(req,res){ if(lock.free){ lock.set(user).catch(()=>{}) // set lock and fail silent } - }catch(e){ - logger.error("Failed to get lock:" + e) - res.json(new RestResult("error","Failed to restore forms",null,"Failed to get lock : "+e)) + }catch(err){ + logger.error("Failed to get lock : ",err) + res.json(new RestResult("error","Failed to restore forms",null,"Failed to get lock : " + err.toString())) return true } if(lock.match || lock.free){ @@ -85,7 +85,7 @@ exports.restore = async function(req,res){ res.json(new RestResult("error",`Failed to restore, no backup name provided`,null,"Failed to restore forms")) } }catch(err){ - res.json(new RestResult("error","Failed to restore forms",null,err)) + res.json(new RestResult("error","Failed to restore forms",null,err.toString())) } }else{ res.json(new RestResult("error","Failed to restore forms",null,"Designer is locked by "+lock.username)) @@ -99,9 +99,9 @@ exports.save = async function(req,res){ if(lock.free){ lock.set(user).catch(()=>{}) // set lock and fail silent } - }catch(e){ - logger.error("Failed to get lock:" + e) - res.json(new RestResult("error","Failed to save forms",null,"Failed to get lock : "+e)) + }catch(err){ + logger.error("Failed to get lock : ",err) + res.json(new RestResult("error","Failed to save forms",null,"Failed to get lock : " + err.toString())) return true } if(lock.match || lock.free){ @@ -118,7 +118,7 @@ exports.save = async function(req,res){ res.json(new RestResult("error","Failed to save forms",null,"Failed to save forms")) } }catch(err){ - res.json(new RestResult("error","Failed to save forms",null,err)) + res.json(new RestResult("error","Failed to save forms",null,err.toString())) } } }else{ @@ -143,7 +143,7 @@ exports.validate = function(req,res){ res.json(new RestResult("error","Failed to validate new forms config",null,"Failed to validate new forms config")) } }catch(err){ - res.json(new RestResult("error","Failed to validate new forms config",null,err)) + res.json(new RestResult("error","Failed to validate new forms config",null,err.toString())) } } } diff --git a/server/src/controllers/credential.controller.js b/server/src/controllers/credential.controller.js index c22e4bc4..e8aa4238 100644 --- a/server/src/controllers/credential.controller.js +++ b/server/src/controllers/credential.controller.js @@ -9,11 +9,11 @@ exports.find = function(req, res) { if(req.query.name){ Credential.findByName2(req.query.name) .then((credential)=>{res.json(new RestResult("success","credentials found",credential,""))}) - .catch((err)=>{res.json(new RestResult("error","failed to find credentials",null,err))}) + .catch((err)=>{res.json(new RestResult("error","failed to find credentials",null,err.toString()))}) }else{ Credential.findAll() .then((credentials)=>{res.json(new RestResult("success","credentials found",credentials,""))}) - .catch((err)=>{res.json(new RestResult("error","failed to find credentials",null,err))}) + .catch((err)=>{res.json(new RestResult("error","failed to find credentials",null,err.toString()))}) } }; exports.create = function(req, res) { @@ -24,7 +24,7 @@ exports.create = function(req, res) { }else{ Credential.create(new_credential) .then((credential)=>{ res.json(new RestResult("success","credential added",credential,"")) }) - .catch((err)=>{ res.json(new RestResult("error","failed to create credential",null,err.message)) }) + .catch((err)=>{ res.json(new RestResult("error","failed to create credential",null,err.toString())) }) } }; exports.findById = function(req, res) { @@ -33,10 +33,10 @@ exports.findById = function(req, res) { if(credential.length>0){ res.json(new RestResult("success","found credential",credential[0],"")); }else{ - res.json(new RestResult("error","failed to find credential",null,err)) + res.json(new RestResult("error","failed to find credential",null,err.toString())) } }) - .catch((err)=>{res.json(new RestResult("error","failed to find credential",null,err))}) + .catch((err)=>{ res.json(new RestResult("error","failed to find credential",null,err.toString())) }) }; exports.update = function(req, res) { if(req.body.constructor === Object && Object.keys(req.body).length === 0){ @@ -44,13 +44,13 @@ exports.update = function(req, res) { }else{ Credential.update(new Credential(req.body),req.params.id) .then((credential)=>{res.json(new RestResult("success","credential updated",null,""))}) - .catch((err)=>{res.json(new RestResult("error","failed to update credential",null,err))}) + .catch((err)=>{ res.json(new RestResult("error","failed to update credential",null,err.toString())) }) } }; exports.delete = function(req, res) { Credential.delete(req.params.id) .then(()=>{res.json(new RestResult("success","credential deleted",null,""))}) - .catch((err)=>{res.json(new RestResult("error","failed to delete credential",null,err))}) + .catch((err)=>{ res.json(new RestResult("error","failed to delete credential",null,err.toString())) }) }; exports.testDb = function(req,res){ Credential.findById(req.params.id) @@ -63,19 +63,18 @@ exports.testDb = function(req,res){ }else if(db_type=='postgres'){ return postgres.query(cred[0].name,'select 1') }else if(db_type=='mongodb'){ - throw "Mongodb test is not implemented" + throw new Error("Mongodb test is not implemented") }else{ - throw "Database type not set" + throw new Error("Database type not set") } }) - .then(()=>{res.json(new RestResult("success","Database connection ok",null,""))}) + .then(()=>{ res.json(new RestResult("success","Database connection ok",null,""))}) .catch((err)=>{ - if(err.includes("not set")){ + if(err.message.includes("not set")){ res.json(new RestResult("error","Database type not set",null,"")) }else{ - res.json(new RestResult("error","Database connection failed",null,err)) + res.json(new RestResult("error","Database connection failed",null,err.toString())) } - }) } diff --git a/server/src/controllers/expression.controller.js b/server/src/controllers/expression.controller.js index 806fd8a2..637840c3 100644 --- a/server/src/controllers/expression.controller.js +++ b/server/src/controllers/expression.controller.js @@ -25,7 +25,7 @@ exports.execute = function(req, res) { }) .catch((err)=>{ logger.error(`Error in expression : ${err}`) - res.json(new RestResult("success","failed to execute expression " + expression,undefined,err)) + res.json(new RestResult("success","failed to execute expression " + expression,undefined,err.toString())) }) } }; diff --git a/server/src/controllers/group.controller.js b/server/src/controllers/group.controller.js index 7a48e595..2a49b956 100644 --- a/server/src/controllers/group.controller.js +++ b/server/src/controllers/group.controller.js @@ -12,11 +12,11 @@ exports.find = function(req, res) { res.json(new RestResult("error","no such group found",null)) } }) - .catch((err)=>{res.json(new RestResult("error","failed to find group",null,err))}) + .catch((err)=>{res.json(new RestResult("error","failed to find group",null,err.toString()))}) }else{ Group.findAll() .then((groups)=>{ res.json(new RestResult("success","groups found",groups,"")) }) - .catch((err)=>{ res.json(new RestResult("error","failed to find groups",null,err)) }) + .catch((err)=>{ res.json(new RestResult("error","failed to find groups",null,err.toString())) }) } }; @@ -28,7 +28,7 @@ exports.create = function(req, res) { }else{ Group.create(new_group) .then((group)=>{ res.json(new RestResult("success","group added",group,"")) }) - .catch((err)=>{ res.json(new RestResult("error","failed to create group",null,err)) }) + .catch((err)=>{ res.json(new RestResult("error","failed to create group",null,err.toString())) }) } }; exports.findById = function(req, res) { @@ -48,7 +48,7 @@ exports.update = function(req, res) { }else{ Group.update(new Group(req.body),req.params.id) .then(()=>{res.json(new RestResult("success","group updated",null,""))}) - .catch((err)=>{res.json(new RestResult("error","failed to update group",null,err))}) + .catch((err)=>{res.json(new RestResult("error","failed to update group",null,err.toString()))}) } }; exports.delete = function(req, res) { @@ -61,5 +61,5 @@ exports.delete = function(req, res) { } }) - .catch((err)=>{res.json(new RestResult("error","failed to delete group",null,err))}) + .catch((err)=>{res.json(new RestResult("error","failed to delete group",null,err.toString()))}) }; diff --git a/server/src/controllers/help.controller.js b/server/src/controllers/help.controller.js index baf5e66a..2d5072ed 100644 --- a/server/src/controllers/help.controller.js +++ b/server/src/controllers/help.controller.js @@ -7,5 +7,5 @@ const inspect = require("util").inspect exports.get = function(req, res) { Help.get() .then((help)=>{ res.json(new RestResult("success","help found",help,"")) }) - .catch((err)=>{ res.json(new RestResult("error","failed to find help",null,err)) }) + .catch((err)=>{ res.json(new RestResult("error","failed to find help",null,err.toString())) }) }; diff --git a/server/src/controllers/install.controller.js b/server/src/controllers/install.controller.js index 72b0d9d8..03746fc6 100644 --- a/server/src/controllers/install.controller.js +++ b/server/src/controllers/install.controller.js @@ -16,8 +16,8 @@ exports.performChecks = async function (req, res) { : 'Some checks failed'; res.json(new RestResult(overallStatus, message, summary, '')); - } catch (error) { + } catch (err) { // Handle unexpected errors here - res.json(new RestResult('error', 'Checks failed', null, error)); + res.json(new RestResult('error', 'Checks failed', null, err.toString())); } }; \ No newline at end of file diff --git a/server/src/controllers/job.controller.js b/server/src/controllers/job.controller.js index b2c00781..139024f2 100644 --- a/server/src/controllers/job.controller.js +++ b/server/src/controllers/job.controller.js @@ -13,12 +13,12 @@ exports.abortJob = function(req, res) { } Job.abort(jobid) .then((job)=>{res.json(new RestResult("success","job aborted",null,""))}) - .catch((err)=>{res.json(new RestResult("error","failed to abort job",null,err))}) + .catch((err)=>{res.json(new RestResult("error","failed to abort job",null,err.toString()))}) }; exports.updateJob = function(req, res) { Job.update(new Job(req.body),req.params.id) .then(()=>{res.json(new RestResult("success","job updated",null,""))}) - .catch((err)=>{res.json(new RestResult("error","failed to update job",null,err))}) + .catch((err)=>{res.json(new RestResult("error","failed to update job",null,err.toString()))}) }; exports.getJob = function(req, res) { var user = req.user.user @@ -59,7 +59,7 @@ exports.getJob = function(req, res) { res.json(new RestResult("error","failed to find job",null,"No such job")) } }) - .catch((err)=>{res.json(new RestResult("error","failed to find job",null,err))}) + .catch((err)=>{res.json(new RestResult("error","failed to find job",null,err.toString()))}) }; exports.findAllJobs = function(req, res) { @@ -67,7 +67,7 @@ exports.findAllJobs = function(req, res) { var records = req.query.records || 500 Job.findAll(user,records) .then((jobs)=>{res.json(new RestResult("success","jobs found",jobs,""))}) - .catch((err)=>{res.json(new RestResult("error","failed to find jobs",null,err))}) + .catch((err)=>{res.json(new RestResult("error","failed to find jobs",null,err.toString()))}) }; exports.findApprovals = function(req, res) { var user = req.user.user diff --git a/server/src/controllers/knownhosts.controller.js b/server/src/controllers/knownhosts.controller.js index 1ec7c867..a8be05a1 100644 --- a/server/src/controllers/knownhosts.controller.js +++ b/server/src/controllers/knownhosts.controller.js @@ -6,7 +6,7 @@ var RestResult = require('../models/restResult.model'); exports.find = function(req, res) { KnownHosts.findAll() .then((hosts)=>{res.json(new RestResult("success","Hosts found",hosts,""))}) - .catch((err)=>{res.json(new RestResult("error","failed to find Hosts",null,err))}) + .catch((err)=>{res.json(new RestResult("error","failed to find Hosts",null,err.toString()))}) }; exports.add = function(req, res) { //handles null error @@ -15,14 +15,14 @@ exports.add = function(req, res) { }else{ KnownHosts.add(req.body.host) .then((output)=>{res.json(new RestResult("success","Host added",output,""))}) - .catch((err)=>{res.json(new RestResult("error","failed to add host",null,err))}) + .catch((err)=>{res.json(new RestResult("error","failed to add host",null,err.toString()))}) } }; exports.remove = function(req, res) { if(req.query.name){ KnownHosts.remove( req.query.name) .then(()=>{res.json(new RestResult("success","Host removed",null,""))}) - .catch((err)=>{res.json(new RestResult("error","failed to remove host",null,err))}) + .catch((err)=>{res.json(new RestResult("error","failed to remove host",null,err.toString()))}) }else{ res.json(new RestResult("error","no host name specified",null,"")); } diff --git a/server/src/controllers/ldap.controller.js b/server/src/controllers/ldap.controller.js index 0ab33945..ef21f716 100644 --- a/server/src/controllers/ldap.controller.js +++ b/server/src/controllers/ldap.controller.js @@ -6,12 +6,12 @@ const logger = require('../lib/logger'); exports.find = function(req, res) { Ldap.find() .then((ldap)=>{ res.json(new RestResult("success","Ldap found",ldap,"")); }) - .catch((err) => { res.json(new RestResult("error","Failed to find ldap",null,err)) }) + .catch((err) => { res.json(new RestResult("error","Failed to find ldap",null,err.toString())) }) }; exports.check = function(req, res) { Ldap.check(new Ldap(req.body)) .then(()=>{ res.json(new RestResult("success","Ldap connection ok")) }) - .catch((err) => { res.json(new RestResult("error","Ldap check failed",null,err)) }) + .catch((err) => { res.json(new RestResult("error","Ldap check failed",null,err.toString())) }) }; exports.update = function(req, res) { if(req.body.constructor === Object && Object.keys(req.body).length === 0){ @@ -19,6 +19,6 @@ exports.update = function(req, res) { }else{ Ldap.update(new Ldap(req.body)) .then(()=>{ res.json(new RestResult("success","Ldap updated",null,"")); }) - .catch((err) => { res.json(new RestResult("error","Failed to update ldap",null,err)) }) + .catch((err) => { res.json(new RestResult("error","Failed to update ldap",null,err.toString())) }) } }; diff --git a/server/src/controllers/lock.controller.js b/server/src/controllers/lock.controller.js index 9d129491..f4712a3d 100644 --- a/server/src/controllers/lock.controller.js +++ b/server/src/controllers/lock.controller.js @@ -7,17 +7,17 @@ const inspect = require("util").inspect exports.status = function(req, res) { Lock.status(req.user.user) .then((status)=>{ res.json(new RestResult("success","lock status found",status,"")) }) - .catch((err)=>{ res.json(new RestResult("error","failed to find lock",null,err)) }) + .catch((err)=>{ res.json(new RestResult("error","failed to find lock",null,err.toString())) }) }; exports.set = function(req, res) { const user = req.user.user // console.log(inspect(user)) Lock.set(user) .then((lock)=>{ res.json(new RestResult("success","lock added",null,"")) }) - .catch((err)=>{ res.json(new RestResult("error","failed to create lock",null,err)) }) + .catch((err)=>{ res.json(new RestResult("error","failed to create lock",null,err.toString())) }) }; exports.delete = function(req, res) { Lock.delete() .then(()=>{res.json(new RestResult("success","lock deleted",null,"")) }) - .catch((err)=>{res.json(new RestResult("error","failed to delete lock",null,err))}) + .catch((err)=>{res.json(new RestResult("error","failed to delete lock",null,err.toString()))}) }; diff --git a/server/src/controllers/query.controller.js b/server/src/controllers/query.controller.js index 084607a1..0e30e033 100644 --- a/server/src/controllers/query.controller.js +++ b/server/src/controllers/query.controller.js @@ -16,7 +16,7 @@ exports.findAll = function(req, res) { res.json(new RestResult("success","query ran successfully",resultset,"")); }) .catch((err)=>{ - res.json(new RestResult("success","failed run query",null,err)) + res.json(new RestResult("success","failed run query",null,err.toString())) }) }else{ logger.error("database config is missing, provide 'dbConfig' parameter with type query") diff --git a/server/src/controllers/repo.controller.js b/server/src/controllers/repo.controller.js index c5a87cb3..15b3edbb 100644 --- a/server/src/controllers/repo.controller.js +++ b/server/src/controllers/repo.controller.js @@ -7,11 +7,11 @@ exports.find = function(req, res) { if(req.query.name){ Repo.findByName(req.query.name,(req.query.text=="true")) .then((repo)=>{res.json(new RestResult("success","repository found",repo,""))}) - .catch((err)=>{res.json(new RestResult("error",err,null,err))}) + .catch((err)=>{res.json(new RestResult("error",err,null,err.toString()))}) }else{ Repo.findAll() .then((repos)=>{res.json(new RestResult("success","repositories found",repos,""))}) - .catch((err)=>{res.json(new RestResult("error","failed to find repositories",null,err))}) + .catch((err)=>{res.json(new RestResult("error","failed to find repositories",null,err.toString()))}) } }; @@ -22,7 +22,7 @@ exports.create = function(req, res) { }else{ Repo.create(req.body.uri,req.body.command,req.body.username,req.body.email) .then((output)=>{res.json(new RestResult("success","repository created",output,""))}) - .catch((err)=>{res.json(new RestResult("error","failed to create repository",null,err))}) + .catch((err)=>{res.json(new RestResult("error","failed to create repository",null,err.toString()))}) } }; exports.addKnownHosts = function(req, res) { @@ -32,14 +32,14 @@ exports.addKnownHosts = function(req, res) { }else{ Repo.addKnownHosts(req.body.hosts) .then((output)=>{res.json(new RestResult("success","hosts added",output,""))}) - .catch((err)=>{res.json(new RestResult("error","failed to add hosts",null,err))}) + .catch((err)=>{res.json(new RestResult("error","failed to add hosts",null,err.toString()))}) } }; exports.delete = function(req, res) { if(req.query.name){ Repo.delete( req.query.name) .then(()=>{res.json(new RestResult("success","repository deleted",null,""))}) - .catch((err)=>{res.json(new RestResult("error","failed to delete repository",null,err))}) + .catch((err)=>{res.json(new RestResult("error","failed to delete repository",null,err.toString()))}) }else{ res.json(new RestResult("error","no repository name specified",null,"")); } diff --git a/server/src/controllers/schema.controller.js b/server/src/controllers/schema.controller.js index d58a3141..8d2b1809 100644 --- a/server/src/controllers/schema.controller.js +++ b/server/src/controllers/schema.controller.js @@ -17,5 +17,5 @@ exports.hasSchema = function(req, res) { exports.create = function(req, res) { Schema.create() .then((result)=>{ res.json(new RestResult("success",result,null,""))}) - .catch((err)=>{res.json(new RestResult("error",err,null,null))}) + .catch((err)=>{res.json(new RestResult("error",err.toString(),null,null))}) }; diff --git a/server/src/controllers/settings.controller.js b/server/src/controllers/settings.controller.js index 9704e007..9b40da71 100644 --- a/server/src/controllers/settings.controller.js +++ b/server/src/controllers/settings.controller.js @@ -6,12 +6,12 @@ const logger = require('../lib/logger'); exports.find = function(req, res) { Settings.find() .then((settings)=>{res.json(new RestResult("success","Settings found",settings,""))}) - .catch((err)=>{res.json(new RestResult("error","Failed to find settings",null,err))}) + .catch((err)=>{res.json(new RestResult("error","Failed to find settings",null,err.toString()))}) }; exports.mailcheck = function(req, res) { Settings.mailcheck(new Settings(req.body),req.body.to) .then((messageid)=>{res.json(new RestResult("success",`Mail sent with id ${messageid}`))}) - .catch((err)=>{res.json(new RestResult("error","Mail check failed",null,err.message))}) + .catch((err)=>{res.json(new RestResult("error","Mail check failed",null,err.toString()))}) }; exports.update = function(req, res) { if(req.body.constructor === Object && Object.keys(req.body).length === 0){ @@ -19,6 +19,6 @@ exports.update = function(req, res) { }else{ Settings.update(new Settings(req.body)) .then(()=>{res.json(new RestResult("success","Settings updated",null,""))}) - .catch((err)=>{res.json(new RestResult("error","Failed to update settings",null,err))}) + .catch((err)=>{res.json(new RestResult("error","Failed to update settings",null,err.toString()))}) } }; diff --git a/server/src/controllers/ssh.controller.js b/server/src/controllers/ssh.controller.js index 72ef3b62..45020cbb 100644 --- a/server/src/controllers/ssh.controller.js +++ b/server/src/controllers/ssh.controller.js @@ -6,7 +6,7 @@ const logger=require("../lib/logger"); exports.find = function(req, res) { Ssh.find() .then((sshkey)=>{res.json(new RestResult("success","Ssh key found",sshkey,""))}) - .catch((err)=>{res.json(new RestResult("error","Failed to find ssh key",null,err))}) + .catch((err)=>{res.json(new RestResult("error","Failed to find ssh key",null,err.toString()))}) }; exports.update = function(req, res) { if(req.body.constructor === Object && Object.keys(req.body).length === 0){ @@ -14,6 +14,6 @@ exports.update = function(req, res) { }else{ Ssh.update(new Ssh(req.body)) .then((ssh)=>{res.json(new RestResult("success","Ssh key updated",null,""))}) - .catch((err)=>{res.json(new RestResult("error","Failed to update ssh key",null,err))}) + .catch((err)=>{res.json(new RestResult("error","Failed to update ssh key",null,err.toString()))}) } }; diff --git a/server/src/controllers/upload.controller.js b/server/src/controllers/upload.controller.js index 0161f5ca..c647f2d5 100644 --- a/server/src/controllers/upload.controller.js +++ b/server/src/controllers/upload.controller.js @@ -20,8 +20,8 @@ exports.upload = function(req, res,next) { result(req, res, function (err) { if(err) { - logger.error(`Upload error : ${err.message}`) - return res.send(new RestResult("error","file upload failed",null,err.message)) + logger.error(`Upload error : ${err.toString()}`) + return res.send(new RestResult("error","file upload failed",null,err.toString())) } logger.info(`Uploaded file ${req.file.originalname} as ${req.file.path}`) return res.json(new RestResult("success","file uploaded",req.file,"")) diff --git a/server/src/controllers/user.controller.js b/server/src/controllers/user.controller.js index bd067ca7..8d0140ef 100644 --- a/server/src/controllers/user.controller.js +++ b/server/src/controllers/user.controller.js @@ -6,11 +6,11 @@ exports.findAllOr1 = function(req, res) { if(req.query.username){ User.findByUsername(req.query.username) .then((user)=>{res.json(new RestResult("success","user found",user,""))}) - .catch((err)=>{res.json(new RestResult("error","failed to find user",null,err))}) + .catch((err)=>{res.json(new RestResult("error","failed to find user",null,err.toString()))}) }else{ User.findAll() .then((users)=>{res.json(new RestResult("success","users found",users,""));}) - .catch((err)=>{res.json(new RestResult("error","failed to find users",null,err))}) + .catch((err)=>{res.json(new RestResult("error","failed to find users",null,err.toString()))}) } }; @@ -22,7 +22,7 @@ exports.create = function(req, res) { }else{ User.create(new_user) .then((user)=>{res.json(new RestResult("success","user added",user,""))}) - .catch((err)=>{res.json(new RestResult("error","failed to create user",null,err))}) + .catch((err)=>{res.json(new RestResult("error","failed to create user",null,err.toString()))}) } }; exports.findById = function(req, res) { @@ -31,10 +31,10 @@ exports.findById = function(req, res) { if(user.length>0){ res.json(new RestResult("success","found user",user[0],"")); }else{ - res.json(new RestResult("error","failed to find user",null,err)) + res.json(new RestResult("error","failed to find user",null,err.toString())) } }) - .catch((err)=>{res.json(new RestResult("error","failed to find user",null,err))}) + .catch((err)=>{res.json(new RestResult("error","failed to find user",null,err.toString()))}) }; exports.findByToken = function(req, res) { User.findById(req.user.user.username) @@ -42,10 +42,10 @@ exports.findByToken = function(req, res) { if(user.length>0){ res.json(new RestResult("success","found user",user[0].id,"")); }else{ - res.json(new RestResult("error","failed to find user",null,err)) + res.json(new RestResult("error","failed to find user",null,err.toString())) } }) - .catch((err)=>{res.json(new RestResult("error","failed to find user",null,err))}) + .catch((err)=>{res.json(new RestResult("error","failed to find user",null,err.toString()))}) }; exports.update = function(req, res) { // don't tamper with username @@ -68,10 +68,10 @@ exports.changePassword = function(req, res) { }else{ User.update(new User(req.body),req.user.user.id) .then((user)=>{res.json(new RestResult("success","password changed",null,""))}) - .catch((err)=>{res.json(new RestResult("error","failed to change password",null,err))}) + .catch((err)=>{res.json(new RestResult("error","failed to change password",null,err.toString()))}) } }else{ - res.json(new RestResult("error","you can't change the password for an ldap user",null,err)) + res.json(new RestResult("error","you can't change the password for an ldap user",null,err.toString())) } }; exports.find = function(req, res) { @@ -80,5 +80,5 @@ exports.find = function(req, res) { exports.delete = function(req, res) { User.delete( req.params.id) .then(()=>{res.json(new RestResult("success","user deleted",null,""))}) - .catch((err)=>{res.json(new RestResult("error","failed to delete user",null,err))}) + .catch((err)=>{res.json(new RestResult("error","failed to delete user",null,err.toString()))}) }; diff --git a/server/src/models/expression.model.js b/server/src/models/expression.model.js index fe59739a..f8b4392a 100644 --- a/server/src/models/expression.model.js +++ b/server/src/models/expression.model.js @@ -49,13 +49,9 @@ function sanitizeExpression(expr){ return expr } async function doAsync (expr) { - try{ var sanitized = sanitizeExpression(expr) var outcome = await eval(sanitized) return outcome - }catch(e){ - throw e.message - } } // execute expression (cannot be a promise) Expression.execute = function (expr,noLog) { @@ -64,12 +60,7 @@ Expression.execute = function (expr,noLog) { }else{ logger.info(`Expression: ${expr}`) } - var expression = "" - try{ - return doAsync(expr) - }catch(err){ - throw err.message - } + return doAsync(expr) }; diff --git a/server/src/models/schema.model.js b/server/src/models/schema.model.js index b5565dab..2a81e9ed 100644 --- a/server/src/models/schema.model.js +++ b/server/src/models/schema.model.js @@ -12,9 +12,9 @@ const cache = new NodeCache({ //user object create var Schema=function(){ }; -function handleError(n){ - logger.error(n.message) - throw(n) +function handleError(err){ + logger.error(err.toString()) + throw(err) } function checkSchema(){