watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-10 15:47:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #2873 from RayeEvtuch/website-transfer-permissions

Browse source 
Allow Team Managers to transfer websites to teams
This commit is contained in:
Mike Cao 2024-08-05 10:30:04 -07:00 • committed by GitHub
commit 36663bd52d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/(main)/settings/websites/[websiteId]/WebsiteTransferForm.tsx
View file

@ -71,7 +71,7 @@ export function WebsiteTransferForm({
{result.data {result.data
.filter(({ teamUser }) => .filter(({ teamUser }) =>
teamUser.find( teamUser.find(
({ role, userId }) => role === ROLES.teamOwner && userId === user.id, ({ role, userId }) => [ ROLES.teamOwner, ROLES.teamManager ].includes(role) && userId === user.id,
), ),
) )
.map(({ id, name }) => { .map(({ id, name }) => {

4
src/lib/auth.ts
View file

@ -106,7 +106,7 @@ export async function canTransferWebsiteToUser({ user }: Auth, websiteId: string
if (website.teamId && user.id === userId) { if (website.teamId && user.id === userId) {
const teamUser = await getTeamUser(website.teamId, userId); const teamUser = await getTeamUser(website.teamId, userId);
return teamUser?.role === ROLES.teamOwner; return teamUser && hasPermission(teamUser.role, PERMISSIONS.websiteTransferToUser);
} }
return false; return false;
@ -118,7 +118,7 @@ export async function canTransferWebsiteToTeam({ user }: Auth, websiteId: string
if (website.userId && website.userId === user.id) { if (website.userId && website.userId === user.id) {
const teamUser = await getTeamUser(teamId, user.id); const teamUser = await getTeamUser(teamId, user.id);
return teamUser?.role === ROLES.teamOwner; return teamUser && hasPermission(teamUser.role, PERMISSIONS.websiteTransferToTeam);
} }
return false; return false;

5
src/lib/constants.ts
View file

@ -151,6 +151,8 @@ export const PERMISSIONS = {
websiteCreate: 'website:create', websiteCreate: 'website:create',
websiteUpdate: 'website:update', websiteUpdate: 'website:update',
websiteDelete: 'website:delete', websiteDelete: 'website:delete',
websiteTransferToTeam: 'website:transfer-to-team',
websiteTransferToUser: 'website:transfer-to-user',
teamCreate: 'team:create', teamCreate: 'team:create',
teamUpdate: 'team:update', teamUpdate: 'team:update',
teamDelete: 'team:delete', teamDelete: 'team:delete',
@ -171,12 +173,15 @@ export const ROLE_PERMISSIONS = {
PERMISSIONS.websiteCreate, PERMISSIONS.websiteCreate,
PERMISSIONS.websiteUpdate, PERMISSIONS.websiteUpdate,
PERMISSIONS.websiteDelete, PERMISSIONS.websiteDelete,
PERMISSIONS.websiteTransferToTeam,
PERMISSIONS.websiteTransferToUser,
], ],
[ROLES.teamManager]: [ [ROLES.teamManager]: [
PERMISSIONS.teamUpdate, PERMISSIONS.teamUpdate,
PERMISSIONS.websiteCreate, PERMISSIONS.websiteCreate,
PERMISSIONS.websiteUpdate, PERMISSIONS.websiteUpdate,
PERMISSIONS.websiteDelete, PERMISSIONS.websiteDelete,
PERMISSIONS.websiteTransferToTeam,
], ],
[ROLES.teamMember]: [ [ROLES.teamMember]: [
PERMISSIONS.websiteCreate, PERMISSIONS.websiteCreate,