@getstrata/bootstrap 0.2.66 → 0.2.68

package/dist/entries/web/session.js

@@ -96,19 +96,33 @@ 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 ($1, $2, $3, $4, $5, NOW())`, [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]);
   }
+  async destroyOtherSessions(userId, keepSessionId) {
+    await this.sql().unsafe(`DELETE FROM sessions WHERE user_id = $1 AND id <> $2`, [
+      userId,
+      keepSessionId
+    ]);
+  }
+  async listForUser(userId) {
+    return this.sql().unsafe(`SELECT id, user_id, user_agent, ip_address, last_active_at, expires_at
+       FROM sessions
+       WHERE user_id = $1 AND expires_at > NOW()
+       ORDER BY last_active_at DESC NULLS LAST, expires_at DESC`, [userId]);
+  }
+  async touch(sessionId) {
+    await this.sql().unsafe(`UPDATE sessions SET last_active_at = NOW() WHERE id = $1`, [
+      sessionId
+    ]);
+  }
   async read(request) {
     const sessionId = this.sessionIdFromRequest(request);
     if (!sessionId)
@@ -142,8 +156,8 @@ class CookieSessionAuthManager extends AuthManager {
     super(new CookieSessionGuard(store, mapUser));
     this.store = store;
   }
-  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 +167,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) {

package/dist/index.js

@@ -353,7 +353,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();
@@ -871,7 +876,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 as isViewsEnabled2 } from "@getstrata/core/runtime/frontendMode";
@@ -883,148 +887,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 = {
@@ -1038,23 +900,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), {
@@ -1118,9 +968,10 @@ import { notFoundHtmlResponse } from "@getstrata/core/view";
 function registerRoute(method, path, middleware) {
   routeRegistry.register({ method, path, middleware });
 }
-function createWebRoutes(dependencies) {
+function createWebRoutes(dependencies, options = {}) {
   const wrappedRoutes = buildWebModuleRoutes(dependencies, {
-    clearRegistry: false
+    clearRegistry: false,
+    modules: options.modules
   });
   registerRoute("GET", "/", ["global", "web"]);
   wrappedRoutes["/assets/*"] = async (request) => {
@@ -1136,12 +987,12 @@ function createWebRoutes(dependencies) {
   registerRoute("GET", "/assets/*", ["global", "web"]);
   return wrappedRoutes;
 }
-function mergeWebRoutes(dependencies, routes) {
+function mergeWebRoutes(dependencies, routes, options = {}) {
   if (!isViewsEnabled3()) {
     return routes;
   }
   return {
-    ...createWebRoutes(dependencies),
+    ...createWebRoutes(dependencies, options),
     ...routes
   };
 }
@@ -1592,19 +1443,33 @@ 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 ($1, $2, $3, $4, $5, NOW())`, [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]);
   }
+  async destroyOtherSessions(userId, keepSessionId) {
+    await this.sql().unsafe(`DELETE FROM sessions WHERE user_id = $1 AND id <> $2`, [
+      userId,
+      keepSessionId
+    ]);
+  }
+  async listForUser(userId) {
+    return this.sql().unsafe(`SELECT id, user_id, user_agent, ip_address, last_active_at, expires_at
+       FROM sessions
+       WHERE user_id = $1 AND expires_at > NOW()
+       ORDER BY last_active_at DESC NULLS LAST, expires_at DESC`, [userId]);
+  }
+  async touch(sessionId) {
+    await this.sql().unsafe(`UPDATE sessions SET last_active_at = NOW() WHERE id = $1`, [
+      sessionId
+    ]);
+  }
   async read(request) {
     const sessionId = this.sessionIdFromRequest(request);
     if (!sessionId)
@@ -1638,8 +1503,8 @@ class CookieSessionAuthManager extends AuthManager2 {
     super(new CookieSessionGuard(store, mapUser));
     this.store = store;
   }
-  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) {
@@ -1649,8 +1514,8 @@ class CookieSessionAuthManager extends AuthManager2 {
     }
     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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getstrata/bootstrap",
-  "version": "0.2.66",
+  "version": "0.2.68",
   "description": "Strata application bootstrap — HttpKernel, DI, web session helpers",
   "type": "module",
   "license": "MIT",

package/dist/bootstrap/scimRoutes.d.ts

@@ -1,24 +0,0 @@
-import type { RouteHandler } from "@getstrata/core/http/middleware";
-import type { AppDependencies } from "./contracts";
-declare function createScimRoutes(dependencies: AppDependencies): {
-    "/scim/v2/ServiceProviderConfig": {
-        GET: RouteHandler;
-    };
-    "/scim/v2/Users": {
-        GET: RouteHandler;
-        POST: RouteHandler;
-    };
-    "/scim/v2/Users/:id": {
-        GET: RouteHandler;
-        PATCH: RouteHandler;
-        DELETE: RouteHandler;
-    };
-    "/scim/v2/Groups": {
-        GET: RouteHandler;
-    };
-    "/scim/v2/Groups/:id": {
-        GET: RouteHandler;
-        PATCH: RouteHandler;
-    };
-};
-export { createScimRoutes };