Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] Force enable Livechat Facebook integration on specific errors #9365

Merged
merged 2 commits into from
Jan 18, 2018
Merged

[FIX] Force enable Livechat Facebook integration on specific errors #9365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10bcb9f
Force enable Facebook integration
sampaiodiego Jan 8, 2018
29e5fc6
Merge branch 'develop' into improve-livechat-facebook-integration-flow
engelgabriel Jan 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down
15 changes: 10 additions & 5 deletions packages/rocketchat-livechat/server/methods/facebook.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down