@wtfalch/foundry 0.5.0 → 0.6.0

package/dist/requested-changes.js

@@ -53,12 +53,37 @@ function priceChanges(_before, _after) {
     return false;
 }
 /**
- * `auto` when `change` is small and safe (`calls`, `storageLimit`,
- * `aiLimit`), the plan it causes has no destructive or migrating step, and
- * it causes no price change on `org`'s own billing fields; `approval`
- * otherwise -- every `domain` or `mailTier` change classifies `approval`
- * unconditionally, since #178 "Decide" calls both migrating steps that
- * always need approval, whatever direction the change moves.
+ * Whether a `StorageConfig`/`AiConfig` limit field moved up from `before` to
+ * `after` -- both are `null`-or-bigint-string, `null` meaning uncapped
+ * (`org.ts`'s `StorageConfig`/`AiConfig` doc). `null` is the largest
+ * possible limit, so moving a capped `before` to an uncapped `after` is a
+ * raise; moving an already-uncapped `before` anywhere is never a raise
+ * (there is nothing higher to move to); two finite values compare as
+ * bigints, never as numbers, the same bigint-safety `org.ts` requires of
+ * these fields. Equal values are not a raise.
+ */
+function isLimitRaise(before, after) {
+    if (before === null)
+        return false;
+    if (after === null)
+        return true;
+    return BigInt(after) > BigInt(before);
+}
+/**
+ * `auto` when `change` is small and safe (`calls`, and `storageLimit`/
+ * `aiLimit` in the lowering or unchanged direction), the plan it causes has
+ * no destructive or migrating step, and it causes no price change on
+ * `org`'s own billing fields; `approval` otherwise -- every `domain` or
+ * `mailTier` change classifies `approval` unconditionally, since #178
+ * "Decide" calls both migrating steps that always need approval, whatever
+ * direction the change moves.
+ *
+ * A `storageLimit` or `aiLimit` change that *raises* either limit
+ * ({@link isLimitRaise} against `org`'s current value) classifies
+ * `approval`, decided in #184: "a raise of the storage or AI limit
+ * classifies `approval` until billing fields exist. A lowering stays
+ * `auto`." `storageLimit` carries two independent limits (`limitBytes`,
+ * `limitMicros`); a raise on either one is enough.
  *
  * `plan` is the {@link PlanDetail} `change` causes -- the caller's own diff
  * against live reality, from the same `computePlanDetail` (`plan/diff.ts`)
@@ -85,9 +110,14 @@ export function classifyChange(org, change, plan) {
         return 'approval';
     switch (change.field) {
         case 'calls':
+            return 'auto';
         case 'storageLimit':
+            return isLimitRaise(org.storage.limitBytes, change.limitBytes) ||
+                isLimitRaise(org.storage.limitMicros, change.limitMicros)
+                ? 'approval'
+                : 'auto';
         case 'aiLimit':
-            return 'auto';
+            return isLimitRaise(org.ai.limitMicros, change.limitMicros) ? 'approval' : 'auto';
         case 'domain':
         case 'mailTier':
             return 'approval';

package/dist/store/postgres.js

@@ -1,5 +1,5 @@
 import { asc, eq, sql } from 'drizzle-orm';
-import { validateBuyerIdentity, validateDomain, validateHosting, validateOwner, validateSite, } from '../org.js';
+import { DEFAULT_MAIL_APPS, DEFAULT_NO_REPLY_LOCAL_PART, validateBuyerIdentity, validateDomain, validateHosting, validateMail, validateOwner, validateSite, } from '../org.js';
 import { validatePlatform } from '../platform.js';
 import { RequestedChangeError, classifyChange } from '../requested-changes.js';
 import { validateSlug } from '../slug.js';
@@ -59,7 +59,14 @@ function rowToOrg(row) {
         slug: row.slug,
         displayName: row.displayName,
         domain: row.domain,
-        mail: { mode: row.mailMode, usesDomain: row.mailUsesDomain },
+        mail: {
+            mode: row.mailMode,
+            usesDomain: row.mailUsesDomain,
+            ownerMailboxAddress: row.ownerMailboxAddress,
+            noReplyLocalPart: row.noReplyLocalPart,
+            mailApps: row.mailApps,
+            roleMailboxes: row.roleMailboxes,
+        },
         chat: { usesDomain: row.chatUsesDomain },
         calls: { enabled: row.callsEnabled, usesDomain: row.callsUsesDomain },
         issuer: { usesDomain: row.issuerUsesDomain },
@@ -96,6 +103,10 @@ function orgToRow(org) {
         domain: org.domain,
         mailMode: org.mail.mode,
         mailUsesDomain: org.mail.usesDomain,
+        ownerMailboxAddress: org.mail.ownerMailboxAddress ?? null,
+        noReplyLocalPart: org.mail.noReplyLocalPart ?? DEFAULT_NO_REPLY_LOCAL_PART,
+        mailApps: org.mail.mailApps ?? [...DEFAULT_MAIL_APPS],
+        roleMailboxes: org.mail.roleMailboxes ?? [],
         chatUsesDomain: org.chat.usesDomain,
         callsEnabled: org.calls.enabled,
         callsUsesDomain: org.calls.usesDomain,
@@ -256,6 +267,16 @@ export function createPostgresDeclaredOrgStore(db) {
         if (reason)
             throw new DeclaredOrgError(`owner invalid: ${reason}`);
     }
+    // #162: same place `requireValidOwner` checks the owner, on both `create`
+    // and the merged result of `update`. Deliberately does not require
+    // `mail.ownerMailboxAddress` just because mail is on -- `validateMail`'s
+    // own doc comment says why. Also covers #34's `mailApps` check, folded
+    // into the same `validateMail`.
+    function requireValidMail(org) {
+        const reason = validateMail(org);
+        if (reason)
+            throw new DeclaredOrgError(`mail invalid: ${reason} (#162)`);
+    }
     return {
         async create(org) {
             requireValidSlug(org.slug);
@@ -265,6 +286,7 @@ export function createPostgresDeclaredOrgStore(db) {
             requireValidHosting(org);
             requireValidSite(org);
             requireValidOwner(org);
+            requireValidMail(org);
             try {
                 await db.insert(declaredOrgs).values(orgToRow(org));
             }
@@ -289,6 +311,12 @@ export function createPostgresDeclaredOrgStore(db) {
             const [row] = await db.select().from(declaredOrgs).where(eq(declaredOrgs.id, id)).limit(1);
             return row ? rowToOrg(row) : null;
         },
+        // #133: ordered by display name, the same `asc(...)` shape
+        // `createPostgresRequestedChangeStore.listForOrg` already uses below.
+        async list() {
+            const rows = await db.select().from(declaredOrgs).orderBy(asc(declaredOrgs.displayName));
+            return rows.map(rowToOrg);
+        },
         async slugTaken(slug) {
             const [row] = await db
                 .select({ id: declaredOrgs.id })
@@ -338,6 +366,7 @@ export function createPostgresDeclaredOrgStore(db) {
             requireValidHosting(next);
             requireValidSite(next);
             requireValidOwner(next);
+            requireValidMail(next);
             try {
                 await db
                     .update(declaredOrgs)

package/dist/store/schema.d.ts

@@ -113,6 +113,78 @@ export declare const declaredOrgs: import("drizzle-orm/pg-core").PgTableWithColu
             identity: undefined;
             generated: undefined;
         }, {}, {}>;
+        ownerMailboxAddress: import("drizzle-orm/pg-core").PgColumn<{
+            name: "owner_mailbox_address";
+            tableName: "foundry_declared_orgs";
+            dataType: "string";
+            columnType: "PgText";
+            data: string;
+            driverParam: string;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        noReplyLocalPart: import("drizzle-orm/pg-core").PgColumn<{
+            name: "no_reply_local_part";
+            tableName: "foundry_declared_orgs";
+            dataType: "string";
+            columnType: "PgText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        mailApps: import("drizzle-orm/pg-core").PgColumn<{
+            name: "mail_apps";
+            tableName: "foundry_declared_orgs";
+            dataType: "json";
+            columnType: "PgJsonb";
+            data: string[];
+            driverParam: unknown;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {
+            $type: string[];
+        }>;
+        roleMailboxes: import("drizzle-orm/pg-core").PgColumn<{
+            name: "role_mailboxes";
+            tableName: "foundry_declared_orgs";
+            dataType: "json";
+            columnType: "PgJsonb";
+            data: string[];
+            driverParam: unknown;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {
+            $type: string[];
+        }>;
         chatUsesDomain: import("drizzle-orm/pg-core").PgColumn<{
             name: "chat_uses_domain";
             tableName: "foundry_declared_orgs";

package/dist/store/schema.js

@@ -12,6 +12,19 @@ export const declaredOrgs = pgTable('foundry_declared_orgs', {
     domain: text('domain'),
     mailMode: text('mail_mode').notNull().default('off'),
     mailUsesDomain: boolean('mail_uses_domain').notNull().default(false),
+    // MailConfig (org.ts, #162). null until an operator declares one -- the
+    // mailbox itself is blocked, not guessed, until it is.
+    ownerMailboxAddress: text('owner_mailbox_address'),
+    // Defaults to 'no-reply', the same literal `0019_mail_owner_mailbox.sql`
+    // and org.ts's `DEFAULT_NO_REPLY_LOCAL_PART` use.
+    noReplyLocalPart: text('no_reply_local_part').notNull().default('no-reply'),
+    // MailConfig.mailApps (org.ts, #34). Which ZITADEL apps in the org's
+    // audience project may read a person's mail; defaults to DEFAULT_MAIL_APPS
+    // ('agora', 'webmail') so every existing org keeps its current behaviour.
+    mailApps: jsonb('mail_apps').notNull().default(['agora', 'webmail']).$type(),
+    // MailConfig.roleMailboxes (org.ts, #230). Local parts of the role mailboxes
+    // pre-created on the org's mail domain; empty by default.
+    roleMailboxes: jsonb('role_mailboxes').notNull().default([]).$type(),
     chatUsesDomain: boolean('chat_uses_domain').notNull().default(false),
     callsEnabled: boolean('calls_enabled').notNull().default(false),
     callsUsesDomain: boolean('calls_uses_domain').notNull().default(false),

package/dist/store.d.ts

@@ -14,6 +14,13 @@ import type { AppliedState } from './state.js';
 export interface DeclaredOrgStore {
     create(org: DeclaredOrg): Promise<void>;
     get(id: OrgId): Promise<DeclaredOrg | null>;
+    /**
+     * Every declared org, ordered by display name (#133). The read path a
+     * billing admin area (or anything else that just wants the roster) uses
+     * instead of reading the store's own table by hand -- Archon's
+     * `listCustomers` was doing exactly that before this existed.
+     */
+    list(): Promise<DeclaredOrg[]>;
     /** Whether any org already holds this slug. `slugFromName` asks it. */
     slugTaken(slug: string): Promise<boolean>;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wtfalch/foundry",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Foundry's SDK: the declared org's types, the plan and apply contracts, and the state store's interface.",
   "repository": {
     "type": "git",