Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@ jobs:
run: node common/scripts/install-run-rush.js install
- name: Rush validate
run: node common/scripts/install-run-rush.js validate --verbose
- name: Formatting...
run: node common/scripts/install-run-rush.js format --force
- name: Check files formatting
run: |
echo '================================================================'
echo 'Checking for diff files'
echo '================================================================'
git diff '*.js' '*.ts' '*.svelte' '*.json' '*.yaml' | cat
[ -z "$(git diff --name-only '*.js' '*.ts' '*.svelte' '*.json' '*.yaml' | cat)" ]
echo '================================================================'
- name: Prepare server
run: |
cd ./tests
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@hcengineering/middleware",
"comment": "Fix formatting",
"type": "none"
}
],
"packageName": "@hcengineering/middleware"
}
9 changes: 7 additions & 2 deletions packages/middleware/src/spacePermissions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,15 @@ export class SpacePermissionsMiddleware extends BaseMiddleware implements Middle
private checkPermission (ctx: MeasureContext<SessionData>, space: Ref<TypedSpace>, tx: TxCUD<Doc>): boolean {
const account = ctx.contextData.account
const permissions = this.permissionsBySpace[space]?.[account.uuid] ?? []
let withoutMatch: Permission | undefined = undefined
let withoutMatch: Permission | undefined
for (const permission of permissions) {
if (permission.txClass === undefined || permission.txClass !== tx._class) continue
if (permission.objectClass !== undefined && !this.context.hierarchy.isDerived(tx.objectClass, permission.objectClass)) continue
if (
permission.objectClass !== undefined &&
!this.context.hierarchy.isDerived(tx.objectClass, permission.objectClass)
) {
continue
}
if (permission.txMatch === undefined) {
withoutMatch = permission
continue
Expand Down