@@ -118,7 +118,7 @@ export class DrizzleUserRepository implements IUserRepository {
118118 image : user . image ,
119119 oauthImage : user . oauthImage ,
120120 displayUsername : user . displayUsername ,
121- capabilities : user . capabilities as Capability [ ] ,
121+ capabilities : user . capabilities ,
122122 adsDisabled : user . adsDisabled ,
123123 interestedInHidingAds : user . interestedInHidingAds ,
124124 lastUsedFramework : user . lastUsedFramework ,
@@ -241,16 +241,13 @@ export class DrizzleCapabilitiesRepository implements ICapabilitiesRepository {
241241 }
242242
243243 // Extract user capabilities (same for all rows)
244- const directCapabilities = ( result [ 0 ] ?. userCapabilities ||
245- [ ] ) as Capability [ ]
244+ const directCapabilities = result [ 0 ] ?. userCapabilities ?? [ ]
246245
247246 // Collect all role capabilities from all rows
248247 const roleCapabilities = result
249248 . map ( ( r ) => r . roleCapabilities )
250- . filter (
251- ( caps ) : caps is Capability [ ] => caps !== null && Array . isArray ( caps ) ,
252- )
253- . flat ( ) as Capability [ ]
249+ . filter ( ( caps ) => caps !== null )
250+ . flat ( )
254251
255252 // Union of direct capabilities and role capabilities
256253 const effectiveCapabilities = Array . from (
@@ -288,18 +285,15 @@ export class DrizzleCapabilitiesRepository implements ICapabilitiesRepository {
288285
289286 // Store direct capabilities (same for all rows of the same user)
290287 if ( ! userCapabilitiesMap [ userId ] ) {
291- userCapabilitiesMap [ userId ] = ( row . userCapabilities ||
292- [ ] ) as Capability [ ]
288+ userCapabilitiesMap [ userId ] = row . userCapabilities ?? [ ]
293289 }
294290
295291 // Collect role capabilities
296- if ( row . roleCapabilities && Array . isArray ( row . roleCapabilities ) ) {
292+ if ( row . roleCapabilities ) {
297293 if ( ! userRoleCapabilitiesMap [ userId ] ) {
298294 userRoleCapabilitiesMap [ userId ] = [ ]
299295 }
300- userRoleCapabilitiesMap [ userId ] . push (
301- ...( row . roleCapabilities as Capability [ ] ) ,
302- )
296+ userRoleCapabilitiesMap [ userId ] . push ( ...row . roleCapabilities )
303297 }
304298 }
305299
0 commit comments