redlink-gmbh/smarti#225: Improve error handling

redlink-gmbh · May 15, 2018 · 406eca9 · 406eca9
1 parent aad4eba
commit 406eca9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/packages/assistify-ai/server/SmartiProxy.js b/packages/assistify-ai/server/SmartiProxy.js
@@ -51,7 +51,7 @@ export class SmartiProxy {
 			SystemLogger.error('Could not complete', method, 'to', url, error.response);
 			SystemLogger.debug(error);
 
-			if (onError) {
+			if (error && onError) {
 				const recoveryResult = onError(error);
 				if (recoveryResult !== undefined) {
 					return recoveryResult;
@@ -60,7 +60,7 @@ export class SmartiProxy {
 
 			SystemLogger.error('Could not complete', method, 'to', url, error.response);
 			SystemLogger.debug(error);
-			return false;
+			return {error};
 		}
 	}
 }
diff --git a/packages/assistify-ai/server/methods/SmartiWidgetBackend.js b/packages/assistify-ai/server/methods/SmartiWidgetBackend.js
@@ -33,12 +33,9 @@ Meteor.methods({
 					}
 				}
 			)(verbs.get, `legacy/rocket.chat?channel_id=${ channelId }`, null, (error) => {
-				if (error) {
-					// 404 is expected if no mapping exists
-					if (error.response && error.response.statusCode === 404) {
-						return null;
-					}
-					return {errorCode: error.code};
+				// 404 is expected if no mapping exists
+				if (error.response && error.response.statusCode === 404) {
+					return null;
 				}
 			});
 
@@ -88,12 +85,9 @@ Meteor.methods({
 				}
 			}
 		)(verbs.get, `conversation/${ conversationId }/analysis`, null, (error) => {
-			if (error) {
-				// 404 is expected if no mapping exists
-				if (error.response && error.response.statusCode === 404) {
-					return null;
-				}
-				return {errorCode: error.code};
+			// 404 is expected if no mapping exists
+			if (error.response && error.response.statusCode === 404) {
+				return null;
 			}
 		});
 	},