LeadMagnet/leadchat
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix: Make version changeable from the environment vars (#4654)

Browse Source
This commit is contained in:
Tejaswini Chile
2022-05-10 19:20:55 +05:30
committed by GitHub
parent 81d0405473
commit 9ed1f5d96b
5 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/dashboard_controller.rb
View File

@@ -38,9 +38,12 @@ class DashboardController < ActionController::Base
end end
def app_config def app_config
{ APP_VERSION: Chatwoot.config[:version], {
APP_VERSION: Chatwoot.config[:version],
VAPID_PUBLIC_KEY: VapidService.public_key, VAPID_PUBLIC_KEY: VapidService.public_key,
ENABLE_ACCOUNT_SIGNUP: GlobalConfigService.load('ENABLE_ACCOUNT_SIGNUP', 'false'), ENABLE_ACCOUNT_SIGNUP: GlobalConfigService.load('ENABLE_ACCOUNT_SIGNUP', 'false'),
FB_APP_ID: GlobalConfigService.load('FB_APP_ID', '') } FB_APP_ID: GlobalConfigService.load('FB_APP_ID', ''),
FACEBOOK_API_VERSION: 'v13.0'
}
end end
end end

2
app/javascript/dashboard/helper/scriptGenerator.js
View File

@@ -4,7 +4,7 @@ export const createMessengerScript = pageId => `
FB.init({ FB.init({
appId: "${window.chatwootConfig.fbAppId}", appId: "${window.chatwootConfig.fbAppId}",
xfbml: true, xfbml: true,
version: "v4.0" version: "${window.chatwootConfig.fbApiVersion}"
}); });
}; };
(function(d, s, id){ (function(d, s, id){

2
app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Facebook.vue
View File

@@ -163,7 +163,7 @@ export default {
FB.init({ FB.init({
appId: window.chatwootConfig.fbAppId, appId: window.chatwootConfig.fbAppId,
xfbml: true, xfbml: true,
version: 'v12.0', version: window.chatwootConfig.fbApiVersion,
status: true, status: true,
}); });
window.fbSDKLoaded = true; window.fbSDKLoaded = true;

2
app/javascript/dashboard/routes/dashboard/settings/inbox/facebook/Reauthorize.vue
View File

@@ -40,7 +40,7 @@ export default {
FB.init({ FB.init({
appId: window.chatwootConfig.fbAppId, appId: window.chatwootConfig.fbAppId,
xfbml: true, xfbml: true,
version: 'v12.0', version: window.chatwootConfig.fbApiVersion,
status: true, status: true,
}); });
window.fbSDKLoaded = true; window.fbSDKLoaded = true;

1
app/views/layouts/vueapp.html.erb
View File

@@ -34,6 +34,7 @@
window.chatwootConfig = { window.chatwootConfig = {
hostURL: '<%= ENV.fetch('FRONTEND_URL', '') %>', hostURL: '<%= ENV.fetch('FRONTEND_URL', '') %>',
fbAppId: '<%= ENV.fetch('FB_APP_ID', nil) %>', fbAppId: '<%= ENV.fetch('FB_APP_ID', nil) %>',
fbApiVersion: '<%= @global_config['FACEBOOK_API_VERSION'] %>',
signupEnabled: '<%= @global_config['ENABLE_ACCOUNT_SIGNUP'] %>', signupEnabled: '<%= @global_config['ENABLE_ACCOUNT_SIGNUP'] %>',
<% if @global_config['VAPID_PUBLIC_KEY'] %> <% if @global_config['VAPID_PUBLIC_KEY'] %>
vapidPublicKey: new Uint8Array(<%= Base64.urlsafe_decode64(@global_config['VAPID_PUBLIC_KEY']).bytes %>), vapidPublicKey: new Uint8Array(<%= Base64.urlsafe_decode64(@global_config['VAPID_PUBLIC_KEY']).bytes %>),