From 22ce527d2875d22b4faa780cf8f3685ab1209090 Mon Sep 17 00:00:00 2001 From: Andrey Sobolev Date: Mon, 14 Oct 2024 17:34:03 +0700 Subject: [PATCH] Fix merge issue Signed-off-by: Andrey Sobolev --- server/middleware/src/spaceSecurity.ts | 14 -------------- .../telegram-bot/pod-telegram-bot/src/server.ts | 1 - 2 files changed, 15 deletions(-) diff --git a/server/middleware/src/spaceSecurity.ts b/server/middleware/src/spaceSecurity.ts index d1ad9311ae..a7e76eeba1 100644 --- a/server/middleware/src/spaceSecurity.ts +++ b/server/middleware/src/spaceSecurity.ts @@ -503,14 +503,6 @@ export class SpaceSecurityMiddleware extends BaseMiddleware implements Middlewar const isSpace = this.context.hierarchy.isDerived(_class, core.class.Space) const field = this.getKey(domain) - if ( - ctx.contextData.admin === true && - this.context.hierarchy.isDerived(_class, core.class.Space) && - (newQuery as DocumentQuery).members !== undefined - ) { - delete (newQuery as any).members - } - let clientFilterSpaces: Set> | undefined if ( @@ -571,12 +563,6 @@ export class SpaceSecurityMiddleware extends BaseMiddleware implements Middlewar } } } - if (ctx.contextData.admin === true && this.context.hierarchy.isDerived(_class, core.class.Space)) { - // We need to add amin to all spaces. - for (const d of findResult) { - ;(d as unknown as Space).members = [...((d as unknown as Space).members ?? []), ctx.contextData.account._id] - } - } return findResult } diff --git a/services/telegram-bot/pod-telegram-bot/src/server.ts b/services/telegram-bot/pod-telegram-bot/src/server.ts index 54e8a6a406..d2fb2274cc 100644 --- a/services/telegram-bot/pod-telegram-bot/src/server.ts +++ b/services/telegram-bot/pod-telegram-bot/src/server.ts @@ -209,7 +209,6 @@ export function createServer ( app.post( '/notify', wrapRequest(async (req, res, token) => { - ctx.info('Received notification', { email: token.email }) if (req.body == null || !Array.isArray(req.body)) { ctx.error('Invalid request body', { body: req.body, email: token.email }) throw new ApiError(400)