@axium/server 0.34.2 → 0.35.0

package/dist/api/acl.js

@@ -2,7 +2,7 @@ import * as z from 'zod';
 import * as acl from '../acl.js';
 import { error, parseBody, withError } from '../requests.js';
 import { addRoute } from '../routes.js';
-import { checkAuthForItem } from '../auth.js';
+import { authRequestForItem } from '../auth.js';
 import { AccessControlUpdate, AccessTarget } from '@axium/core';
 function getTable(itemType) {
     const tables = acl.listTables();
@@ -23,19 +23,19 @@ addRoute({
     async PATCH(request, { itemType, itemId }) {
         const table = getTable(itemType);
         const { target, permissions } = await parseBody(request, AccessControlUpdate);
-        await checkAuthForItem(request, itemType, itemId, { manage: true });
+        await authRequestForItem(request, itemType, itemId, { manage: true });
         return await acl.update(table, itemId, target, permissions);
     },
     async PUT(request, { itemType, itemId }) {
         const table = getTable(itemType);
         const target = await parseBody(request, AccessTarget);
-        await checkAuthForItem(request, itemType, itemId, { manage: true });
+        await authRequestForItem(request, itemType, itemId, { manage: true });
         return await acl.add(table, itemId, target);
     },
     async DELETE(request, { itemType, itemId }) {
         const table = getTable(itemType);
         const target = await parseBody(request, AccessTarget);
-        await checkAuthForItem(request, itemType, itemId, { manage: true });
+        await authRequestForItem(request, itemType, itemId, { manage: true });
         return await acl.remove(table, itemId, target);
     },
 });

package/dist/auth.d.ts

@@ -41,8 +41,9 @@ export interface ItemAuthResult<TB extends acl.TargetName> {
     user?: UserInternal;
     session?: SessionInternal;
 }
+export declare function authSessionForItem<const TB extends acl.TargetName>(itemType: TB, itemId: string, permissions: Partial<acl.PermissionsFor<`acl.${TB}`>>, session?: SessionAndUser | null): Promise<ItemAuthResult<TB>>;
 /**
  * Authenticate a request against an "item" which has an ACL table.
  * This will fetch the item, ACLs, users, and the authenticating session.
  */
-export declare function checkAuthForItem<const TB extends acl.TargetName>(request: Request, itemType: TB, itemId: string, permissions: Partial<acl.PermissionsFor<`acl.${TB}`>>): Promise<ItemAuthResult<TB>>;
+export declare function authRequestForItem<const TB extends acl.TargetName>(request: Request, itemType: TB, itemId: string, permissions: Partial<acl.PermissionsFor<`acl.${TB}`>>): Promise<ItemAuthResult<TB>>;

package/dist/auth.js

@@ -110,15 +110,7 @@ export async function checkAuthForUser(request, userId, sensitive = false) {
         error(403, 'This token can not be used for sensitive actions');
     return Object.assign(session, { accessor: session.user });
 }
-/**
- * Authenticate a request against an "item" which has an ACL table.
- * This will fetch the item, ACLs, users, and the authenticating session.
- */
-export async function checkAuthForItem(request, itemType, itemId, permissions) {
-    const token = getToken(request, false);
-    if (!token)
-        error(401, 'Missing token');
-    const session = await getSessionAndUser(token).catch(() => null);
+export async function authSessionForItem(itemType, itemId, permissions, session) {
     const { userId, user } = session ?? {};
     // Note: we need to do casting because of TS limitations with generics
     const item = await db
@@ -152,3 +144,14 @@ export async function checkAuthForItem(request, itemType, itemId, permissions) {
         error(403, 'Access denied');
     return result;
 }
+/**
+ * Authenticate a request against an "item" which has an ACL table.
+ * This will fetch the item, ACLs, users, and the authenticating session.
+ */
+export async function authRequestForItem(request, itemType, itemId, permissions) {
+    const token = getToken(request, false);
+    if (!token)
+        error(401, 'Missing token');
+    const session = await getSessionAndUser(token).catch(() => null);
+    return await authSessionForItem(itemType, itemId, permissions, session);
+}

package/dist/linking.js

@@ -12,14 +12,14 @@ function info(id) {
     return [text, link];
 }
 export function* listRouteLinks(options = {}) {
-    if (!options.only) {
+    if (!options.only || !options.only.length) {
         const [text, link] = info('#builtin');
         yield { text, id: '#builtin', from: link, to: resolve(import.meta.dirname, '../routes') };
     }
     for (const plugin of plugins.values()) {
         if (!plugin.server?.routes)
             continue;
-        if (options.only && !options.only.includes(plugin.name))
+        if (options.only && options.only.length && !options.only.includes(plugin.name))
             continue;
         const [text, link] = info(plugin.name);
         const to = resolve(join(plugin.dirname, plugin.server.routes));

package/dist/main.js

@@ -186,7 +186,6 @@ try {
                 io.warn('Invalid timeout value, using default.');
             io.setCommandTimeout(timeout);
         }),
-        packagesDir: new Option('-p, --packages-dir <dir>', 'the directory to look for packages in'),
     };
     axiumDB = program.command('db').alias('database').description('Manage the database').addOption(opts.timeout);
     axiumDB
@@ -755,7 +754,6 @@ try {
         .description('Install Axium server')
         .addOption(opts.force)
         .addOption(opts.check)
-        .addOption(opts.packagesDir)
         .option('-s, --skip', 'Skip already initialized steps', false)
         .action(async (opt) => {
         await db.init(opt).catch(io.exit);
@@ -789,7 +787,6 @@ try {
     program
         .command('link')
         .description('Link routes provided by plugins and the server')
-        .addOption(opts.packagesDir)
         .addOption(new Option('-l, --list', 'list route links').conflicts('delete'))
         .option('-d, --delete', 'delete route links')
         .argument('[name...]', 'List of plugin names to operate on. If not specified, operates on all plugins and built-in routes.')

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/server",
-	"version": "0.34.2",
+	"version": "0.35.0",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"funding": {
 		"type": "individual",