From 72769001cd0a3688971bcceba92ffc339796d76f Mon Sep 17 00:00:00 2001 From: Wonsuk Choi Date: Wed, 5 Aug 2026 14:56:56 +0900 Subject: [PATCH] refactor(auth/repositories): drop redundant 'Capability[]' casts --- src/auth/repositories.server.ts | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/auth/repositories.server.ts b/src/auth/repositories.server.ts index 225065bf2..74a4e6109 100644 --- a/src/auth/repositories.server.ts +++ b/src/auth/repositories.server.ts @@ -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, @@ -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( @@ -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) } }