fix: linter fix

RocketChat · May 15, 2024 · 715e34f · 715e34f
1 parent 5b95b26
commit 715e34f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 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
@@ -3,7 +3,10 @@ import { LoginServiceConfiguration } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
 import { SystemLogger } from '../../../../server/lib/logger/system';
-import { notifyOnLoginServiceConfigurationChanged, notifyOnLoginServiceConfigurationChangedByService } from '../../../lib/server/lib/notifyListener';
+import {
+	notifyOnLoginServiceConfigurationChanged,
+	notifyOnLoginServiceConfigurationChangedByService,
+} from '../../../lib/server/lib/notifyListener';
 import { settings, settingsRegistry } from '../../../settings/server';
 import type { IServiceProviderOptions } from '../definition/IServiceProviderOptions';
 import { SAMLUtils } from './Utils';
@@ -122,11 +125,11 @@ export const loadSamlServiceProviders = async function (): Promise<void> {
 					return configureSamlService(samlConfigs);
 				}
 
-				const { _id } = await LoginServiceConfiguration.findOneByService(serviceName, { projection: { _id: 1 } });
-				if (_id) {
-					const { deletedCount } = await LoginServiceConfiguration.removeService(_id);
+				const service = await LoginServiceConfiguration.findOneByService(serviceName, { projection: { _id: 1 } });
+				if (service?._id) {
+					const { deletedCount } = await LoginServiceConfiguration.removeService(service._id);
 					if (deletedCount === 1) {
-						void notifyOnLoginServiceConfigurationChanged({ _id }, 'removed');
+						void notifyOnLoginServiceConfigurationChanged({ _id: service._id }, 'removed');
 					}
 				}
 

diff --git a/apps/meteor/server/lib/oauth/updateOAuthServices.ts b/apps/meteor/server/lib/oauth/updateOAuthServices.ts
@@ -116,11 +116,11 @@ export async function updateOAuthServices(): Promise<void> {
 			await LoginServiceConfiguration.createOrUpdateService(serviceKey, data);
 			void notifyOnLoginServiceConfigurationChangedByService(serviceKey);
 		} else {
-			const { _id } = await LoginServiceConfiguration.findOneByService(serviceName, { projection: { _id: 1 } });
-			if (_id) {
-				const { deletedCount } = await LoginServiceConfiguration.removeService(_id);
+			const service = await LoginServiceConfiguration.findOneByService(serviceName, { projection: { _id: 1 } });
+			if (service?._id) {
+				const { deletedCount } = await LoginServiceConfiguration.removeService(service._id);
 				if (deletedCount === 1) {
-					void notifyOnLoginServiceConfigurationChanged({ _id }, 'removed');
+					void notifyOnLoginServiceConfigurationChanged({ _id: service._id }, 'removed');
 				}
 			}
 		}

diff --git a/packages/model-typings/src/models/ILoginServiceConfigurationModel.ts b/packages/model-typings/src/models/ILoginServiceConfigurationModel.ts
@@ -9,5 +9,8 @@ export interface ILoginServiceConfigurationModel extends IBaseModel<LoginService
 		serviceData: Partial<LoginServiceConfiguration>,
 	): Promise<LoginServiceConfiguration['_id']>;
 	removeService(_id: LoginServiceConfiguration['_id']): Promise<DeleteResult>;
-	findOneByService(serviceName: LoginServiceConfiguration['service'], options?: FindOptions<ILoginServiceConfiguration>): Promise<LoginServiceConfiguration | null>;
+	findOneByService(
+		serviceName: LoginServiceConfiguration['service'],
+		options?: FindOptions<ILoginServiceConfiguration>,
+	): Promise<LoginServiceConfiguration | null>;
 }