add migration to update default button colors

RocketChat · Oct 14, 2024 · ab78098 · ab78098
1 parent 178ab95
commit ab78098
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/apps/meteor/app/meteor-accounts-saml/server/lib/settings.ts b/apps/meteor/app/meteor-accounts-saml/server/lib/settings.ts
@@ -106,7 +106,7 @@ const configureSamlService = function (samlConfigs: Record<string, any>): IServi
 	};
 };
 
-export const loadSamlServiceProviders = async function (): Promise<void> {
+export const loadSamlServiceProviders = async function (shouldNotify = true): Promise<void> {
 	const serviceName = 'saml';
 	const services = settings.getByRegexp(/^(SAML_Custom_)[a-z]+$/i);
 
@@ -121,7 +121,9 @@ export const loadSamlServiceProviders = async function (): Promise<void> {
 					const samlConfigs = getSamlConfigs(key);
 					SAMLUtils.log(key);
 					await LoginServiceConfiguration.createOrUpdateService(serviceName, samlConfigs);
-					void notifyOnLoginServiceConfigurationChangedByService(serviceName);
+					if (shouldNotify) {
+						void notifyOnLoginServiceConfigurationChangedByService(serviceName);
+					}
 					return configureSamlService(samlConfigs);
 				}
 
@@ -135,7 +137,9 @@ export const loadSamlServiceProviders = async function (): Promise<void> {
 					return false;
 				}
 
-				void notifyOnLoginServiceConfigurationChanged({ _id: service._id }, 'removed');
+				if (shouldNotify) {
+					void notifyOnLoginServiceConfigurationChanged({ _id: service._id }, 'removed');
+				}
 
 				return false;
 			}),

diff --git a/apps/meteor/server/lib/oauth/updateOAuthServices.ts b/apps/meteor/server/lib/oauth/updateOAuthServices.ts
@@ -15,7 +15,7 @@ import {
 import { settings } from '../../../app/settings/server/cached';
 import { logger } from './logger';
 
-export async function updateOAuthServices(): Promise<void> {
+export async function updateOAuthServices(shouldNotify = true): Promise<void> {
 	const services = settings.getByRegexp(/^(Accounts_OAuth_|Accounts_OAuth_Custom-)[a-z0-9_]+$/i);
 	const filteredServices = services.filter(([, value]) => typeof value === 'boolean');
 	for await (const [key, value] of filteredServices) {
@@ -117,12 +117,14 @@ export async function updateOAuthServices(): Promise<void> {
 			}
 
 			await LoginServiceConfiguration.createOrUpdateService(serviceKey, data);
-			void notifyOnLoginServiceConfigurationChangedByService(serviceKey);
+			if (shouldNotify) {
+				void notifyOnLoginServiceConfigurationChangedByService(serviceKey);
+			}
 		} else {
 			const service = await LoginServiceConfiguration.findOneByService(serviceName, { projection: { _id: 1 } });
 			if (service?._id) {
 				const { deletedCount } = await LoginServiceConfiguration.removeService(service._id);
-				if (deletedCount > 0) {
+				if (deletedCount > 0 && shouldNotify) {
 					void notifyOnLoginServiceConfigurationChanged({ _id: service._id }, 'removed');
 				}
 			}

diff --git a/apps/meteor/server/lib/refreshLoginServices.ts b/apps/meteor/server/lib/refreshLoginServices.ts
@@ -4,8 +4,8 @@ import { loadSamlServiceProviders } from '../../app/meteor-accounts-saml/server/
 import { updateCasServices } from './cas/updateCasService';
 import { updateOAuthServices } from './oauth/updateOAuthServices';
 
-export async function refreshLoginServices(): Promise<void> {
+export async function refreshLoginServices(shouldNotify = true): Promise<void> {
 	await ServiceConfiguration.configurations.removeAsync({});
 
-	await Promise.allSettled([updateOAuthServices(), loadSamlServiceProviders(), updateCasServices()]);
+	await Promise.allSettled([updateOAuthServices(shouldNotify), loadSamlServiceProviders(shouldNotify), updateCasServices()]);
 }
diff --git a/apps/meteor/server/startup/migrations/index.ts b/apps/meteor/server/startup/migrations/index.ts
@@ -43,5 +43,6 @@ import './v307';
 import './v308';
 import './v309';
 import './v310';
+import './v311';
 
 export * from './xrun';