@porulle/core 0.13.0 → 0.15.0

package/src/runtime/kernel-types.ts

@@ -4,6 +4,7 @@ import type {
 } from "../config/types.js";
 import type { HookRegistry } from "../kernel/hooks/registry.js";
 import type { DatabaseAdapter } from "../kernel/database/adapter.js";
+import type { PluginDb } from "../kernel/database/plugin-types.js";
 import { CatalogServiceImpl } from "../modules/catalog/service.js";
 import { InventoryService } from "../modules/inventory/service.js";
 import { MediaService } from "../modules/media/service.js";
@@ -65,6 +66,14 @@ export interface Kernel {
   logger: ReturnType<typeof createLogger>;
 }
 
+export interface ConfigRouteDatabase extends DatabaseAdapter {
+  readonly scoped: PluginDb;
+}
+
+export type ConfigRouteKernel = Omit<Kernel, "database"> & {
+  database: ConfigRouteDatabase;
+};
+
 export const KERNEL_REQUIRED_SERVICE_KEYS = [
   "catalog",
   "inventory",

package/src/runtime/kernel.ts

@@ -27,6 +27,7 @@ import {
 } from "./kernel-types.js";
 
 export type { Kernel, WebhookDeliveryPayload };
+export type { ConfigRouteKernel, ConfigRouteDatabase } from "./kernel-types.js";
 export {
   KERNEL_ALL_MODULES,
   kernelModuleInstantiationOrder,

package/src/runtime/server.ts

@@ -11,6 +11,7 @@ import type { Actor } from "../auth/types.js";
 import type { AuthInstance } from "../auth/setup.js";
 import type { CommerceConfig } from "../config/types.js";
 import { authMiddleware } from "../auth/middleware.js";
+import { resolveOrgIdForCommerce } from "../auth/org.js";
 import { organizationGuard } from "../auth/organization-guard.js";
 import type { DrizzleDatabase } from "../kernel/database/drizzle-db.js";
 import { CommerceCsrfError } from "../kernel/errors.js";
@@ -24,6 +25,9 @@ import { rewriteCommerceAliasRequest } from "./url-alias-rewrite.js";
 import { mapErrorToResponse } from "../kernel/error-mapper.js";
 import { assertRouteCoverage } from "../interfaces/rest/route-coverage.js";
 import { markRoutePermissionGuard } from "../interfaces/rest/utils.js";
+import { isStrictOrgResolution } from "../auth/strict-org-resolution.js";
+import { runWithPluginDatabaseScope } from "../kernel/database/plugin-db-context.js";
+import { buildConfigRoutesKernel } from "../kernel/plugin/manifest.js";
 
 type ServerEnv = {
   Variables: {
@@ -260,10 +264,17 @@ export async function createServer(config: CommerceConfig) {
   const getClientIp = createClientIpResolver(config);
   const keyGenerator = getClientIp;
 
+  app.use("/api/auth/get-session", rateLimiter({
+    windowMs: 60 * 1000,
+    limit: config.rateLimits?.session ?? 120,
+    keyGenerator,
+  }));
+
   app.use("/api/auth/*", rateLimiter({
     windowMs: 60 * 1000,
     limit: config.rateLimits?.auth ?? 10,
     keyGenerator,
+    skip: (c) => c.req.path === "/api/auth/get-session",
   }));
 
   app.use("/api/auth/sign-in/email", async (c, next) => {
@@ -341,6 +352,16 @@ export async function createServer(config: CommerceConfig) {
   });
 
   app.use("*", authMiddleware(auth, config));
+  app.use("*", async (c, next) => {
+    let organizationId: string;
+    try {
+      organizationId = resolveOrgIdForCommerce(c.get("actor"), config);
+    } catch {
+      await next();
+      return;
+    }
+    await runWithPluginDatabaseScope(organizationId, next);
+  });
   app.use("*", async (c, next) => {
     c.set("auth", auth);
     await next();
@@ -360,7 +381,7 @@ export async function createServer(config: CommerceConfig) {
   app.route("/api/me", createCustomerPortalRoutes(kernel));
 
   if (config.routes) {
-    config.routes(app, kernel, auth);
+    config.routes(app, buildConfigRoutesKernel(kernel), auth);
   }
 
   // OpenAPI spec — disabled in production unless explicitly enabled
@@ -500,6 +521,23 @@ export async function createServer(config: CommerceConfig) {
     }
   }
 
+  const defaultOrganizationId = config.auth?.defaultOrganizationId;
+  const hasDefaultOrganization =
+    typeof defaultOrganizationId === "string" && defaultOrganizationId.trim().length > 0;
+  if (
+    isStrictOrgResolution(config) &&
+    !hasDefaultOrganization &&
+    !config.auth?.storeResolver
+  ) {
+    throw new Error(
+      "Cannot resolve an organization for a request with no actor. Set " +
+        "auth.defaultOrganizationId for a single-tenant deployment, or " +
+        "auth.storeResolver for a multi-tenant one. To keep the previous " +
+        "permissive behaviour during a migration, set " +
+        "auth.strictOrgResolution: false (or STRICT_ORG_RESOLUTION=false).",
+    );
+  }
+
   assertRouteCoverage(app);
 
   const dispatchFetch = app.fetch.bind(app);