@axium/storage 0.18.2 → 0.18.3

package/dist/server/api.js

@@ -1,4 +1,5 @@
 import { getConfig } from '@axium/core';
+import * as acl from '@axium/server/acl';
 import { authRequestForItem, checkAuthForUser, requireSession } from '@axium/server/auth';
 import { database } from '@axium/server/database';
 import { error, json, parseBody, withError } from '@axium/server/requests';
@@ -9,7 +10,6 @@ import { batchFormatVersion, StorageItemInit, StorageItemUpdate, syncProtocolVer
 import '../polyfills.js';
 import { getLimits } from './config.js';
 import { deleteRecursive, getRecursive, getUserStats, parseItem } from './db.js';
-import { from as aclFrom } from '@axium/server/acl';
 import { checkNewItem, createNewItem, startUpload } from './item.js';
 addRoute({
     path: '/api/storage',
@@ -89,7 +89,7 @@ addRoute({
             error(409, 'Item is not a directory');
         const items = await database
             .selectFrom('storage')
-            .select(aclFrom('storage'))
+            .select(acl.from('storage'))
             .where('parentId', '=', itemId)
             .where('trashedAt', 'is', null)
             .selectAll()
@@ -141,7 +141,7 @@ addRoute({
         await checkAuthForUser(request, userId);
         const items = await database
             .selectFrom('storage')
-            .select(aclFrom('storage'))
+            .select(acl.from('storage'))
             .where('userId', '=', userId)
             .where('trashedAt', 'is', null)
             .where('parentId', 'is', null)
@@ -151,20 +151,6 @@ addRoute({
         return items.map(parseItem);
     },
 });
-function existsInACL(column, user) {
-    return (eb) => eb.exists(eb
-        .selectFrom('acl.storage')
-        .whereRef('itemId', '=', `item.${column}`)
-        .where('userId', '=', user.id)
-        .where(eb => {
-        const ors = [eb('userId', '=', user.id)];
-        if (user.roles.length)
-            ors.push(eb('role', 'in', user.roles));
-        if (user.tags.length)
-            ors.push(eb('tag', 'in', user.tags));
-        return eb.or(ors);
-    }));
-}
 addRoute({
     path: '/api/users/:id/storage/shared',
     params: { id: z.uuid() },
@@ -175,10 +161,10 @@ addRoute({
         const items = await database
             .selectFrom('storage as item')
             .selectAll('item')
-            .select(aclFrom('storage', { alias: 'item' }))
+            .select(acl.from('storage', { alias: 'item' }))
             .where('trashedAt', 'is', null)
-            .where(existsInACL('id', user))
-            .where(eb => eb.not(existsInACL('parentId', user)))
+            .where(acl.existsIn('storage', user, { alias: 'item' }))
+            .where(eb => eb.not(acl.existsIn('storage', user, { alias: 'item', itemId: 'parentId' })))
             .execute()
             .catch(withError('Could not get storage items'));
         return items.map(parseItem);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/storage",
-	"version": "0.18.2",
+	"version": "0.18.3",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"description": "User file storage for Axium",
 	"funding": {
@@ -41,7 +41,7 @@
 	"peerDependencies": {
 		"@axium/client": ">=0.14.2",
 		"@axium/core": ">=0.19.0",
-		"@axium/server": ">=0.35.0",
+		"@axium/server": ">=0.36.0",
 		"@sveltejs/kit": "^2.27.3",
 		"utilium": "^2.3.8"
 	},