diff --git a/.snapcraft/resources/startRocketChat b/.snapcraft/resources/startRocketChat index 7e1cca2f07870..9a469869be3ca 100755 --- a/.snapcraft/resources/startRocketChat +++ b/.snapcraft/resources/startRocketChat @@ -30,7 +30,7 @@ function start_rocketchat { export Accounts_AvatarStorePath=$SNAP_COMMON/uploads siteurl="$(snapctl get siteurl)" if [ -n "$siteurl" ]; then - export OVERWRITE_SETTING_Site_Url=$siteurl + export OVERWRITE_SETTING_Workspace_Url=$siteurl fi if ls $SNAP_COMMON/*.env >/dev/null 2>&1; then diff --git a/app/authentication/server/startup/index.js b/app/authentication/server/startup/index.js index f14aa5579eb48..8179c36b520fb 100644 --- a/app/authentication/server/startup/index.js +++ b/app/authentication/server/startup/index.js @@ -27,19 +27,19 @@ Accounts.config({ const updateMailConfig = _.debounce(() => { Accounts._options.loginExpirationInDays = settings.get('Accounts_LoginExpiration'); - Accounts.emailTemplates.siteName = settings.get('Site_Name'); + Accounts.emailTemplates.siteName = settings.get('Workspace_Name'); - Accounts.emailTemplates.from = `${ settings.get('Site_Name') } <${ settings.get('From_Email') }>`; + Accounts.emailTemplates.from = `${ settings.get('Workspace_Name') } <${ settings.get('From_Email') }>`; }, 1000); Meteor.startup(() => { - settings.get(/^(Accounts_LoginExpiration|Site_Name|From_Email)$/, updateMailConfig); + settings.get(/^(Accounts_LoginExpiration|Workspace_Name|From_Email)$/, updateMailConfig); }); Accounts.emailTemplates.userToActivate = { subject() { const subject = TAPi18n.__('Accounts_Admin_Email_Approval_Needed_Subject_Default'); - const siteName = settings.get('Site_Name'); + const siteName = settings.get('Workspace_Name'); return `[${ siteName }] ${ subject }`; }, @@ -60,7 +60,7 @@ Accounts.emailTemplates.userActivated = { const activated = username ? 'Activated' : 'Approved'; const action = active ? activated : 'Deactivated'; const subject = `Accounts_Email_${ action }_Subject`; - const siteName = settings.get('Site_Name'); + const siteName = settings.get('Workspace_Name'); return `[${ siteName }] ${ TAPi18n.__(subject) }`; }, diff --git a/app/blockstack/server/routes.js b/app/blockstack/server/routes.js index 81902030e4266..0ef11748747c5 100644 --- a/app/blockstack/server/routes.js +++ b/app/blockstack/server/routes.js @@ -5,7 +5,7 @@ import { settings } from '../../settings'; import { RocketChatAssets } from '../../assets/server'; WebApp.connectHandlers.use('/_blockstack/manifest', Meteor.bindEnvironment(function(req, res) { - const name = settings.get('Site_Name'); + const name = settings.get('Workspace_Name'); const startUrl = Meteor.absoluteUrl(); const description = settings.get('Blockstack_Auth_Description'); const iconUrl = RocketChatAssets.getURL('Assets_favicon_192'); diff --git a/app/cloud/server/functions/buildRegistrationData.js b/app/cloud/server/functions/buildRegistrationData.js index d8ecff67687f8..9d77a1cf2382a 100644 --- a/app/cloud/server/functions/buildRegistrationData.js +++ b/app/cloud/server/functions/buildRegistrationData.js @@ -6,8 +6,8 @@ import { LICENSE_VERSION } from '../license'; export function buildWorkspaceRegistrationData() { const stats = Statistics.findLast() || statistics.get(); - const address = settings.get('Site_Url'); - const siteName = settings.get('Site_Name'); + const address = settings.get('Workspace_Url'); + const siteName = settings.get('Workspace_Name'); // If we have it lets send it because likely an update const workspaceId = settings.get('Cloud_Workspace_Id'); diff --git a/app/cloud/server/functions/connectWorkspace.js b/app/cloud/server/functions/connectWorkspace.js index 6e428803dc0cb..5a62f697daae5 100644 --- a/app/cloud/server/functions/connectWorkspace.js +++ b/app/cloud/server/functions/connectWorkspace.js @@ -23,7 +23,7 @@ export function connectWorkspace(token) { const regInfo = { email: settings.get('Organization_Email'), - client_name: settings.get('Site_Name'), + client_name: settings.get('Workspace_Name'), redirect_uris: [redirectUri], }; diff --git a/app/cloud/server/functions/getRedirectUri.js b/app/cloud/server/functions/getRedirectUri.js index 754c8d4c89e4a..0b34571d967a1 100644 --- a/app/cloud/server/functions/getRedirectUri.js +++ b/app/cloud/server/functions/getRedirectUri.js @@ -1,5 +1,5 @@ import { settings } from '../../../settings'; export function getRedirectUri() { - return `${ settings.get('Site_Url') }/admin/cloud/oauth-callback`.replace(/\/\/admin+/g, '/admin'); + return `${ settings.get('Workspace_Url') }/admin/cloud/oauth-callback`.replace(/\/\/admin+/g, '/admin'); } diff --git a/app/federation/server/startup/settings.js b/app/federation/server/startup/settings.js index 48213be788078..9e6340c09e38c 100644 --- a/app/federation/server/startup/settings.js +++ b/app/federation/server/startup/settings.js @@ -74,7 +74,7 @@ const updateSettings = debounce(Meteor.bindEnvironment(function() { try { updateStatus(STATUS_REGISTERING); - registerWithHub(getFederationDomain(), settings.get('Site_Url'), FederationKeys.getPublicKeyString()); + registerWithHub(getFederationDomain(), settings.get('Workspace_Url'), FederationKeys.getPublicKeyString()); updateStatus(STATUS_ENABLED); } catch (err) { diff --git a/app/integrations/server/lib/triggerHandler.js b/app/integrations/server/lib/triggerHandler.js index 3763178e12973..7ec0792076353 100644 --- a/app/integrations/server/lib/triggerHandler.js +++ b/app/integrations/server/lib/triggerHandler.js @@ -401,7 +401,7 @@ integrations.triggerHandler = new class RocketChatIntegrationHandler { data.user_id = message.u._id; data.user_name = message.u.username; data.text = message.msg; - data.siteUrl = settings.get('Site_Url'); + data.siteUrl = settings.get('Workspace_Url'); if (message.alias) { data.alias = message.alias; diff --git a/app/lib/client/lib/settings.js b/app/lib/client/lib/settings.js index 62806990bd6ad..b3fd4e1fa20c5 100644 --- a/app/lib/client/lib/settings.js +++ b/app/lib/client/lib/settings.js @@ -8,7 +8,7 @@ import { hasRole } from '../../../authorization'; Meteor.startup(function() { Tracker.autorun(function(c) { - const siteUrl = settings.get('Site_Url'); + const siteUrl = settings.get('Workspace_Url'); if (!siteUrl || (Meteor.userId() == null)) { return; } @@ -21,14 +21,14 @@ Meteor.startup(function() { modal.open({ type: 'warning', title: t('Warning'), - text: `${ t('The_setting_s_is_configured_to_s_and_you_are_accessing_from_s', t('Site_Url'), siteUrl, currentUrl) }

${ t('Do_you_want_to_change_to_s_question', currentUrl) }`, + text: `${ t('The_setting_s_is_configured_to_s_and_you_are_accessing_from_s', t('Workspace_Url'), siteUrl, currentUrl) }

${ t('Do_you_want_to_change_to_s_question', currentUrl) }`, showCancelButton: true, confirmButtonText: t('Yes'), cancelButtonText: t('Cancel'), closeOnConfirm: false, html: true, }, function() { - Meteor.call('saveSetting', 'Site_Url', currentUrl, function() { + Meteor.call('saveSetting', 'Workspace_Url', currentUrl, function() { modal.open({ title: t('Saved'), type: 'success', diff --git a/app/lib/lib/startup/settingsOnLoadSiteUrl.js b/app/lib/lib/startup/settingsOnLoadSiteUrl.js index 2fb003f72df05..36b6d2130eb0d 100644 --- a/app/lib/lib/startup/settingsOnLoadSiteUrl.js +++ b/app/lib/lib/startup/settingsOnLoadSiteUrl.js @@ -5,7 +5,7 @@ import { settings } from '../../../settings'; export let hostname; -settings.get('Site_Url', function(key, value) { +settings.get('Workspace_Url', function(key, value) { if (value == null || value.trim() === '') { return; } diff --git a/app/lib/server/startup/email.js b/app/lib/server/startup/email.js index 40cac50e9c8bf..686f7cfdd3625 100644 --- a/app/lib/server/startup/email.js +++ b/app/lib/server/startup/email.js @@ -115,14 +115,14 @@ settings.addGroup('Email', function() { }); this.section('Subject', function() { - this.add('Offline_DM_Email', '[[Site_Name]] You have been direct messaged by [User]', { + this.add('Offline_DM_Email', '[[Workspace_Name]] You have been direct messaged by [User]', { type: 'code', code: 'text', multiline: true, i18nLabel: 'Offline_DM_Email', i18nDescription: 'Offline_Email_Subject_Description', }); - this.add('Offline_Mention_Email', '[[Site_Name]] You have been mentioned by [User] in #[Room]', { + this.add('Offline_Mention_Email', '[[Workspace_Name]] You have been mentioned by [User] in #[Room]', { type: 'code', code: 'text', multiline: true, @@ -138,7 +138,7 @@ settings.addGroup('Email', function() { }); }); this.section('Header_and_Footer', function() { - this.add('Email_Header', 'Rocket.Chat Cloud
Rocket.chat
', { + this.add('Email_Header', 'Rocket.Chat Cloud
Rocket.chat
', { type: 'code', code: 'text/html', multiline: true, @@ -365,11 +365,11 @@ settings.addGroup('Email', function() { }); this.section('Registration', function() { - this.add('Accounts_Enrollment_Email_Subject', '{Welcome_to Site_name}', { + this.add('Accounts_Enrollment_Email_Subject', '{Welcome_to Workspace_name}', { type: 'string', i18nLabel: 'Subject', }); - this.add('Accounts_Enrollment_Email', '

{Welcome_to Site_Name}

{Visit_Site_Url_and_try_the_best_open_source_chat_solution_available_today}

{Login}', { + this.add('Accounts_Enrollment_Email', '

{Welcome_to Workspace_Name}

{Visit_Workspace_Url_and_try_the_best_open_source_chat_solution_available_today}

{Login}', { type: 'code', code: 'text/html', multiline: true, @@ -378,11 +378,11 @@ settings.addGroup('Email', function() { }); this.section('Registration_via_Admin', function() { - this.add('Accounts_UserAddedEmail_Subject', '{Welcome_to Site_Name}', { + this.add('Accounts_UserAddedEmail_Subject', '{Welcome_to Workspace_Name}', { type: 'string', i18nLabel: 'Subject', }); - this.add('Accounts_UserAddedEmail_Email', '

{Welcome_to Site_Name}

{Visit_Site_Url_and_try_the_best_open_source_chat_solution_available_today}

{Login}', { + this.add('Accounts_UserAddedEmail_Email', '

{Welcome_to Workspace_Name}

{Visit_Workspace_Url_and_try_the_best_open_source_chat_solution_available_today}

{Login}', { type: 'code', code: 'text/html', multiline: true, @@ -417,7 +417,7 @@ settings.addGroup('Email', function() { type: 'string', i18nLabel: 'Subject', }); - this.add('Invitation_Email', '

{Welcome_to Site_Name}

{Visit_Site_Url_and_try_the_best_open_source_chat_solution_available_today}

{Join_Chat}', { + this.add('Invitation_Email', '

{Welcome_to Workspace_Name}

{Visit_Workspace_Url_and_try_the_best_open_source_chat_solution_available_today}

{Join_Chat}', { type: 'code', code: 'text/html', multiline: true, @@ -447,7 +447,7 @@ settings.addGroup('Email', function() { i18nLabel: 'Subject', }); - this.add('Email_Changed_Email', '

{Hi},

{Your_email_address_has_changed}

{Your_new_email_is_email}

{Login}', { + this.add('Email_Changed_Email', '

{Hi},

{Your_email_address_has_changed}

{Your_new_email_is_email}

{Login}', { type: 'code', code: 'text/html', multiline: true, @@ -462,7 +462,7 @@ settings.addGroup('Email', function() { i18nLabel: 'Subject', }); - this.add('Password_Changed_Email', '

{Hi},

{Your_password_was_changed_by_an_admin}

{Your_temporary_password_is_password}

{Login}', { + this.add('Password_Changed_Email', '

{Hi},

{Your_password_was_changed_by_an_admin}

{Your_temporary_password_is_password}

{Login}', { type: 'code', code: 'text/html', multiline: true, diff --git a/app/lib/server/startup/settings.js b/app/lib/server/startup/settings.js index a4358bb58393a..64d8cd3d6fd70 100644 --- a/app/lib/server/startup/settings.js +++ b/app/lib/server/startup/settings.js @@ -818,12 +818,12 @@ settings.addGroup('General', function() { }, ], }); - this.add('Site_Url', typeof __meteor_runtime_config__ !== 'undefined' && __meteor_runtime_config__ !== null ? __meteor_runtime_config__.ROOT_URL : null, { + this.add('Workspace_Url', typeof __meteor_runtime_config__ !== 'undefined' && __meteor_runtime_config__ !== null ? __meteor_runtime_config__.ROOT_URL : null, { type: 'string', - i18nDescription: 'Site_Url_Description', + i18nDescription: 'Workspace_Description', public: true, }); - this.add('Site_Name', 'Rocket.Chat', { + this.add('Workspace_Name', 'Rocket.Chat', { type: 'string', public: true, wizard: { diff --git a/app/livechat/server/lib/OmniChannel.js b/app/livechat/server/lib/OmniChannel.js index fae27bb1e0230..65263a60b0ff5 100644 --- a/app/livechat/server/lib/OmniChannel.js +++ b/app/livechat/server/lib/OmniChannel.js @@ -12,7 +12,7 @@ export default { 'content-type': 'application/json', }, data: { - url: settings.get('Site_Url'), + url: settings.get('Workspace_Url'), }, }); return result.data; diff --git a/app/livestream/client/oauth.js b/app/livestream/client/oauth.js index e81ff871387b6..3c818275d4a25 100644 --- a/app/livestream/client/oauth.js +++ b/app/livestream/client/oauth.js @@ -12,6 +12,6 @@ export const close = (popup) => new Promise(function(resolve) { }); export const auth = async () => { - const oauthWindow = window.open(`${ settings.get('Site_Url') }/api/v1/livestream/oauth?userId=${ Meteor.userId() }`, 'youtube-integration-oauth', 'width=400,height=600'); + const oauthWindow = window.open(`${ settings.get('Workspace_Url') }/api/v1/livestream/oauth?userId=${ Meteor.userId() }`, 'youtube-integration-oauth', 'width=400,height=600'); return close(oauthWindow); }; diff --git a/app/livestream/server/routes.js b/app/livestream/server/routes.js index 3a52aec6031c2..64975e8dd6cfb 100644 --- a/app/livestream/server/routes.js +++ b/app/livestream/server/routes.js @@ -9,7 +9,7 @@ const { OAuth2 } = google.auth; API.v1.addRoute('livestream/oauth', { get: function functionName() { - const clientAuth = new OAuth2(settings.get('Broadcasting_client_id'), settings.get('Broadcasting_client_secret'), `${ settings.get('Site_Url') }/api/v1/livestream/oauth/callback`.replace(/\/{2}api/g, '/api')); + const clientAuth = new OAuth2(settings.get('Broadcasting_client_id'), settings.get('Broadcasting_client_secret'), `${ settings.get('Workspace_Url') }/api/v1/livestream/oauth/callback`.replace(/\/{2}api/g, '/api')); const { userId } = this.queryParams; const url = clientAuth.generateAuthUrl({ access_type: 'offline', @@ -35,7 +35,7 @@ API.v1.addRoute('livestream/oauth/callback', { const { userId } = JSON.parse(state); - const clientAuth = new OAuth2(settings.get('Broadcasting_client_id'), settings.get('Broadcasting_client_secret'), `${ settings.get('Site_Url') }/api/v1/livestream/oauth/callback`.replace(/\/{2}api/g, '/api')); + const clientAuth = new OAuth2(settings.get('Broadcasting_client_id'), settings.get('Broadcasting_client_secret'), `${ settings.get('Workspace_Url') }/api/v1/livestream/oauth/callback`.replace(/\/{2}api/g, '/api')); const ret = Meteor.wrapAsync(clientAuth.getToken.bind(clientAuth))(code); diff --git a/app/mailer/server/api.js b/app/mailer/server/api.js index 0ade57de27176..e7ef75b58ddf0 100644 --- a/app/mailer/server/api.js +++ b/app/mailer/server/api.js @@ -32,9 +32,9 @@ export const replace = function replace(str, data = {}) { return ''; } const options = { - Site_Name: Settings.get('Site_Name'), - Site_URL: Settings.get('Site_Url'), - Site_URL_Slash: Settings.get('Site_Url').replace(/\/?$/, '/'), + Workspace_Name: Settings.get('Workspace_Name'), + Workspace_URL: Settings.get('Workspace_Url'), + Workspace_URL_Slash: Settings.get('Workspace_Url').replace(/\/?$/, '/'), ...data.name && { fname: s.strLeft(data.name, ' '), lname: s.strRightBack(data.name, ' '), @@ -47,8 +47,8 @@ export const replace = function replace(str, data = {}) { const nonEscapeKeys = ['room_path']; export const replaceEscaped = (str, data = {}) => replace(str, { - Site_Name: escapeHTML(settings.get('Site_Name')), - Site_Url: escapeHTML(settings.get('Site_Url')), + Workspace_Name: escapeHTML(settings.get('Workspace_Name')), + Workspace_Url: escapeHTML(settings.get('Workspace_Url')), ...Object.entries(data).reduce((ret, [key, value]) => { ret[key] = nonEscapeKeys.includes(key) ? value : escapeHTML(value); return ret; diff --git a/app/metrics/server/lib/collectMetrics.js b/app/metrics/server/lib/collectMetrics.js index 66a24da4df911..fed00a0163656 100644 --- a/app/metrics/server/lib/collectMetrics.js +++ b/app/metrics/server/lib/collectMetrics.js @@ -22,7 +22,7 @@ const setPrometheusData = async () => { metrics.info.set({ version: Info.version, unique_id: settings.get('uniqueID'), - site_url: settings.get('Site_Url'), + site_url: settings.get('Workspace_Url'), }, 1); const sessions = Array.from(Meteor.server.sessions.values()); diff --git a/app/ui-master/server/inject.js b/app/ui-master/server/inject.js index 10cb94e51464d..50bdf3639424a 100644 --- a/app/ui-master/server/inject.js +++ b/app/ui-master/server/inject.js @@ -76,7 +76,7 @@ Meteor.startup(() => { + ``); }); - settings.get('Site_Name', (key, value = 'Rocket.Chat') => { + settings.get('Workspace_Name', (key, value = 'Rocket.Chat') => { const escapedValue = escapeHTML(value); injectIntoHead(key, `${ escapedValue }` diff --git a/app/ui/client/lib/iframeCommands.js b/app/ui/client/lib/iframeCommands.js index 5ad9003470b26..9a9b98b7c2b05 100644 --- a/app/ui/client/lib/iframeCommands.js +++ b/app/ui/client/lib/iframeCommands.js @@ -36,7 +36,7 @@ const commands = { }, event.origin); }; - const siteUrl = `${ Meteor.settings.Site_Url }/`; + const siteUrl = `${ Meteor.settings.Workspace_Url }/`; if (typeof data.redirectUrl !== 'string' || !data.redirectUrl.startsWith(siteUrl)) { data.redirectUrl = null; } diff --git a/app/utils/lib/getURL.js b/app/utils/lib/getURL.js index 4042d57414a10..615589d0cacbb 100644 --- a/app/utils/lib/getURL.js +++ b/app/utils/lib/getURL.js @@ -68,5 +68,5 @@ export const getURL = (path, { cdn = true, full = false, cloud = false, cloud_ro cloud_params, _cdn_prefix: settings.get('CDN_PREFIX'), _root_url_path_prefix: __meteor_runtime_config__.ROOT_URL_PATH_PREFIX, - _site_url: settings.get('Site_Url'), + _site_url: settings.get('Workspace_Url'), }); diff --git a/app/utils/lib/placeholders.js b/app/utils/lib/placeholders.js index ffb93e7312aeb..9bcb0d6691e77 100644 --- a/app/utils/lib/placeholders.js +++ b/app/utils/lib/placeholders.js @@ -8,8 +8,8 @@ export const placeholders = { return ''; } - str = str.replace(/\[Site_Name\]/g, settings.get('Site_Name') || ''); - str = str.replace(/\[Site_URL\]/g, settings.get('Site_Url') || ''); + str = str.replace(/\[Workspace_Name\]/g, settings.get('Workspace_Name') || ''); + str = str.replace(/\[Workspace_URL\]/g, settings.get('Workspace_Url') || ''); if (data) { str = str.replace(/\[name\]/g, data.name || ''); diff --git a/client/startup/unread.ts b/client/startup/unread.ts index 68197a3c47e42..fe18c7bcd4431 100644 --- a/client/startup/unread.ts +++ b/client/startup/unread.ts @@ -84,7 +84,7 @@ Meteor.startup(() => { window.favico = favicon; Tracker.autorun(() => { - const siteName = settings.get('Site_Name') ?? ''; + const siteName = settings.get('Workspace_Name') ?? ''; const unread = Session.get('unread'); fireGlobalEvent('unread-changed', unread); diff --git a/client/views/omnichannel/installation/Installation.js b/client/views/omnichannel/installation/Installation.js index 186737caa76b2..a125f2cf6dc9b 100644 --- a/client/views/omnichannel/installation/Installation.js +++ b/client/views/omnichannel/installation/Installation.js @@ -11,7 +11,7 @@ import Wrapper from './Wrapper'; const Installation = () => { const t = useTranslation(); - const siteUrl = useSetting('Site_Url')?.replace(/\/$/, ''); + const siteUrl = useSetting('Workspace_Url')?.replace(/\/$/, ''); const installString = `