@getstrata/bootstrap 0.2.66 → 0.4.2

package/dist/entries/providers.js

@@ -2,17 +2,19 @@
 var __jsonParse = (a) => JSON.parse(a);
 
 // ../../src/bootstrap/providers/auth.ts
+import { BasicAuthGuard } from "@getstrata/core/auth/basicAuthGuard";
 import {
   AuthManager,
   CompositeGuard,
   DatabaseTokenGuard,
   GuestGuard
 } from "@getstrata/core/auth/guard";
+import { JwtGuard } from "@getstrata/core/auth/jwtGuard";
 import { SessionGuard } from "@getstrata/core/auth/sessionGuard";
 
 // ../../src/config/auth.ts
 var authConfig = {
-  allowDevHeaders: (process.env.AUTH_DEV_HEADERS ?? "true") !== "false",
+  allowDevHeaders: process.env.AUTH_DEV_HEADERS === "true",
   tokenDefaultAbilities: ["*"]
 };
 
@@ -47,11 +49,22 @@ var authProvider = {
   name: "core.auth",
   register({ container, config }) {
     config.set("auth.allowDevHeaders", authConfig.allowDevHeaders);
-    const guards = [new DatabaseTokenGuard(container), new SessionGuard(container)];
+    const apiGuard = new DatabaseTokenGuard(container);
+    const sessionGuard = new SessionGuard(container);
+    const jwtGuard = new JwtGuard;
+    const basicGuard = new BasicAuthGuard(container);
+    const guards = [apiGuard, jwtGuard, basicGuard, sessionGuard];
     if (authConfig.allowDevHeaders) {
       guards.push(new GuestGuard);
     }
-    container.set(CORE_AUTH_TOKEN, new AuthManager(new CompositeGuard(guards)));
+    const auth = new AuthManager(new CompositeGuard(guards));
+    auth.registerGuard("api", apiGuard);
+    auth.registerGuard("access_token", apiGuard);
+    auth.registerGuard("jwt", jwtGuard);
+    auth.registerGuard("basic", basicGuard);
+    auth.registerGuard("web", sessionGuard);
+    auth.registerGuard("session", sessionGuard);
+    container.set(CORE_AUTH_TOKEN, auth);
   }
 };
 var auth_default = authProvider;
@@ -112,8 +125,12 @@ var queueConfig = {
 };
 // ../../src/bootstrap/env.ts
 import { defineEnvSchema } from "@getstrata/core/config/envSchema";
