chore: refactor the refresh oauth services function

apps/meteor/app/lib/server/methods/addOAuthService.ts

@@ -2,8 +2,8 @@ import type { ServerMethods } from '@rocket.chat/ui-contexts';
 import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
+import { addOAuthService } from '../../../../server/lib/oauth/addOAuthService';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
-import { addOAuthService } from '../functions/addOAuthService';
 
 declare module '@rocket.chat/ui-contexts' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention

apps/meteor/app/lib/server/methods/refreshOAuthService.ts

@@ -1,8 +1,7 @@
-import { Settings } from '@rocket.chat/models';
 import type { ServerMethods } from '@rocket.chat/ui-contexts';
 import { Meteor } from 'meteor/meteor';
-import { ServiceConfiguration } from 'meteor/service-configuration';
 
+import { refreshLoginServices } from '../../../../server/lib/refreshLoginServices';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 
 declare module '@rocket.chat/ui-contexts' {
@@ -29,8 +28,6 @@ Meteor.methods<ServerMethods>({
 			});
 		}
 
-		await ServiceConfiguration.configurations.removeAsync({});
-
-		await Settings.update({ _id: /^(Accounts_OAuth_|SAML_|CAS_).+/ }, { $set: { _updatedAt: new Date() } }, { multi: true });
+		await refreshLoginServices();
 	},
 });

apps/meteor/app/lib/server/startup/index.ts

@@ -1,10 +1,5 @@
-import { customOAuthServicesInit } from './oAuthServicesUpdate';
 import './rateLimiter';
 import './robots';
 import './settingsOnLoadCdnPrefix';
 import './settingsOnLoadDirectReply';
 import './settingsOnLoadSMTP';
-
-export const libStartup = async () => {
-	await customOAuthServicesInit();
-};

apps/meteor/app/meteor-accounts-saml/server/lib/settings.ts

@@ -1,5 +1,6 @@
+import type { SAMLConfiguration } from '@rocket.chat/core-typings';
+import { LoginServiceConfiguration } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
-import { ServiceConfiguration } from 'meteor/service-configuration';
 
 import { SystemLogger } from '../../../../server/lib/logger/system';
 import { settings, settingsRegistry } from '../../../settings/server';
@@ -17,13 +18,13 @@ import {
 	defaultMetadataCertificateTemplate,
 } from './constants';
 
-const getSamlConfigs = function (service: string): Record<string, any> {
-	const configs = {
+const getSamlConfigs = function (service: string): SAMLConfiguration {
+	const configs: SAMLConfiguration = {
 		buttonLabelText: settings.get(`${service}_button_label_text`),
 		buttonLabelColor: settings.get(`${service}_button_label_color`),
 		buttonColor: settings.get(`${service}_button_color`),
 		clientConfig: {
-			provider: settings.get(`${service}_provider`),
+			provider: settings.get<string>(`${service}_provider`),
 		},
 		entryPoint: settings.get(`${service}_entry_point`),
 		idpSLORedirectURL: settings.get(`${service}_idp_slo_redirect_url`),
@@ -115,19 +116,10 @@ export const loadSamlServiceProviders = async function (): Promise<void> {
 				if (value === true) {
 					const samlConfigs = getSamlConfigs(key);
 					SAMLUtils.log(key);
-					await ServiceConfiguration.configurations.upsertAsync(
-						{
-							service: serviceName.toLowerCase(),
-						},
-						{
-							$set: samlConfigs,
-						},
-					);
+					await LoginServiceConfiguration.createOrUpdateService(serviceName, samlConfigs);
 					return configureSamlService(samlConfigs);
 				}
-				await ServiceConfiguration.configurations.removeAsync({
-					service: serviceName.toLowerCase(),
-				});
+				await LoginServiceConfiguration.removeService(serviceName);
 				return false;
 			}),
 		)

apps/meteor/ee/server/configuration/oauth.ts

@@ -21,8 +21,8 @@ interface IOAuthUserIdentity {
 }
 
 interface IOAuthSettings {
-	mapChannels: string;
-	mergeRoles: string;
+	mapChannels: boolean;
+	mergeRoles: boolean;
 	rolesToSync: string;
 	rolesClaim: string;
 	groupsClaim: string;
@@ -34,13 +34,13 @@ const logger = new Logger('EECustomOAuth');
 
 function getOAuthSettings(serviceName: string): IOAuthSettings {
 	return {
-		mapChannels: settings.get(`Accounts_OAuth_Custom-${serviceName}-map_channels`) as string,
-		mergeRoles: settings.get(`Accounts_OAuth_Custom-${serviceName}-merge_roles`) as string,
-		rolesToSync: settings.get(`Accounts_OAuth_Custom-${serviceName}-roles_to_sync`) as string,
-		rolesClaim: settings.get(`Accounts_OAuth_Custom-${serviceName}-roles_claim`) as string,
-		groupsClaim: settings.get(`Accounts_OAuth_Custom-${serviceName}-groups_claim`) as string,
-		channelsAdmin: settings.get(`Accounts_OAuth_Custom-${serviceName}-channels_admin`) as string,
-		channelsMap: settings.get(`Accounts_OAuth_Custom-${serviceName}-groups_channel_map`) as string,
+		mapChannels: settings.get<boolean>(`Accounts_OAuth_Custom-${serviceName}-map_channels`),
+		mergeRoles: settings.get<boolean>(`Accounts_OAuth_Custom-${serviceName}-merge_roles`),
+		rolesToSync: settings.get<string>(`Accounts_OAuth_Custom-${serviceName}-roles_to_sync`),
+		rolesClaim: settings.get<string>(`Accounts_OAuth_Custom-${serviceName}-roles_claim`),
+		groupsClaim: settings.get<string>(`Accounts_OAuth_Custom-${serviceName}-groups_claim`),
+		channelsAdmin: settings.get<string>(`Accounts_OAuth_Custom-${serviceName}-channels_admin`),
+		channelsMap: settings.get<string>(`Accounts_OAuth_Custom-${serviceName}-groups_channel_map`),
 	};
 }