Merge pull request #9365 from RocketChat/improve-livechat-facebook-in…

…tegration-flow [FIX] Force enable Livechat Facebook integration on specific errors
RocketChat · Jan 18, 2018 · ad8daf9 · ad8daf9
2 parents 54d09e7 + 29e5fc6
commit ad8daf9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js b/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js
@@ -33,6 +33,19 @@ Template.livechatIntegrationFacebook.onCreated(function() {
 
 	this.result = (successFn, errorFn = () => {}) => {
 		return (error, result) => {
+			// fix the state where user it was enabled on admin
+			if (error && error.error) {
+				switch (error.error) {
+					case 'invalid-facebook-token':
+					case 'invalid-instance-url':
+					case 'integration-disabled':
+						return Meteor.call('livechat:facebook', { action: 'enable' }, this.result(() => {
+							this.enabled.set(true);
+							this.loadPages();
+						}, () => this.loadPages()));
+				}
+			}
+
 			if (result && result.success === false && (result.type === 'OAuthException' || typeof result.url !== 'undefined')) {
 				const oauthWindow = window.open(result.url, 'facebook-integration-oauth', 'width=600,height=400');
 

diff --git a/packages/rocketchat-livechat/server/methods/facebook.js b/packages/rocketchat-livechat/server/methods/facebook.js
@@ -44,11 +44,16 @@ Meteor.methods({
 				}
 			}
 		} catch (e) {
-			if (e.response && e.response.data && e.response.data.error && e.response.data.error.response) {
-				throw new Meteor.Error('integration-error', e.response.data.error.response.error.message);
-			}
-			if (e.response && e.response.data && e.response.data.error && e.response.data.error.message) {
-				throw new Meteor.Error('integration-error', e.response.data.error.message);
+			if (e.response && e.response.data && e.response.data.error) {
+				if (e.response.data.error.error) {
+					throw new Meteor.Error(e.response.data.error.error, e.response.data.error.message);
+				}
+				if (e.response.data.error.response) {
+					throw new Meteor.Error('integration-error', e.response.data.error.response.error.message);
+				}
+				if (e.response.data.error.message) {
+					throw new Meteor.Error('integration-error', e.response.data.error.message);
+				}
 			}
 			console.error('Error contacting omni.rocket.chat:', e);
 			throw new Meteor.Error('integration-error', e.error);