diff --git a/packages/api/src/api/project.test.ts b/packages/api/src/api/project.test.ts index 0f2db192..8faacfcb 100644 --- a/packages/api/src/api/project.test.ts +++ b/packages/api/src/api/project.test.ts @@ -196,4 +196,54 @@ describe('project api', () => { }) expect(assetService.emptyTrash).toHaveBeenCalledWith('p1') }) + + it('POST /projects/:projectId/members', async () => { + vi.mocked(projectService.addProjectMember).mockResolvedValue(undefined) + + const res = await app.request('/projects/p1/members', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ userId: 'user2', role: 'editor' }), + }) + + expect(res.status).toBe(200) + const json = await res.json() + expect(json).toEqual({ success: true }) + expect(authzService.hasPermission).toHaveBeenCalledWith({ + user: expect.anything(), + permission: Permission.Admin, + type: ResourceType.Project, + id: 'p1', + }) + expect(projectService.addProjectMember).toHaveBeenCalledWith({ + projectId: 'p1', + userId: 'user2', + role: 'editor', + }) + }) + + it('GET /projects/:projectId/me', async () => { + vi.mocked(projectService.getProjectMe).mockResolvedValue({ + id: 'user1', + name: 'Test User', + role: 'editor', + }) + + const res = await app.request('/projects/p1/me') + + expect(res.status).toBe(200) + const json = await res.json() + expect(json).toEqual({ + id: 'user1', + name: 'Test User', + role: 'editor', + }) + expect(authzService.hasPermission).toHaveBeenCalledWith({ + user: expect.anything(), + permission: Permission.Read, + type: ResourceType.Project, + id: 'p1', + }) + expect(projectService.getProjectMe).toHaveBeenCalledWith('p1', 'user1') + }) }) diff --git a/packages/api/src/api/project.ts b/packages/api/src/api/project.ts index d493453a..1c08c4f4 100644 --- a/packages/api/src/api/project.ts +++ b/packages/api/src/api/project.ts @@ -10,6 +10,7 @@ import { listProjectsRequestSchema, recentlyDeletedRequestSchema, updateProjectMemberRoleRequestSchema, + addProjectMemberRequestSchema, } from '@shumai/dtos' import { listMembersQuerySchema } from '@shumai/dtos' import type { Prisma } from '@shumai/db' @@ -301,5 +302,43 @@ const route = new Hono<{ Variables: { user: User } }>() return c.json({ success: true }) }) + .post( + '/projects/:projectId/members', + zValidator('json', addProjectMemberRequestSchema), + async (c) => { + const user = c.get('user') + const projectId = c.req.param('projectId') + const req = c.req.valid('json') + + await authzService.hasPermission({ + user, + permission: Permission.Admin, + type: ResourceType.Project, + id: projectId, + }) + + await projectService.addProjectMember({ + projectId, + userId: req.userId, + role: req.role, + }) + + return c.json({ success: true }) + }, + ) + .get('/projects/:projectId/me', async (c) => { + const user = c.get('user') + const projectId = c.req.param('projectId') + + await authzService.hasPermission({ + user, + permission: Permission.Read, + type: ResourceType.Project, + id: projectId, + }) + + const me = await projectService.getProjectMe(projectId, user.id) + return c.json(me) + }) export default route diff --git a/packages/core/src/authz/authz.test.ts b/packages/core/src/authz/authz.test.ts index 2cdac183..7a706f76 100644 --- a/packages/core/src/authz/authz.test.ts +++ b/packages/core/src/authz/authz.test.ts @@ -397,4 +397,110 @@ describe('AuthzService', () => { projectId: project.id, }) }) + + describe('New project-precedent authz rules', () => { + it('should prioritize project-specific role over team role', async () => { + const user = await prisma.user.create({ + data: { name: 'Matt', email: 'matt@example.com', password: 'pass' }, + }) + const team = await prisma.team.create({ data: { name: 'Team Precedence' } }) + const project = await prisma.project.create({ + data: { name: 'Project Foo', teamId: team.id }, + }) + + // Matt is a team editor (which would normally give Edit permissions) + const tm = await prisma.teamMember.create({ + data: { teamId: team.id, userId: user.id, role: 'editor', scope: 'team' }, + }) + + // But Matt is specifically added to Project Foo as a reviewer (Read-only) + await prisma.projectMember.create({ + data: { projectId: project.id, teamMemberId: tm.id, role: 'reviewer' }, + }) + + // Check that Matt has Read permission on Project Foo + await expect( + authzService.hasPermission({ + type: ResourceType.Project, + id: project.id, + user, + permission: Permission.Read, + }), + ).resolves.toBeUndefined() + + // Check that Matt is DENIED Edit permission on Project Foo (even though they are team editor) + await expect( + authzService.hasPermission({ + type: ResourceType.Project, + id: project.id, + user, + permission: Permission.Edit, + }), + ).rejects.toThrow() + }) + + it('should fall back to team role if no project-specific role exists', async () => { + const user = await prisma.user.create({ + data: { name: 'Jane', email: 'jane@example.com', password: 'pass' }, + }) + const team = await prisma.team.create({ data: { name: 'Team Fallback' } }) + const project = await prisma.project.create({ + data: { name: 'Project Bar', teamId: team.id }, + }) + + // Jane is a team editor (scope: team) + await prisma.teamMember.create({ + data: { teamId: team.id, userId: user.id, role: 'editor', scope: 'team' }, + }) + + // Jane has no project-specific record on Project Bar, should fall back to team role (editor) + await expect( + authzService.hasPermission({ + type: ResourceType.Project, + id: project.id, + user, + permission: Permission.Edit, + }), + ).resolves.toBeUndefined() + }) + + it('should deny project-scoped user access to projects they are not member of', async () => { + const user = await prisma.user.create({ + data: { name: 'Guest', email: 'guest@example.com', password: 'pass' }, + }) + const team = await prisma.team.create({ data: { name: 'Team Guest' } }) + const projectA = await prisma.project.create({ data: { name: 'Project A', teamId: team.id } }) + const projectB = await prisma.project.create({ data: { name: 'Project B', teamId: team.id } }) + + // Guest is project-scoped + const tm = await prisma.teamMember.create({ + data: { teamId: team.id, userId: user.id, role: 'reviewer', scope: 'project' }, + }) + + // Guest is only added to Project A (as editor) + await prisma.projectMember.create({ + data: { projectId: projectA.id, teamMemberId: tm.id, role: 'editor' }, + }) + + // Guest can access Project A + await expect( + authzService.hasPermission({ + type: ResourceType.Project, + id: projectA.id, + user, + permission: Permission.Edit, + }), + ).resolves.toBeUndefined() + + // Guest CANNOT access Project B (denied) + await expect( + authzService.hasPermission({ + type: ResourceType.Project, + id: projectB.id, + user, + permission: Permission.Read, + }), + ).rejects.toThrow('User has only project scope') + }) + }) }) diff --git a/packages/core/src/authz/authz.ts b/packages/core/src/authz/authz.ts index ed3bf461..148ba4c9 100644 --- a/packages/core/src/authz/authz.ts +++ b/packages/core/src/authz/authz.ts @@ -50,37 +50,35 @@ export class AuthzService { if (!member) throw new HTTPException(403, { message: 'User is not a member of the team' }) - // 2. Check Scope + // 2. Check Project Membership first if project context is available + if (projectId) { + const pm = await prisma.projectMember.findUnique({ + where: { + projectIdTeamMemberId: { + projectId: projectId, + teamMemberId: member.id, + }, + }, + }) + if (pm) { + return this.checkRole(pm.role, req.permission) + } + } + + // 3. Fall back to Team scope checks if (member.scope === 'team') { return this.checkRole(member.role, req.permission) } - // 3. Scope is Project + // 4. Scope is Project, and no project-level record exists (or no project context was provided) if (!projectId) { // User has project scope but no project context provided (e.g. Team-level resource) - // If it's a team-level resource, project-scoped users shouldn't have access except for Read maybe? - // But usually team resources like Skills/Providers are managed by Team Owners/Editors. - // For now, let's keep the logic: project-scoped users can't access team-level resources unless it's Read (like ListProjects). + // If it's a team-level resource, project-scoped users can access Read (like ListProjects). if (req.permission === Permission.Read) { return } - throw new HTTPException(403, { message: 'User has only project scope' }) } - - // Check Project Membership - const pm = await prisma.projectMember.findUnique({ - where: { - projectIdTeamMemberId: { - projectId: projectId, - teamMemberId: member.id, - }, - }, - }) - - if (!pm) - throw new HTTPException(403, { message: `User is not a member of project ${projectId}` }) - - return this.checkRole(pm.role, req.permission) + throw new HTTPException(403, { message: 'User has only project scope' }) } private async resolveContext( diff --git a/packages/core/src/project/project.ts b/packages/core/src/project/project.ts index c840e444..47286575 100644 --- a/packages/core/src/project/project.ts +++ b/packages/core/src/project/project.ts @@ -342,6 +342,44 @@ export class ProjectService { }) } + async getProjectMe( + projectId: string, + userId: string, + ): Promise<{ id: string; name: string; role: string; image?: string }> { + const user = await prisma.user.findUnique({ + where: { id: userId }, + }) + if (!user) throw new Error('User not found') + + const project = await prisma.project.findUnique({ + where: { id: projectId }, + }) + if (!project) throw new Error('Project not found') + + const tm = await prisma.teamMember.findUnique({ + where: { + teamIdUserId: { teamId: project.teamId, userId }, + }, + }) + if (!tm) throw new Error('User is not a team member') + + const pm = await prisma.projectMember.findFirst({ + where: { + projectId, + teamMemberId: tm.id, + }, + }) + + const role = pm ? pm.role : tm.role + + return { + id: user.id, + name: user.name, + role: role, + image: await getAvatarUrl(user.image), + } + } + // eslint-disable-next-line @typescript-eslint/no-explicit-any private async toProjectInfo(p: any): Promise { const pi: ProjectInfo = { diff --git a/packages/dtos/src/project.ts b/packages/dtos/src/project.ts index 2df3c210..2d1e7430 100644 --- a/packages/dtos/src/project.ts +++ b/packages/dtos/src/project.ts @@ -110,3 +110,17 @@ export interface ServiceUpdateProjectMemberRoleRequest { userId: string role: 'editor' | 'reviewer' } + +export const addProjectMemberRequestSchema = z.object({ + userId: z.string(), + role: z.enum(['owner', 'editor', 'reviewer']), +}) +export type AddProjectMemberRequest = z.infer + +export const projectMeResponseSchema = z.object({ + id: z.string(), + name: z.string(), + role: z.enum(['owner', 'editor', 'reviewer', 'bot', 'unknown']), + image: z.string().optional(), +}) +export type ProjectMeResponse = z.infer diff --git a/packages/webui/components/breadcrumb-nav.tsx b/packages/webui/components/breadcrumb-nav.tsx index 24d2fc2b..a79aa2b6 100644 --- a/packages/webui/components/breadcrumb-nav.tsx +++ b/packages/webui/components/breadcrumb-nav.tsx @@ -71,7 +71,7 @@ export function BreadcrumbNav({ versions, }: BreadcrumbNavProps) { const navigate = useNavigate() - const { canEdit } = usePermissions() + const { canEdit } = usePermissions(projectId) const handleVersionClick = (versionId: string) => { if (!projectId || !fileId) return diff --git a/packages/webui/components/file-browser/file-browser.tsx b/packages/webui/components/file-browser/file-browser.tsx index c22584e2..d64214fe 100644 --- a/packages/webui/components/file-browser/file-browser.tsx +++ b/packages/webui/components/file-browser/file-browser.tsx @@ -453,7 +453,7 @@ export function FileBrowser({ const newVersionInputRef = useRef(null) const [targetVersionFileId, setTargetVersionFileId] = useState(null) const fileContextMenu = useRef(false) - const { canEdit, canAdmin } = usePermissions() + const { canEdit, canAdmin } = usePermissions(projectId) const scrollContainerRef = useRef(null) diff --git a/packages/webui/components/file-browser/toolbar.tsx b/packages/webui/components/file-browser/toolbar.tsx index 8c9f6b88..c7d7c675 100644 --- a/packages/webui/components/file-browser/toolbar.tsx +++ b/packages/webui/components/file-browser/toolbar.tsx @@ -49,7 +49,7 @@ export function FileBrowserToolbar({ onUpdateCollection, rootFolderId, }: FileBrowserToolbarProps) { - const { canEdit } = usePermissions() + const { canEdit } = usePermissions(projectId) const [popoverOpen, setPopoverOpen] = useState(false) const [searchDialogOpen, setSearchDialogOpen] = useState(false) const [manageDialogOpen, setManageDialogOpen] = useState(false) @@ -72,7 +72,7 @@ export function FileBrowserToolbar({ enabled: isCollection && !!assetId, }) - const { data: members } = useQuery({ + const { data: members, refetch: refetchProjectMembers } = useQuery({ queryKey: ['projects', projectId, 'members'], queryFn: async () => { const res = await client.api.projects[':projectId'].members.$get({ @@ -95,16 +95,29 @@ export function FileBrowserToolbar({ }, }) - const { data: me } = useQuery({ - queryKey: ['teams', teamInfo?.teamId, 'me'], + const { data: teamMembers } = useQuery({ + queryKey: ['teams', teamInfo?.teamId, 'members'], queryFn: async () => { - const res = await client.api.teams[':teamId'].me.$get({ + const res = await client.api.teams[':teamId'].members.$get({ param: { teamId: teamInfo?.teamId || '' }, + query: {}, }) - if (!res.ok) throw new Error('Failed to fetch me') + if (!res.ok) throw new Error('Failed to fetch team members') return await res.json() }, - enabled: !!teamInfo?.teamId, + enabled: !!teamInfo?.teamId && isMembersDialogOpen, + }) + + const { data: me, refetch: refetchMe } = useQuery({ + queryKey: ['projects', projectId, 'me'], + queryFn: async () => { + const res = await client.api.projects[':projectId'].me.$get({ + param: { projectId }, + }) + if (!res.ok) throw new Error('Failed to fetch project me') + return await res.json() + }, + enabled: !!projectId, }) const $inviteProject = client.api.projects[':projectId'].invite.$post @@ -122,6 +135,23 @@ export function FileBrowserToolbar({ }, }) + const $addProjectMember = client.api.projects[':projectId'].members.$post + const addProjectMemberMutation = useMutation< + InferResponseType, + Error, + InferRequestType + >({ + mutationFn: async (args) => { + const res = await $addProjectMember(args) + if (!res.ok) throw new Error('Failed to add project member') + return await res.json() + }, + onSuccess: () => { + queryClient.invalidateQueries({ queryKey: ['projects', projectId, 'members'] }) + queryClient.invalidateQueries({ queryKey: ['projects', projectId, 'me'] }) + }, + }) + const handleManageFields = () => { setPopoverOpen(false) setManageDialogOpen(true) @@ -135,6 +165,27 @@ export function FileBrowserToolbar({ return res.code } + const handleOpenMembersDialog = (open: boolean) => { + setIsMembersDialogOpen(open) + if (open) { + refetchProjectMembers() + refetchMe() + } + } + + const safeProjectMembers = Array.isArray(members) ? members : [] + const safeTeamMembers = Array.isArray(teamMembers) ? teamMembers : [] + const availableMembersToAdd = safeTeamMembers.filter( + (tm) => !safeProjectMembers.some((pm) => pm.id === tm.id), + ) + + const handleAddProjectMember = async (userId: string, role: 'editor' | 'reviewer' | 'owner') => { + await addProjectMemberMutation.mutateAsync({ + param: { projectId }, + json: { userId, role }, + }) + } + const updateMemberRoleMutation = useMutation({ mutationFn: async ({ userId, role }: { userId: string; role: 'editor' | 'reviewer' }) => { const res = await client.api.projects[':projectId'].members[':userId'].$patch({ @@ -304,7 +355,7 @@ export function FileBrowserToolbar({ {!isRecentlyDeleted && (
setIsMembersDialogOpen(true)} + onClick={() => handleOpenMembersDialog(true)} > {members?.slice(0, 3).map((member) => ( @@ -331,7 +382,7 @@ export function FileBrowserToolbar({ Promise onRemoveMember?: (memberId: string) => Promise currentUserId?: string + availableMembersToAdd?: Member[] + onAddMember?: (userId: string, role: 'editor' | 'reviewer') => Promise } export function MembersDialog({ @@ -53,12 +55,20 @@ export function MembersDialog({ onUpdateRole, onRemoveMember, currentUserId, + availableMembersToAdd, + onAddMember, }: MembersDialogProps) { const [inviteRole, setInviteRole] = useState<'editor' | 'reviewer'>('editor') const [inviteLink, setInviteLink] = useState(null) const [isGenerating, setIsGenerating] = useState(false) const [updatingMemberId, setUpdatingMemberId] = useState(null) const [memberToRemove, setMemberToRemove] = useState(null) + const [rolesToAdd, setRolesToAdd] = useState>({}) + const [addingMemberId, setAddingMemberId] = useState(null) + + const setRoleToAdd = (memberId: string, role: 'editor' | 'reviewer') => { + setRolesToAdd((prev) => ({ ...prev, [memberId]: role })) + } const handleUpdateRole = async (memberId: string, role: 'editor' | 'reviewer') => { if (!onUpdateRole) return @@ -127,6 +137,8 @@ export function MembersDialog({ if (!newOpen) { setInviteLink(null) setInviteRole('editor') + setRolesToAdd({}) + setAddingMemberId(null) } onOpenChange(newOpen) } @@ -219,7 +231,6 @@ export function MembersDialog({
))} - !open && setMemberToRemove(null)} @@ -242,8 +253,97 @@ export function MembersDialog({ - + {' '} + {isOwner && onAddMember && availableMembersToAdd && availableMembersToAdd.length > 0 && ( +
+

Add Team Member to Project

+
+ {availableMembersToAdd.map((member) => { + const currentRole = rolesToAdd[member.id!] || 'editor' + return ( +
+
+ + {member.image && ( + + )} + {getInitials(member.name)} + +
+ {member.name} + + {member.scope === 'team' ? 'Team Member' : 'Project Member'} + +
+
+
+ + + + + + + setRoleToAdd(member.id!, v as 'editor' | 'reviewer') + } + > + + Editor + + + Reviewer + + + + + + +
+
+ ) + })} +
+
+ )} {isOwner && onInvite && (

Invite New Member

diff --git a/packages/webui/hooks/use-permissions.ts b/packages/webui/hooks/use-permissions.ts index 149a2118..ad03ea22 100644 --- a/packages/webui/hooks/use-permissions.ts +++ b/packages/webui/hooks/use-permissions.ts @@ -22,20 +22,28 @@ export interface Permissions { * Reuses the same React Query cache key (['teams', teamId, 'me']) populated * by __root.tsx, so no extra API calls are made. */ -export function usePermissions(): Permissions { +export function usePermissions(projectId?: string): Permissions { const teamId = useTeamContextStore((s) => s.teamId) const { data: me } = useQuery({ - queryKey: ['teams', teamId, 'me'], + queryKey: projectId ? ['projects', projectId, 'me'] : ['teams', teamId, 'me'], queryFn: async () => { - if (!teamId) return null - const res = await client.api.teams[':teamId'].me.$get({ - param: { teamId }, - }) - if (!res.ok) throw new Error('Failed to fetch me') - return await res.json() + if (projectId) { + const res = await client.api.projects[':projectId'].me.$get({ + param: { projectId }, + }) + if (!res.ok) throw new Error('Failed to fetch project me') + return await res.json() + } else { + if (!teamId) return null + const res = await client.api.teams[':teamId'].me.$get({ + param: { teamId }, + }) + if (!res.ok) throw new Error('Failed to fetch team me') + return await res.json() + } }, - enabled: !!teamId, + enabled: projectId ? !!projectId : !!teamId, }) return useMemo( diff --git a/packages/webui/routes/__root.tsx b/packages/webui/routes/__root.tsx index 320f1f8d..af088cb5 100644 --- a/packages/webui/routes/__root.tsx +++ b/packages/webui/routes/__root.tsx @@ -10,10 +10,10 @@ import { useTeamContextStore } from '@/ui/stores/team-context' import { useUploadStore } from '@/ui/stores/upload' import { useQuery } from '@tanstack/react-query' import { - createRootRouteWithContext, - Outlet, - useNavigate, - useRouterState, + createRootRouteWithContext, + Outlet, + useNavigate, + useRouterState, } from '@tanstack/react-router' import { useEffect } from 'react'