Force enable Facebook integration

pull/9365/head
Diego Sampaio 8 years ago
parent f82e5723df
commit 10bcb9f70a
No known key found for this signature in database
GPG Key ID: E060152B30502562
  1. 13
      packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js
  2. 15
      packages/rocketchat-livechat/server/methods/facebook.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');

@ -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);

Loading…
Cancel
Save