Skip to content

Commit b00fa81

Browse files
committed
simplify code
1 parent 281b200 commit b00fa81

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

ee/packages/federation-matrix/src/api/_matrix/invite.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -355,17 +355,12 @@ export const getMatrixInviteRoutes = (services: HomeserverServices) => {
355355
throw new Error('user not found not processing invite');
356356
}
357357

358-
const authenticatedServer = c.get('authenticatedServer');
359-
if (!authenticatedServer) {
360-
throw new Error('Missing authenticated server from request');
361-
}
362-
363358
const inviteEvent = await invite.processInvite(
364359
event,
365360
roomIdSchema.parse(roomId),
366361
eventIdSchema.parse(eventId),
367362
roomVersion,
368-
authenticatedServer,
363+
c.get('authenticatedServer'),
369364
);
370365

371366
setTimeout(

ee/packages/federation-matrix/src/api/middlewares/canAccessResource.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ function extractEntityId(
2727
const canAccessResource = (federationAuth: EventAuthorizationService, entityType: 'event' | 'media' | 'room') =>
2828
createMiddleware(async (c, next) => {
2929
try {
30-
const authenticatedServer = c.get('authenticatedServer');
31-
if (!authenticatedServer) {
32-
return c.json({ errcode: 'M_UNAUTHORIZED', error: 'Missing Authorization header' }, 401);
33-
}
34-
3530
const mediaId = c.req.param('mediaId');
3631
const eventId = c.req.param('eventId');
3732
const roomId = c.req.param('roomId');
@@ -41,7 +36,7 @@ const canAccessResource = (federationAuth: EventAuthorizationService, entityType
4136
return c.json({ errcode: 'M_INVALID_PARAM', error: `Missing required ${entityType} identifier` }, 400);
4237
}
4338

44-
const resourceAccess = await federationAuth.canAccessResource(entityType, resourceId, authenticatedServer);
39+
const resourceAccess = await federationAuth.canAccessResource(entityType, resourceId, c.get('authenticatedServer'));
4540
if (!resourceAccess) {
4641
return c.json(
4742
{

0 commit comments

Comments
 (0)