[IMPROVE] Replace Site_Name and Site_Url config name

.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

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) }`;
 	},

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

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

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],
 	};
 

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');
 }

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) {

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;

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) }<br/><br/>${ 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) }<br/><br/>${ 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',

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;
 	}

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', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><!-- If you delete this tag, the sky will fall on your head --><meta name="viewport" content="width=device-width" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Rocket.Chat Cloud</title></head><body bgcolor="#F7F8FA"><table class="body" bgcolor="#F7F8FA" width="100%"><tr><td><!-- HEADER --><table class="wrap" bgcolor="#F7F8FA"><tr><td class="header container"><div class="header-content"><table bgcolor="#F7F8FA" width="100%"><tr><td><img src="[Site_Url_Slash]assets/logo.png" alt="Rocket.chat" width="150px" /></td></tr></table></div></td></tr></table><!-- /HEADER --></td></tr><tr><td><!-- BODY --><table class="wrap"><tr><td class="container" bgcolor="#FFFFFF"><div class="content"><table><tr><td>', {
+		this.add('Email_Header', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><!-- If you delete this tag, the sky will fall on your head --><meta name="viewport" content="width=device-width" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Rocket.Chat Cloud</title></head><body bgcolor="#F7F8FA"><table class="body" bgcolor="#F7F8FA" width="100%"><tr><td><!-- HEADER --><table class="wrap" bgcolor="#F7F8FA"><tr><td class="header container"><div class="header-content"><table bgcolor="#F7F8FA" width="100%"><tr><td><img src="[Workspace_Url_Slash]assets/logo.png" alt="Rocket.chat" width="150px" /></td></tr></table></div></td></tr></table><!-- /HEADER --></td></tr><tr><td><!-- BODY --><table class="wrap"><tr><td class="container" bgcolor="#FFFFFF"><div class="content"><table><tr><td>', {
 			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', '<h2>{Welcome_to Site_Name}</h2><p>{Visit_Site_Url_and_try_the_best_open_source_chat_solution_available_today}</p><a class="btn" target="_blank" href="[Site_URL]">{Login}</a>', {
+		this.add('Accounts_Enrollment_Email', '<h2>{Welcome_to Workspace_Name}</h2><p>{Visit_Workspace_Url_and_try_the_best_open_source_chat_solution_available_today}</p><a class="btn" target="_blank" href="[Workspace_URL]">{Login}</a>', {
 			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', '<h2>{Welcome_to Site_Name}</h2><p>{Visit_Site_Url_and_try_the_best_open_source_chat_solution_available_today}</p><a class="btn" target="_blank" href="[Site_URL]">{Login}</a>', {
+		this.add('Accounts_UserAddedEmail_Email', '<h2>{Welcome_to Workspace_Name}</h2><p>{Visit_Workspace_Url_and_try_the_best_open_source_chat_solution_available_today}</p><a class="btn" target="_blank" href="[Workspace_URL]">{Login}</a>', {
 			type: 'code',
 			code: 'text/html',
 			multiline: true,
@@ -417,7 +417,7 @@ settings.addGroup('Email', function() {
 			type: 'string',
 			i18nLabel: 'Subject',
 		});
-		this.add('Invitation_Email', '<h2>{Welcome_to Site_Name}</h2><p>{Visit_Site_Url_and_try_the_best_open_source_chat_solution_available_today}</p><a class="btn" href="[Site_URL]">{Join_Chat}</a>', {
+		this.add('Invitation_Email', '<h2>{Welcome_to Workspace_Name}</h2><p>{Visit_Workspace_Url_and_try_the_best_open_source_chat_solution_available_today}</p><a class="btn" href="[Workspace_URL]">{Join_Chat}</a>', {
 			type: 'code',
 			code: 'text/html',
 			multiline: true,
@@ -447,7 +447,7 @@ settings.addGroup('Email', function() {
 			i18nLabel: 'Subject',
 		});
 
-		this.add('Email_Changed_Email', '<h2>{Hi},</h2><p>{Your_email_address_has_changed}</p><p>{Your_new_email_is_email}</p><a class="btn" target="_blank" href="[Site_URL]">{Login}</a>', {
+		this.add('Email_Changed_Email', '<h2>{Hi},</h2><p>{Your_email_address_has_changed}</p><p>{Your_new_email_is_email}</p><a class="btn" target="_blank" href="[Workspace_URL]">{Login}</a>', {
 			type: 'code',
 			code: 'text/html',
 			multiline: true,
@@ -462,7 +462,7 @@ settings.addGroup('Email', function() {
 			i18nLabel: 'Subject',
 		});
 
-		this.add('Password_Changed_Email', '<h2>{Hi},</h2><p>{Your_password_was_changed_by_an_admin}</p><p>{Your_temporary_password_is_password}</p><a class="btn" target="_blank" href="[Site_URL]">{Login}</a>', {
+		this.add('Password_Changed_Email', '<h2>{Hi},</h2><p>{Your_password_was_changed_by_an_admin}</p><p>{Your_temporary_password_is_password}</p><a class="btn" target="_blank" href="[Workspace_URL]">{Login}</a>', {
 			type: 'code',
 			code: 'text/html',
 			multiline: true,

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: {

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;

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

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

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;

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

app/ui-master/server/inject.js

@@ -76,7 +76,7 @@ Meteor.startup(() => {
 							+ `<meta name="theme-color" content="${ escapedValue }" />`);
 	});
 
-	settings.get('Site_Name', (key, value = 'Rocket.Chat') => {
+	settings.get('Workspace_Name', (key, value = 'Rocket.Chat') => {
 		const escapedValue = escapeHTML(value);
 		injectIntoHead(key,
 			`<title>${ escapedValue }</title>`

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;
 		}

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'),
 });

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

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

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 = `<!-- Start of Rocket.Chat Livechat Script -->
 	<script type="text/javascript">

