Skip to content

Commit 9607661

Browse files
committed
fix lint and tsc
1 parent 0c44373 commit 9607661

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

apps/meteor/ee/server/hooks/federation/index.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
import { FederationMatrix, Authorization, MeteorError, Room } from '@rocket.chat/core-services';
22
import { isEditedMessage, isRoomNativeFederated, isUserNativeFederated } from '@rocket.chat/core-typings';
33
import type { IRoomNativeFederated, IMessage, IRoom, IUser } from '@rocket.chat/core-typings';
4-
import { validateFederatedUsername, FederationValidationError, isFederationDomainAllowedForUsernames } from '@rocket.chat/federation-matrix';
4+
import {
5+
validateFederatedUsername,
6+
FederationValidationError,
7+
isFederationDomainAllowedForUsernames,
8+
} from '@rocket.chat/federation-matrix';
59
import { Rooms } from '@rocket.chat/models';
610

711
import { callbacks } from '../../../../server/lib/callbacks';
@@ -257,7 +261,6 @@ callbacks.add(
257261
throw new Meteor.Error(
258262
'federation-policy-denied',
259263
"Action Blocked. Communication with one of the domains in the list is restricted by your organization's security policy.",
260-
{ method: 'createRoom' },
261264
);
262265
}
263266

ee/packages/federation-matrix/src/FederationMatrix.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,14 @@ import {
88
UserStatus,
99
} from '@rocket.chat/core-typings';
1010
import type { MessageQuoteAttachment, IMessage, IRoom, IUser, IRoomNativeFederated } from '@rocket.chat/core-typings';
11-
import { eventIdSchema, roomIdSchema, userIdSchema, federationSDK, FederationRequestError, FederationValidationError } from '@rocket.chat/federation-sdk';
11+
import {
12+
eventIdSchema,
13+
roomIdSchema,
14+
userIdSchema,
15+
federationSDK,
16+
FederationRequestError,
17+
FederationValidationError,
18+
} from '@rocket.chat/federation-sdk';
1219
import type { EventID, UserID, FileMessageType, PresenceState } from '@rocket.chat/federation-sdk';
1320
import { Logger } from '@rocket.chat/logger';
1421
import { Users, Subscriptions, Messages, Rooms, Settings } from '@rocket.chat/models';
@@ -207,7 +214,7 @@ export class FederationMatrix extends ServiceClass implements IFederationMatrixS
207214
this.processEDUPresence = (await Settings.getValueById<boolean>('Federation_Service_EDU_Process_Presence')) || false;
208215
}
209216

210-
static async validateFederatedUsers(usernames: string[]): Promise<void> {
217+
async validateFederatedUsers(usernames: string[]): Promise<void> {
211218
const hasInvalidFederatedUsername = usernames.some((username) => !validateFederatedUsername(username));
212219
if (hasInvalidFederatedUsername) {
213220
throw new FederationValidationError(

packages/core-services/src/types/IFederationMatrixService.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,5 @@ export interface IFederationMatrixService {
2929
notifyUserTyping(rid: string, user: string, isTyping: boolean): Promise<void>;
3030
verifyMatrixIds(matrixIds: string[]): Promise<{ [key: string]: string }>;
3131
handleInvite(subscriptionId: ISubscription['_id'], userId: IUser['_id'], action: 'accept' | 'reject'): Promise<void>;
32+
validateFederatedUsers(usernames: string[]): Promise<void>;
3233
}

0 commit comments

Comments
 (0)