Skip to content

Improve user teams access check for team members retrieval #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ben-fornefeld merged 2 commits into from
Apr 2, 2025
Merged

Improve user teams access check for team members retrieval #31

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d050c5
replace: custom team access check with utility function for better ha…
ben-fornefeld Apr 2, 2025
8adfc26
improve: latency for get-team-members server function
ben-fornefeld Apr 2, 2025
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
21 changes: 8 additions & 13 deletions src/server/team/get-team-members.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { authActionClient } from '@/lib/clients/action'
import { returnServerError } from '@/lib/utils/action'
import { logError } from '@/lib/clients/logger'
import { ERROR_CODES } from '@/configs/logs'
import { checkUserTeamAuthorization } from '@/lib/utils/server'

const GetTeamMembersSchema = z.object({
teamId: z.string().uuid(),
Expand All @@ -20,19 +21,6 @@ export const getTeamMembers = authActionClient
const { teamId } = parsedInput
const { user } = ctx

const { error: userTeamsRelationError } = await supabaseAdmin
.from('users_teams')
.select('*')
.eq('user_id', user.id)
.eq('team_id', teamId)
.single()

if (userTeamsRelationError) {
logError(ERROR_CODES.SUPABASE, userTeamsRelationError)

return returnServerError('User is not authorized to get team members')
}

const { data, error } = await supabaseAdmin
.from('users_teams')
.select('*')
Expand All @@ -42,6 +30,13 @@ export const getTeamMembers = authActionClient
throw error
}

const accessGranted =
data.findIndex((userTeam) => userTeam.user_id === user.id) !== -1

if (!accessGranted) {
return returnServerError('User is not authorized to get team members')
}

if (!data) {
return []
}
Expand Down