client/views/setupWizard/steps/FinalStep.js

@@ -6,7 +6,7 @@ import { useTranslation } from '../../../contexts/TranslationContext';
 
 function FinalStep() {
 	const t = useTranslation();
-	const siteUrl = useSetting('Site_Url');
+	const siteUrl = useSetting('Workspace_Url');
 	const setShowSetupWizard = useSettingSetValue('Show_Setup_Wizard');
 
 	const handleClick = () => {

ee/app/license/server/startup.js

@@ -2,7 +2,7 @@ import { settings } from '../../../../app/settings/server';
 import { callbacks } from '../../../../app/callbacks';
 import { addLicense, setURL } from './license';
 
-settings.get('Site_Url', (key, value) => {
+settings.get('Workspace_Url', (key, value) => {
 	if (value) {
 		setURL(value);
 	}

packages/rocketchat-i18n/i18n/en.i18n.json

@@ -3665,9 +3665,6 @@
   "Sidebar_list_mode": "Sidebar Channel List Mode",
   "Sign_in_to_start_talking": "Sign in to start talking",
   "since_creation": "since %s",
-  "Site_Name": "Site Name",
-  "Site_Url": "Site URL",
-  "Site_Url_Description": "Example: https://chat.domain.com/",
   "Size": "Size",
   "Skip": "Skip",
   "Slack_Users": "Slack's Users CSV",
@@ -4432,6 +4429,9 @@
   "will_be_able_to": "will be able to",
   "Will_be_available_here_after_saving": "Will be available here after saving.",
   "Without_priority": "Without priority",
+  "Workspace_Name": "Workspace Name", 
+  "Workspace_Description": "Example: https://chat.domain.com/",
+  "Workspace_Url": "Workspace URL", 
   "Worldwide": "Worldwide",
   "Would_you_like_to_return_the_inquiry": "Would you like to return the inquiry?",
   "Would_you_like_to_return_the_queue": "Would you like to move back this room to the queue? All conversation history will be kept on the room.",

server/startup/migrations/index.js

@@ -222,4 +222,5 @@ import './v222';
 import './v223';
 import './v224';
 import './v225';
+import './v226';
 import './xrun';