Skip to content

refactor(auth/repositories): drop redundant 'Capability[]' casts #1120

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
SeanCassiere merged 1 commit into from
Aug 5, 2026
+7 −13
Merged

refactor(auth/repositories): drop redundant 'Capability[]' casts #1120

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 7 additions & 13 deletions src/auth/repositories.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ export class DrizzleUserRepository implements IUserRepository {
image: user.image,
oauthImage: user.oauthImage,
displayUsername: user.displayUsername,
capabilities: user.capabilities as Capability[],
capabilities: user.capabilities,
adsDisabled: user.adsDisabled,
interestedInHidingAds: user.interestedInHidingAds,
lastUsedFramework: user.lastUsedFramework,
Expand Down Expand Up @@ -241,16 +241,13 @@ export class DrizzleCapabilitiesRepository implements ICapabilitiesRepository {
}

// Extract user capabilities (same for all rows)
const directCapabilities = (result[0]?.userCapabilities ||
[]) as Capability[]
const directCapabilities = result[0]?.userCapabilities ?? []

// Collect all role capabilities from all rows
const roleCapabilities = result
.map((r) => r.roleCapabilities)
.filter(
(caps): caps is Capability[] => caps !== null && Array.isArray(caps),
)
.flat() as Capability[]
.filter((caps) => caps !== null)
.flat()

// Union of direct capabilities and role capabilities
const effectiveCapabilities = Array.from(
Expand Down Expand Up @@ -288,18 +285,15 @@ export class DrizzleCapabilitiesRepository implements ICapabilitiesRepository {

// Store direct capabilities (same for all rows of the same user)
if (!userCapabilitiesMap[userId]) {
userCapabilitiesMap[userId] = (row.userCapabilities ||
[]) as Capability[]
userCapabilitiesMap[userId] = row.userCapabilities ?? []
}

// Collect role capabilities
if (row.roleCapabilities && Array.isArray(row.roleCapabilities)) {
if (row.roleCapabilities) {
if (!userRoleCapabilitiesMap[userId]) {
userRoleCapabilitiesMap[userId] = []
}
userRoleCapabilitiesMap[userId].push(
...(row.roleCapabilities as Capability[]),
)
userRoleCapabilitiesMap[userId].push(...row.roleCapabilities)
}
}

Expand Down
Loading