Skip to content

fix: update sessionUser teams for team-admin users #590

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
j-zimnowoda merged 3 commits into from
Nov 28, 2024
Merged

fix: update sessionUser teams for team-admin users #590

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49a4fcf
fix: update jwt for team-admin users
ferruhcihan Nov 26, 2024
4e1f3bf
Merge branch 'main' into APL-305
dennisvankekem Nov 27, 2024
42a6890
Merge branch 'main' into APL-305
CasLubbers Nov 27, 2024
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
2 changes: 1 addition & 1 deletion src/middleware/jwt.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export function getUser(user: JWT, otomi: OtomiStack): SessionUser {
} else if (!sessionUser.roles.includes('teamMember')) sessionUser.roles.push('teamMember')
// if in team-(not admin), remove 'team-' prefix
const teamId = group.substring(5)
if (group.substring(0, 5) === 'team-' && group !== 'team-admin' && !sessionUser.teams.includes(teamId)) {
if (group.substring(0, 5) === 'team-' && !sessionUser.teams.includes(teamId)) {
// we might be assigned team-* without that team yet existing in the values, so ignore those
const existing = otomi.db.getItemReference('teams', { id: teamId }, false)
if (existing) sessionUser.teams.push(teamId)
Expand Down