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
23 changes: 22 additions & 1 deletion packages/common/src/services/access/permissions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
accessRoles,
organizationUserToAccessRoles,
} from '@op/db/schema';
import { toBitField } from 'access-zones';
import { permission, toBitField } from 'access-zones';
import { and, eq } from 'drizzle-orm';

import { CommonError, NotFoundError } from '../../utils';
Expand Down Expand Up @@ -66,6 +66,27 @@ export async function createRole({
permission: toBitField(permissions),
});

// Scoped roles always get profile READ
if (zoneName !== 'profile') {
const profileZone = await tx.query.accessZones.findFirst({
where: { name: 'profile' },
});

if (profileZone) {
await tx.insert(accessRolePermissionsOnAccessZones).values({
accessRoleId: role.id,
accessZoneId: profileZone.id,
permission: permission.READ,
});
}
} else if (!permissions.read) {
// If creating on the profile zone but read wasn't set, force it
await tx
.update(accessRolePermissionsOnAccessZones)
.set({ permission: toBitField({ ...permissions, read: true }) })
.where(eq(accessRolePermissionsOnAccessZones.accessRoleId, role.id));
}

return {
id: role.id,
name: role.name,
Expand Down
25 changes: 25 additions & 0 deletions packages/common/src/services/decision/decisionRoles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,31 @@ export async function createDecisionRole({
}) {
const client = tx ?? db;

// Scoped roles on a decision process always get profile READ
if (permissions['profile']) {
const existing = permissions['profile'];
if (existing.type === 'acrud') {
permissions = {
...permissions,
profile: { type: 'acrud', value: { ...existing.value, read: true } },
};
}
} else {
permissions = {
...permissions,
profile: {
type: 'acrud',
value: {
admin: false,
create: false,
read: true,
update: false,
delete: false,
},
},
};
}

const zoneNames = Object.keys(permissions);
const zones = await Promise.all(
zoneNames.map((zoneName) =>
Expand Down
Loading