@dyrected/core 2.13.0 → 2.13.3

package/dist/server.cjs

@@ -6182,6 +6182,19 @@ function humanizeProviderName(id, type) {
   if (!cleaned) return type.toUpperCase();
   return cleaned.replace(/\b\w/g, (char) => char.toUpperCase());
 }
+function getAdminRoleForCollection(collection) {
+  if (!collection?.auth) return "admin";
+  if (typeof collection.auth === "object" && collection.auth.adminRole) {
+    return collection.auth.adminRole;
+  }
+  return "admin";
+}
+function isUserAdmin(user, collection) {
+  if (!user || !Array.isArray(user.roles)) return false;
+  const configuredRole = getAdminRoleForCollection(collection);
+  if (user.roles.includes(configuredRole)) return true;
+  return user.roles.includes("admin") || user.roles.includes("super_admin");
+}
 
 // src/utils/collection-search.ts
 var DEFAULT_SEARCHABLE_NAMES = /* @__PURE__ */ new Set([
@@ -8001,7 +8014,7 @@ var CollectionController = class {
     if (newPassword.length < 8) {
       return c.json({ message: "Password must be at least 8 characters" }, 400);
     }
-    const isAdmin = Array.isArray(user.roles) && user.roles.includes("admin");
+    const isAdmin = isUserAdmin(user, this.collection);
     const isSelf = user.sub === id;
     if (!isAdmin && !isSelf) {
       return c.json(
@@ -9625,14 +9638,29 @@ var AuthController = class {
         400
       );
     }
+    let initialRole = getAdminRoleForCollection(this.collection);
+    const rolesField = this.collection.fields?.find((f) => f.name === "roles");
+    if (rolesField && Array.isArray(rolesField.options) && rolesField.options.length > 0) {
+      const optionValues = rolesField.options.map(
+        (opt) => typeof opt === "string" ? opt : opt?.value
+      );
+      if (!optionValues.includes(initialRole)) {
+        if (optionValues.includes("super_admin")) {
+          initialRole = "super_admin";
+        } else if (optionValues.includes("admin")) {
+          initialRole = "admin";
+        } else {
+          initialRole = optionValues[0];
+        }
+      }
+    }
     const hashedPassword = await hashPassword(body.password);
     const user = await db.create({
       collection: this.collection.slug,
       data: {
         ...body,
         password: hashedPassword,
-        roles: ["admin"]
-        // Default first user to admin
+        roles: [initialRole]
       }
     });
     const token = await issueAuthSessionToken({
@@ -13903,8 +13931,8 @@ function registerRoutes(app, config) {
       }))
     );
     const effectiveAi = requestConfig.ai;
-    const aiEnabled = effectiveAi?.enabled !== false;
-    const aiProvider = effectiveAi?.provider || (process.env.AGENTROUTER_API_KEY ? "agentrouter" : process.env.OPENROUTER_API_KEY ? "openrouter" : process.env.OPENAI_API_KEY && !process.env.GEMINI_API_KEY ? "openai" : "google");
+    const aiEnabled = Boolean(effectiveAi && effectiveAi.enabled !== false);
+    const aiProvider = aiEnabled ? effectiveAi?.provider || (process.env.AGENTROUTER_API_KEY ? "agentrouter" : process.env.OPENROUTER_API_KEY ? "openrouter" : process.env.OPENAI_API_KEY && !process.env.GEMINI_API_KEY ? "openai" : "google") : void 0;
     return c.json({
       blocks: requestConfig.blocks?.map(serializeBlockForApi),
       collections: filteredCollections,
@@ -14099,7 +14127,8 @@ function registerRoutes(app, config) {
     if (!key) return c.json({ error: true, message: "Preference key is required." }, 400);
     const body = await c.req.json().catch(() => ({}));
     if (scope === "global") {
-      const isAdminUser = Array.isArray(user?.roles) && user.roles.includes("admin");
+      const userCol = config.collections?.find((col) => col.slug === user?.collection);
+      const isAdminUser = isUserAdmin(user, userCol);
       if (!isAdminUser) {
         return c.json(
           {
@@ -14147,7 +14176,8 @@ function registerRoutes(app, config) {
     if (!user?.collection || !user.sub) return c.json({ error: true, message: "Authentication required." }, 401);
     if (!key) return c.json({ error: true, message: "Preference key is required." }, 400);
     if (scope === "global") {
-      const isAdminUser = Array.isArray(user?.roles) && user.roles.includes("admin");
+      const userCol = config.collections?.find((col) => col.slug === user?.collection);
+      const isAdminUser = isUserAdmin(user, userCol);
       if (!isAdminUser) {
         return c.json(
           {

package/dist/server.d.cts

@@ -1,5 +1,5 @@
-import { J as DyrectedContext, D as DyrectedConfig, C as CollectionConfig, G as GlobalConfig, bf as DatabaseAdapter, b as AuthenticatedUser, bt as DyrectedAIContext, al as AIThread, ah as AIMessage, ck as RAGSearchResult, ak as AIRateLimitStore, aj as AIRateLimitResult } from './app-D_ODsBWA.cjs';
-export { cV as DyrectedObservabilityRuntime, cW as RequestBodyCapture, cX as RequestTraceContext, cY as ResolvedObservabilityConfig, cZ as attachRequestMetrics, c_ as bindObservabilityRuntime, c$ as buildRequestLogger, d0 as captureRequestBody, d1 as createDyrectedApp, d2 as createObservabilityRuntime, d3 as createRequestSpan, d4 as endRequestSpan, d5 as getConfigLogger, d6 as getObservabilityRuntime, d7 as getRequestLogger, d8 as redactBody, d9 as redactHeaders, da as renderPrometheusMetrics, db as resolveObservabilityConfig, dc as shouldSampleRequest } from './app-D_ODsBWA.cjs';
+import { J as DyrectedContext, D as DyrectedConfig, C as CollectionConfig, G as GlobalConfig, bf as DatabaseAdapter, b as AuthenticatedUser, bt as DyrectedAIContext, al as AIThread, ah as AIMessage, ck as RAGSearchResult, ak as AIRateLimitStore, aj as AIRateLimitResult } from './app-De-3eNn1.cjs';
+export { cV as DyrectedObservabilityRuntime, cW as RequestBodyCapture, cX as RequestTraceContext, cY as ResolvedObservabilityConfig, cZ as attachRequestMetrics, c_ as bindObservabilityRuntime, c$ as buildRequestLogger, d0 as captureRequestBody, d1 as createDyrectedApp, d2 as createObservabilityRuntime, d3 as createRequestSpan, d4 as endRequestSpan, d5 as getConfigLogger, d6 as getObservabilityRuntime, d7 as getRequestLogger, d8 as redactBody, d9 as redactHeaders, da as renderPrometheusMetrics, db as resolveObservabilityConfig, dc as shouldSampleRequest } from './app-De-3eNn1.cjs';
 import * as hono from 'hono';
 import { Hono, Context, Next } from 'hono';
 import * as hono_utils_types from 'hono/utils/types';

package/dist/server.d.ts

@@ -1,5 +1,5 @@
-import { J as DyrectedContext, D as DyrectedConfig, C as CollectionConfig, G as GlobalConfig, bf as DatabaseAdapter, b as AuthenticatedUser, bt as DyrectedAIContext, al as AIThread, ah as AIMessage, ck as RAGSearchResult, ak as AIRateLimitStore, aj as AIRateLimitResult } from './app-D_ODsBWA.js';
-export { cV as DyrectedObservabilityRuntime, cW as RequestBodyCapture, cX as RequestTraceContext, cY as ResolvedObservabilityConfig, cZ as attachRequestMetrics, c_ as bindObservabilityRuntime, c$ as buildRequestLogger, d0 as captureRequestBody, d1 as createDyrectedApp, d2 as createObservabilityRuntime, d3 as createRequestSpan, d4 as endRequestSpan, d5 as getConfigLogger, d6 as getObservabilityRuntime, d7 as getRequestLogger, d8 as redactBody, d9 as redactHeaders, da as renderPrometheusMetrics, db as resolveObservabilityConfig, dc as shouldSampleRequest } from './app-D_ODsBWA.js';
+import { J as DyrectedContext, D as DyrectedConfig, C as CollectionConfig, G as GlobalConfig, bf as DatabaseAdapter, b as AuthenticatedUser, bt as DyrectedAIContext, al as AIThread, ah as AIMessage, ck as RAGSearchResult, ak as AIRateLimitStore, aj as AIRateLimitResult } from './app-De-3eNn1.js';
+export { cV as DyrectedObservabilityRuntime, cW as RequestBodyCapture, cX as RequestTraceContext, cY as ResolvedObservabilityConfig, cZ as attachRequestMetrics, c_ as bindObservabilityRuntime, c$ as buildRequestLogger, d0 as captureRequestBody, d1 as createDyrectedApp, d2 as createObservabilityRuntime, d3 as createRequestSpan, d4 as endRequestSpan, d5 as getConfigLogger, d6 as getObservabilityRuntime, d7 as getRequestLogger, d8 as redactBody, d9 as redactHeaders, da as renderPrometheusMetrics, db as resolveObservabilityConfig, dc as shouldSampleRequest } from './app-De-3eNn1.js';
 import * as hono from 'hono';
 import { Hono, Context, Next } from 'hono';
 import * as hono_utils_types from 'hono/utils/types';