+import { DEFAULT_SPA_PREFIX, FRONTEND_MODE_PATTERN } from "@getstrata/core/runtime/frontendMode";
 var appEnvSchema = defineEnvSchema({
-  DATABASE_URL: { required: true, pattern: /^postgres(ql)?:\/\// },
+  DATABASE_URL: {
+    required: true,
+    pattern: /^(postgres(ql)?|mysql|sqlite):\/\//i
+  },
   PORT: {
     integer: true,
     minimum: 1,
@@ -141,9 +158,21 @@ var appEnvSchema = defineEnvSchema({
     pattern: /^(sync|async|redis)$/
   },
   AUTH_DEV_HEADERS: {
-    default: "true",
+    default: "false",
     pattern: /^(true|false|0|1)$/
   },
+  DB_CONNECTION: {
+    default: "",
+    pattern: /^(pgsql|postgres|postgresql|mysql|mariadb|sqlite)?$/i
+  },
+  AUTH_DEFAULT_GUARD: {
+    default: "web"
+  },
+  JWT_TTL_SECONDS: {
+    integer: true,
+    minimum: 60,
+    default: "3600"
+  },
   APP_ENV: {
     default: "local"
   },
@@ -153,6 +182,13 @@ var appEnvSchema = defineEnvSchema({
   APP_URL: {
     default: "http://localhost:3000"
   },
+  FRONTEND_MODE: {
+    default: "api",
+    pattern: FRONTEND_MODE_PATTERN
+  },
+  SPA_PREFIX: {
+    default: DEFAULT_SPA_PREFIX
+  },
   API_PREFIX: {
     default: "/api/v1"
   },
@@ -306,7 +342,12 @@ function readDiscoverModulesState() {
   return state;
 }
 function configureModulesDirectory(modulesDir) {
-  readDiscoverModulesState().configuredModulesDir = modulesDir;
+  const state = readDiscoverModulesState();
+  if (state.configuredModulesDir !== modulesDir) {
+    state.appModules.length = 0;
+    state.modulesReady = undefined;
+  }
+  state.configuredModulesDir = modulesDir;
 }
 function resolveModulesDirectory(options) {
   const state = readDiscoverModulesState();
@@ -470,7 +511,6 @@ var storageProvider = {
 var storage_default = storageProvider;
 
 // ../../src/bootstrap/providers/view.ts
-import { resolveMembershipLookup } from "@getstrata/core/auth/membershipContext";
 import { currentRequestMeta } from "@getstrata/core/http/requestMetaContext";
 import { appDisplayName } from "@getstrata/core/runtime/appKeyPrefix";
 import { isViewsEnabled } from "@getstrata/core/runtime/frontendMode";
@@ -482,148 +522,6 @@ import {
   errorTemplateName,
   resolveWebLayoutData
 } from "@getstrata/core/view";
-
-// ../../src/modules/organization/repository.ts
-import { BaseRepository } from "@getstrata/core/database/baseRepository";
-import { NotFoundError } from "@getstrata/core/errors/http";
-import { currentTenantId } from "@getstrata/core/tenant/tenantContext";
-
-// ../../src/modules/organization/table.ts
-import { defineTable } from "@getstrata/core/database/table";
-
-// ../../src/domain/workhub.ts
-var ORGANIZATION_TABLE = "organization";
-
-// ../../src/modules/organization/table.ts
-var organizationTable = defineTable({
-  name: ORGANIZATION_TABLE,
-  primaryKey: "id",
-  columns: ["id", "tenant_id", "name", "slug", "created_at", "updated_at", "deleted_at"],
-  softDeletes: true,
-  defaultOrderBy: { column: "id", direction: "ASC" }
-});
-
-// ../../src/modules/organization/repository.ts
-class OrganizationRepository extends BaseRepository {
-  constructor() {
-    super(organizationTable);
-  }
-  async findBySlug(slug) {
-    return await this.firstOrNull({ slug });
-  }
-  async listForTenant(options) {
-    return await this.findAll({
-      limit: options.limit,
-      offset: options.offset,
-      where: { tenant_id: options.tenantId ?? currentTenantId() }
-    });
-  }
-  async countForTenant(tenantId = currentTenantId()) {
-    return await this.countWhere({ tenant_id: tenantId });
-  }
-  async findForTenantOrThrow(id, tenantId = currentTenantId()) {
-    const organization = await this.findById(id);
-    if (!organization || organization.tenant_id !== tenantId) {
-      throw new NotFoundError(`SCIM group ${id} not found.`);
-    }
-    return organization;
-  }
-}
-var repository_default = OrganizationRepository;
-
-// ../../src/modules/user/repository.ts
-import {
-  emailLookupForQuery,
-  protectEmail,
-  revealEmail
-} from "@getstrata/core/crypto/fieldEncryption";
-import { revealMfaSecret } from "@getstrata/core/crypto/mfaSecret";
-import { BaseRepository as BaseRepository2 } from "@getstrata/core/database/baseRepository";
-import { currentTenantId as currentTenantId2 } from "@getstrata/core/tenant/tenantContext";
-
-// ../../src/modules/user/table.ts
-import { defineTable as defineTable2 } from "@getstrata/core/database/table";
-var userTable = defineTable2({
-  name: "users",
-  primaryKey: "id",
-  columns: [
-    "id",
-    "name",
-    "email",
-    "email_lookup",
-    "role",
-    "tenant_id",
-    "password_hash",
-    "email_verified_at",
-    "mfa_secret",
-    "mfa_enabled",
-    "mfa_recovery_codes",
-    "profile_photo_path",
-    "session_valid_after",
-    "current_organization_id",
-    "created_at",
-    "updated_at"
-  ],
-  defaultOrderBy: { column: "id", direction: "ASC" }
-});
-
-// ../../src/modules/user/repository.ts
-class UserRepository extends BaseRepository2 {
-  constructor() {
-    super(userTable);
-  }
-  decode(record) {
-    return {
-      ...record,
-      email: revealEmail(record.email),
-      mfa_secret: revealMfaSecret(record.mfa_secret)
-    };
-  }
-  async findById(id) {
-    const record = await super.findById(id);
-    return record ? this.decode(record) : null;
-  }
-  async findAll(options = {}) {
-    const records = await super.findAll(options);
-    return records.map((record) => this.decode(record));
-  }
-  async create(values) {
-    const email = values.email;
-    if (!email) {
-      throw new Error("Email is required.");
-    }
-    const protectedEmail = protectEmail(email);
-    const record = await super.create({
-      ...values,
-      tenant_id: values.tenant_id ?? currentTenantId2(),
-      email: protectedEmail.storedEmail,
-      email_lookup: protectedEmail.emailLookup,
-      password_hash: values.password_hash ?? ""
-    });
-    return this.decode(record);
-  }
-  async updateByIdOrThrow(id, values, errorFactory) {
-    const changes = { ...values };
-    if (values.email !== undefined) {
-      const protectedEmail = protectEmail(values.email);
-      changes.email = protectedEmail.storedEmail;
-      changes.email_lookup = protectedEmail.emailLookup;
-    }
-    const record = await super.updateByIdOrThrow(id, changes, errorFactory);
-    return this.decode(record);
-  }
-  async findByEmail(email) {
-    const records = await this.findWhere({ email_lookup: emailLookupForQuery(email) }, { limit: 1 });
-    const record = records[0];
-    return record ? this.decode(record) : null;
-  }
-  async countForTenant(tenantId = currentTenantId2()) {
-    return await this.countWhere({ tenant_id: tenantId });
-  }
-}
-var repository_default2 = UserRepository;
-
-// ../../src/bootstrap/providers/view.ts
 var CORE_VIEW_TOKEN = "core.view";
 var VIEW_DIRECTORY_CONFIG_KEY = "view.directory";
 var viewProvider = {
@@ -637,23 +535,11 @@ var viewProvider = {
     const engine = new EtaViewEngine(viewsDirectory, (request) => resolveWebLayoutData(container, request ?? currentRequestMeta().request));
     container.set(CORE_VIEW_TOKEN, engine);
     configureWebLayoutData({
-      extra: async (user) => {
-        const appName = appDisplayName();
-        if (!user || typeof user.id !== "number") {
-          return { appName, currentOrganization: null, organizations: [] };
-        }
-        try {
-          const record = await new repository_default2().findByIdOrThrow(user.id);
-          const memberships = await resolveMembershipLookup().listForUser(record.id);
-          const organizationsRepo = new repository_default;
-          const organizations = (await Promise.all(memberships.map((membership) => organizationsRepo.findById(membership.organization_id)))).filter((organization) => Boolean(organization && !organization.deleted_at));
-          const currentId = record.current_organization_id ?? null;
-          const currentOrganization = organizations.find((organization) => organization.id === currentId) ?? organizations[0] ?? null;
-          return { appName, currentOrganization, organizations };
-        } catch {
-          return { appName, currentOrganization: null, organizations: [] };
-        }
-      }
+      extra: async () => ({
+        appName: appDisplayName(),
+        currentOrganization: null,
+        organizations: []
+      })
     });
     configureWebErrorView({
       render: async (input) => engine.render(errorTemplateName(input.status), {

package/dist/entries/secretsGuard.js

@@ -2,15 +2,21 @@
 var __jsonParse = (a) => JSON.parse(a);
 
 // ../../src/bootstrap/secretsGuard.ts
-var PUBLISHED_TEST_ADMIN_API_TOKEN = "workhub-admin-test-token";
-var PUBLISHED_TEST_MEMBER_API_TOKEN = "workhub-member-test-token";
-var PUBLISHED_TEST_SCIM_BEARER_TOKEN = "workhub-scim-test-token";
+import { isViewsMode, parseFrontendMode } from "@getstrata/core/runtime/frontendMode";
+var PUBLISHED_TEST_ADMIN_API_TOKEN = "strata-admin-test-token";
+var PUBLISHED_TEST_MEMBER_API_TOKEN = "strata-member-test-token";
+var PUBLISHED_TEST_SCIM_BEARER_TOKEN = "strata-scim-test-token";
 var MIN_SESSION_SECRET_LENGTH = 32;
 var PUBLISHED_TEST_TOKENS = new Set([
   PUBLISHED_TEST_ADMIN_API_TOKEN,
-  PUBLISHED_TEST_MEMBER_API_TOKEN
+  PUBLISHED_TEST_MEMBER_API_TOKEN,
+  "workhub-admin-test-token",
+  "workhub-member-test-token"
+]);
+var PUBLISHED_TEST_SCIM_TOKENS = new Set([
+  PUBLISHED_TEST_SCIM_BEARER_TOKEN,
+  "workhub-scim-test-token"
 ]);
-var PUBLISHED_TEST_SCIM_TOKENS = new Set([PUBLISHED_TEST_SCIM_BEARER_TOKEN]);
 function isEnabled(value, defaultEnabled) {
   if (value === undefined) {
     return defaultEnabled;
@@ -34,7 +40,7 @@ function assertAuthDevHeadersDisabled(env) {
 function assertSessionSecret(env) {
   const secret = env.SESSION_SECRET?.trim() ?? "";
   if (secret.length < MIN_SESSION_SECRET_LENGTH) {
-    throw new Error("Production startup blocked: set SESSION_SECRET when FRONTEND_MODE=server-htmx (32+ characters).");
+    throw new Error("Production startup blocked: set SESSION_SECRET when FRONTEND_MODE=server-htmx or hybrid (32+ characters).");
   }
 }
 function assertPublishedTestTokensRotated(env) {
@@ -96,8 +102,7 @@ function assertProductionSecrets(env = process.env) {
     assertTokenAuthProductionSecrets(env);
   }
   assertFeatureProductionSecrets(env);
-  const frontendMode = (env.FRONTEND_MODE ?? "api").trim();
-  if (frontendMode === "server-htmx") {
+  if (isViewsMode(parseFrontendMode(env.FRONTEND_MODE))) {
     assertSessionSecret(env);
   }
 }

package/dist/entries/web/routing.js

@@ -2,6 +2,7 @@
 var __jsonParse = (a) => JSON.parse(a);
 
 // ../../src/bootstrap/web/routing.ts
+import { requestPrefersJson } from "@getstrata/core/http/contentNegotiation";
 import { withErrorHandling as withErrorHandling2 } from "@getstrata/core/http/response";
 
 // ../../src/bootstrap/http/securedRouteModelBinding.ts
@@ -33,7 +34,7 @@ import { createRequireGlobalAdminMiddleware } from "@getstrata/core/http/require
 import { createRequirePasswordConfirmMiddleware } from "@getstrata/core/http/requirePasswordConfirmMiddleware";
 import { createRequireVerifiedMiddleware } from "@getstrata/core/http/requireVerifiedMiddleware";
 import { createRequireWebAuthMiddleware } from "@getstrata/core/http/requireWebAuthMiddleware";
-import { withErrorHandling } from "@getstrata/core/http/response";
+import { withErrorHandling, withJsonErrorHandling } from "@getstrata/core/http/response";
 import { withMiddleware } from "@getstrata/core/http/routeMiddleware";
 import { createSecurityHeadersMiddleware } from "@getstrata/core/http/securityHeadersMiddleware";
 import { createValidateSignatureMiddleware } from "@getstrata/core/http/signedUrl";
@@ -181,7 +182,7 @@ class HttpKernel {
     return withMiddleware(...middleware)(handler);
   }
   wrapApi(handler) {
-    return this.wrap(["api", "authenticated"], handler);
+    return withJsonErrorHandling(this.wrap(["api", "authenticated"], handler));
   }
   wrapWeb(handler) {
     return withErrorHandling(this.wrap("web", handler));
@@ -366,7 +367,7 @@ function wrapWebThrottle(kernel, scope, handler, onThrottled) {
   const throttled = scope === "login" ? kernel.wrapLogin(handler) : kernel.wrapRegister(handler);
   return async (request) => {
     const response = await throttled(request);
-    if (response.status === 429) {
+    if (response.status === 429 && !requestPrefersJson(request)) {
       return onThrottled(request);
     }
     return response;

package/dist/entries/web/session.js

@@ -2,11 +2,19 @@
 var __jsonParse = (a) => JSON.parse(a);
 
 // ../../src/bootstrap/web/session.ts
-import { createHash, randomBytes } from "crypto";
+import { createHmac, randomBytes } from "crypto";
 import { AuthManager } from "@getstrata/core/auth/guard";
 import { getBoundDatabaseConnection } from "@getstrata/core/database/boundConnection";
 import { getDefaultDatabasePool } from "@getstrata/core/database/defaultConnection";
+import { currentSqlDialect } from "@getstrata/core/database/dialect";
 import { readRequestCookie } from "@getstrata/core/http/cookies";
+import { timingSafeCompareString } from "@getstrata/core/security/timingSafeCompare";
+function sqlPlaceholder(index) {
+  return currentSqlDialect().placeholder(index);
+}
+function sqlNow() {
+  return currentSqlDialect().nowExpression();
+}
 function isSqlClient(value) {
   return typeof value.unsafe === "function";
 }
@@ -29,22 +37,34 @@ function defaultMapSessionUser(user) {
     role: user.is_admin ? "admin" : "member"
   };
 }
+function sessionDisplayName(row, email) {
+  if (typeof row.name === "string" && row.name.trim() !== "") {
+    return row.name;
+  }
+  const first = typeof row.first_name === "string" ? row.first_name.trim() : "";
+  const last = typeof row.last_name === "string" ? row.last_name.trim() : "";
+  const composed = `${first} ${last}`.trim();
+  return composed || email;
+}
+function mapSessionUserRow(row) {
+  const email = typeof row.email === "string" ? row.email : "";
+  return {
+    id: Number(row.user_id ?? row.id),
+    name: sessionDisplayName(row, email),
+    email,
+    learn_subscriber: Boolean(row.learn_subscriber),
+    is_admin: Boolean(row.is_admin)
+  };
+}
 async function defaultLoadSessionUser(sql, sessionId) {
-  const rows = await sql.unsafe(`SELECT s.id, s.user_id, s.expires_at, u.name, u.email, u.learn_subscriber,
-            COALESCE(u.is_admin, false) AS is_admin
+  const rows = await sql.unsafe(`SELECT s.user_id, s.expires_at, u.*
      FROM sessions s
      INNER JOIN users u ON u.id = s.user_id
-     WHERE s.id = $1 AND s.expires_at > NOW()`, [sessionId]);
+     WHERE s.id = ${sqlPlaceholder(1)} AND s.expires_at > ${sqlNow()}`, [sessionId]);
   const row = rows[0];
   if (!row)
     return null;
-  return {
-    id: row.user_id,
-    name: row.name,
-    email: row.email,
-    learn_subscriber: row.learn_subscriber,
-    is_admin: row.is_admin
-  };
+  return mapSessionUserRow(row);
 }
 function redirectWithCookie(location, setCookie, status) {
   return new Response(null, {
@@ -82,7 +102,7 @@ class CookieSessionStore {
     if (!raw)
       return null;
     const [sessionId, signature] = raw.split(".");
-    if (!sessionId || !signature || signature !== this.sign(sessionId)) {
+    if (!sessionId || !signature || !timingSafeCompareString(signature, this.sign(sessionId))) {
       return null;
     }
     return sessionId;
@@ -96,18 +116,28 @@ class CookieSessionStore {
   sql() {
     return resolveSql(this.sqlSource);
   }
-  async create(user) {
+  async create(user, meta = {}) {
     const id = randomBytes(32).toString("hex");
     const expires = new Date(Date.now() + this.maxAgeSeconds * 1000);
-    await this.sql().unsafe(`INSERT INTO sessions (id, user_id, expires_at) VALUES ($1, $2, $3)`, [
-      id,
-      user.id,
-      expires
-    ]);
+    await this.sql().unsafe(`INSERT INTO sessions (id, user_id, expires_at, user_agent, ip_address, last_active_at)
+       VALUES (${sqlPlaceholder(1)}, ${sqlPlaceholder(2)}, ${sqlPlaceholder(3)}, ${sqlPlaceholder(4)}, ${sqlPlaceholder(5)}, ${sqlNow()})`, [id, user.id, expires, meta.userAgent ?? null, meta.ipAddress ?? null]);
     return id;
   }
   async destroy(sessionId) {
-    await this.sql().unsafe(`DELETE FROM sessions WHERE id = $1`, [sessionId]);
+    await this.sql().unsafe(`DELETE FROM sessions WHERE id = ${sqlPlaceholder(1)}`, [sessionId]);
+  }
+  async destroyOtherSessions(userId, keepSessionId) {
+    await this.sql().unsafe(`DELETE FROM sessions WHERE user_id = ${sqlPlaceholder(1)} AND id <> ${sqlPlaceholder(2)}`, [userId, keepSessionId]);
+  }
+  async listForUser(userId) {
+    const dialect = currentSqlDialect();
+    return this.sql().unsafe(`SELECT id, user_id, user_agent, ip_address, last_active_at, expires_at
+       FROM sessions
+       WHERE user_id = ${dialect.placeholder(1)} AND expires_at > ${dialect.nowExpression()}
+       ORDER BY last_active_at DESC${dialect.nullsLastSuffix()}, expires_at DESC`, [userId]);
+  }
+  async touch(sessionId) {
+    await this.sql().unsafe(`UPDATE sessions SET last_active_at = ${sqlNow()} WHERE id = ${sqlPlaceholder(1)}`, [sessionId]);
   }
   async read(request) {
     const sessionId = this.sessionIdFromRequest(request);
@@ -116,7 +146,7 @@ class CookieSessionStore {
     return this.loadSessionUser(this.sql(), sessionId);
   }
   sign(value) {
-    return createHash("sha256").update(`${value}.${this.secret}`).digest("hex").slice(0, 32);
+    return createHmac("sha256", this.secret).update(value).digest("hex").slice(0, 32);
   }
 }
 
@@ -139,11 +169,14 @@ class CookieSessionGuard {
 class CookieSessionAuthManager extends AuthManager {
   store;
   constructor(store, mapUser = defaultMapSessionUser) {
-    super(new CookieSessionGuard(store, mapUser));
+    const guard = new CookieSessionGuard(store, mapUser);
+    super(guard);
     this.store = store;
+    this.registerGuard("web", guard);
+    this.registerGuard("session", guard);
   }
-  async signIn(user) {
-    const sessionId = await this.store.create(user);
+  async signIn(user, meta = {}) {
+    const sessionId = await this.store.create(user, meta);
     return { sessionId, setCookie: this.store.cookieHeader(user, sessionId) };
   }
   async signOut(request) {
@@ -153,8 +186,8 @@ class CookieSessionAuthManager extends AuthManager {
     }
     return { setCookie: this.store.clearCookieHeader() };
   }
-  async signInRedirect(user, location, status = 302) {
-    const { setCookie } = await this.signIn(user);
+  async signInRedirect(user, location, status = 302, meta = {}) {
+    const { setCookie } = await this.signIn(user, meta);
     return redirectWithCookie(location, setCookie, status);
   }
   async signOutRedirect(request, location, status = 302) {