found another place where the legacy/rocket.chat service is called

(closes RocketChat#236)
redlink-gmbh · Feb 15, 2018 · 4cc03fe · 4cc03fe
1 parent 38dd8ac
commit 4cc03fe
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/packages/assistify-ai/server/SmartiProxy.js b/packages/assistify-ai/server/SmartiProxy.js
@@ -55,7 +55,7 @@ export class SmartiProxy {
 				}
 			}
 
-			SystemLogger.error('Could not complete', method, 'to', url);
+			SystemLogger.error('Could not complete', method, 'to', url, error.response);
 			SystemLogger.debug(error);
 		}
 	}

diff --git a/packages/assistify-ai/server/lib/SmartiAdapter.js b/packages/assistify-ai/server/lib/SmartiAdapter.js
@@ -73,8 +73,7 @@ export class SmartiAdapter {
 		} else {
 			SystemLogger.debug('Smarti - Trying legacy service to retrieve conversation ID...');
 			const conversation = SmartiProxy.propagateToSmarti(verbs.get,
-				`legacy/rocket.chat?channel_id=${ message.rid }`, null,
-				function (error) {
+				`legacy/rocket.chat?channel_id=${ message.rid }`, null, (error) => {
 					// 404 is expected if no mapping exists
 					if (error.response.statusCode === 404) {
 						return null;

diff --git a/packages/assistify-ai/server/methods/SmartiWidgetBackend.js b/packages/assistify-ai/server/methods/SmartiWidgetBackend.js
@@ -32,7 +32,12 @@ Meteor.methods({
 						return !RocketChat.authz.hasPermission(userId, 'send-many-messages');
 					}
 				}
-			)(verbs.get, `legacy/rocket.chat?channel_id=${ channelId }`);
+			)(verbs.get, `legacy/rocket.chat?channel_id=${ channelId }`, null, (error) => {
+        // 404 is expected if no mapping exists
+        if (error.response.statusCode === 404) {
+          return null;
+        }
+      });
 
 			if (conversation && conversation.id) {
 				let timestamp = conversation.messages &&
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,7 @@ export class SmartiProxy { @@
     				}
     			}
-    			SystemLogger.error('Could not complete', method, 'to', url);
+    			SystemLogger.error('Could not complete', method, 'to', url, error.response);
     			SystemLogger.debug(error);
     		}
     	}
@@ Expand Down @@