8000 Fix connect error message not show bug · xgeek-net/pipeline@2665336 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2665336

Browse files
xgeek-netxgeek-net
committed
Fix connect error message not show bug
1 parent aa6465a commit 2665336

File tree

4 files changed

+19
-14
lines changed

4 files changed

+19
-14
lines changed

‎src/class/Connect.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ class Connect {
334334
getMetadataList(ev, arg) {
335335
const self = this;
336336
const callback = function(err, result) {
337-
ev.sender.send('sfdc-metadata-list-callback',err, result);
337+
ev.sender.send('sfdc-metadata-list-callback',utils.serialize(err), result);
338338
}
339339
try{
340340
let metadataList = [];

‎src/class/Pipeline.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Pipeline {
2121

2222
savePipeline(ev, arg) {
2323
const callback = function(err, result) {
24-
ev.sender.send('data-save-pipeline-callback',err, result);
24+
ev.sender.send('data-save-pipeline-callback',utils.serialize(err), result);
2525
}
2626
try{
2727
const self = this;
@@ -61,7 +61,7 @@ class Pipeline {
6161
*/
6262
clonePipeline(ev, arg) {
6363
const callback = function(err, result) {
64-
ev.sender.send('data-clone-pipeline-callback',err, result);
64+
ev.sender.send('data-clone-pipeline-callback',utils.serialize(err), result);
6565
}
6666
try{
6767
let pipelines = this.storage.getAll({ cache : false });
@@ -94,7 +94,7 @@ class Pipeline {
9494
removePipeline(ev, arg) {
9595
const self = this;
9696
const callback = function(err, result) {
97-
ev.sender.send('data-remove-pipeline-callback',err, result);
97+
ev.sender.send('data-remove-pipeline-callback',utils.serialize(err), result);
9898
}
9999
try{
100100
let pipelines = self.storage.getAll({ cache : false });
@@ -150,7 +150,7 @@ class Pipeline {
150150

151151
getPipelines(ev, arg) {
152152
const callback = function(err, result) {
153-
ev.sender.send('data-pipelines-callback',err, result);
153+
ev.sender.send('data-pipelines-callback',utils.serialize(err), result);
154154
}
155155
try{
156156
let result = this.storage.getAll({ cache : false });
@@ -170,7 +170,7 @@ class Pipeline {
170170
*/
171171
getPipelineLog(ev, arg) {
172172
const callback = function(err, result) {
173-
ev.sender.send('data-pipeline-log-callback',err, result);
173+
ev.sender.send('data-pipeline-log-callback',utils.serialize(err), result);
174174
}
175175
try{
176176
let index = 1;
@@ -203,7 +203,7 @@ class Pipeline {
203203
runPipeline(ev, arg) {
204204
const self = this;
205205
const callback = function(err, result) {
206-
ev.sender.send('pipeline-run-callback',err, result);
206+
ev.sender.send('pipeline-run-callback',utils.serialize(err), result);
207207
}
208208
const processing = function() {
209209
ev.sender.send('pipeline-run-callback',null, { type : 'process' });

‎src/class/SfdcApi.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ class SfdcApi {
4747
if(!self.conn) return reject(new Error('SFDC Connect ERROR!'));
4848
self.conn.identity(function(err, res) {
4949
// console.log('>>> identity ', err, res);
50-
// language: 'en_US',
51-
// locale: 'ja_JP',
5250
if (err) {
53-
if(err.errorCode.indexOf('INVALID_SESSION_ID') >= 0 ||
54-
err.errorCode.indexOf('INVALID_LOGIN') >= 0 ||
55-
err.errorCode.indexOf('INVALID_OPERATION_WITH_EXPIRED_PASSWORD') >= 0 ||
56-
err.name.indexOf('invalid_grant') >= 0
51+
const errorCode = err.errorCode || '';
52+
const errorName = err.name || '';
53+
if(errorCode.indexOf('INVALID_SESSION_ID') >= 0 ||
54+
errorCode.indexOf('INVALID_LOGIN') >= 0 ||
55+
errorCode.indexOf('INVALID_OPERATION_WITH_EXPIRED_PASSWORD') >= 0 ||
56+
errorName.indexOf('invalid_grant') >= 0
5757
) {
5858
//console.log('Refresh Token', self.conn.refreshToken);
5959
self.conn.oauth2.refreshToken(self.conn.refreshToken, function(err, ret) {

‎src/class/Utils.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,12 @@ const utils = {
145145
res[key] = obj[key];
146146
}
147147
return res;
148-
}
148+
},
149+
150+
serialize : function(err) {
151+
if(err instanceof Error) return err.toString();
152+
return err;
153+
}
149154
}
150155

151156
module.exports = utils;

0 commit comments

Comments
 (0)
0