wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-13 03:40:48 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Add user to public document space on mention (#5587)

Browse Source 
Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
This commit is contained in:
Kristina 2024-05-13 17:32:13 +04:00 committed by GitHub
parent e22f23d92a
commit f560afe0b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
models/server-activity/src/index.ts
View File

@ -27,7 +27,8 @@ export function createModel (builder: Builder): void {
txMatch: {
collection: 'reactions',
_class: core.class.TxCollectionCUD
}
},
isAsync: true
})
builder.createDoc(serverCore.class.Trigger, core.space.Model, {

25
server-plugins/activity-resources/src/references.ts
View File

@ -107,13 +107,13 @@ export async function getPersonNotificationTxes (
return []
}
const isAvailable = await isSpaceAvailable(receiver, space, control)
const res: Tx[] = []
const isAvailable = await checkSpace(receiver, space, control, res)
if (!isAvailable) {
return []
}
const res: Tx[] = []
const doc = (await control.findAll(reference.srcDocClass, { _id: reference.srcDocId }))[0]
const collaboratorsTx = await getCollaboratorsTxes(reference, control, receiver, doc)
@ -215,14 +215,25 @@ export async function getPersonNotificationTxes (
return res
}
async function isSpaceAvailable (user: PersonAccount, spaceId: Ref<Space>, control: TriggerControl): Promise<boolean> {
async function checkSpace (
user: PersonAccount,
spaceId: Ref<Space>,
control: TriggerControl,
res: Tx[]
): Promise<boolean> {
const space = (await control.findAll<Space>(core.class.Space, { _id: spaceId }))[0]
if (!space?.private) {
return true
const isMember = space.members.includes(user._id)
if (space.private) {
return isMember
}
return space.members.includes(user._id)
if (!isMember) {
res.push(
control.txFactory.createTxUpdateDoc(space._class, space.space, space._id, { $push: { members: user._id } })
)
}
return true
}
async function getCollaboratorsTxes (

14
server/middleware/src/spaceSecurity.ts
View File

@ -326,14 +326,20 @@ export class SpaceSecurityMiddleware extends BaseMiddleware implements Middlewar
if (tx.objectSpace === (account._id as string)) {
targets = [account.email, systemAccountEmail]
} else {
const cudTx = tx as TxCUD<Doc>
const isSpace = h.isDerived(cudTx.objectClass, core.class.Space)
if (isSpace) {
return undefined
}
const space = this.spacesMap.get(tx.objectSpace)
if (space !== undefined) {
targets = await this.getTargets(space.members)
if (!isOwner(account, ctx)) {
const cudTx = tx as TxCUD<Doc>
const isSpace = h.isDerived(cudTx.objectClass, core.class.Space)
const allowed = this.getAllAllowedSpaces(account, !isSpace)
if (allowed === undefined || !allowed.includes(isSpace ? (cudTx.objectId as Ref<Space>) : tx.objectSpace)) {
const allowed = this.getAllAllowedSpaces(account, true)
if (allowed === undefined || !allowed.includes(tx.objectSpace)) {
throw new PlatformError(new Status(Severity.ERROR, platform.status.Forbidden, {}))
}
} else if (!targets.includes(account.email)) {