@jskit-ai/users-core 0.1.33 → 0.1.35

package/test/workspaceBootstrapContributor.test.js

@@ -1,10 +1,6 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 import { createWorkspaceBootstrapContributor } from "../src/server/workspaceBootstrapContributor.js";
-import {
-  TENANCY_MODE_PERSONAL,
-  WORKSPACE_SLUG_POLICY_IMMUTABLE_USERNAME
-} from "../src/shared/tenancyProfile.js";
 
 function createAuthenticatedProfile(overrides = {}) {
   return {
@@ -40,26 +36,10 @@ test("workspace bootstrap contributor passes actor context to pending invites se
       }
     },
     usersRepository: {
-      async findByIdentity() {
+      async findById() {
         return profile;
       }
     },
-    userSettingsRepository: {
-      async ensureForUserId() {
-        return {
-          theme: "system",
-          locale: "en",
-          timeZone: "UTC",
-          dateFormat: "YYYY-MM-DD",
-          numberFormat: "1,234.56",
-          currencyCode: "USD",
-          avatarSize: 64,
-          productUpdates: true,
-          accountActivity: true,
-          securityAlerts: true
-        };
-      }
-    },
     workspaceInvitationsEnabled: true,
     appConfig: {
       tenancyMode: "workspaces"
@@ -67,15 +47,12 @@ test("workspace bootstrap contributor passes actor context to pending invites se
   });
 
   await contributor.contribute({
-    request: {
-      async executeAction() {
-        return {
-          authenticated: true,
-          profile
-        };
+    payload: {
+      session: {
+        authenticated: true,
+        userId: profile.id
       }
-    },
-    reply: {}
+    }
   });
 
   assert.equal(pendingServiceCalls.length, 1);
@@ -83,133 +60,6 @@ test("workspace bootstrap contributor passes actor context to pending invites se
   assert.equal(pendingServiceCalls[0].options?.context?.actor?.id, profile.id);
 });
 
-test("workspace bootstrap contributor seeds the initial console owner on authenticated bootstrap", async () => {
-  const profile = createAuthenticatedProfile({ id: 12 });
-  const consoleOwnerSeeds = [];
-
-  const contributor = createWorkspaceBootstrapContributor({
-    workspaceService: {
-      async listWorkspacesForUser() {
-        return [];
-      },
-      async resolveWorkspaceContextForUserBySlug() {
-        return null;
-      }
-    },
-    workspacePendingInvitationsService: {
-      async listPendingInvitesForUser() {
-        return [];
-      }
-    },
-    usersRepository: {
-      async findByIdentity() {
-        return profile;
-      }
-    },
-    userSettingsRepository: {
-      async ensureForUserId() {
-        return {
-          theme: "system",
-          locale: "en",
-          timeZone: "UTC",
-          dateFormat: "YYYY-MM-DD",
-          numberFormat: "1,234.56",
-          currencyCode: "USD",
-          avatarSize: 64,
-          productUpdates: true,
-          accountActivity: true,
-          securityAlerts: true
-        };
-      }
-    },
-    workspaceInvitationsEnabled: false,
-    consoleService: {
-      async ensureInitialConsoleMember(userId) {
-        consoleOwnerSeeds.push(Number(userId));
-        return Number(userId);
-      }
-    }
-  });
-
-  const payload = await contributor.contribute({
-    request: {
-      async executeAction() {
-        return {
-          authenticated: true,
-          profile
-        };
-      }
-    },
-    reply: {}
-  });
-
-  assert.deepEqual(consoleOwnerSeeds, [12]);
-  assert.equal(payload.surfaceAccess?.consoleowner, true);
-});
-
-test("workspace bootstrap contributor emits canonical tenancy profile from users-core", async () => {
-  const contributor = createWorkspaceBootstrapContributor({
-    workspaceService: {
-      async listWorkspacesForUser() {
-        return [];
-      },
-      async resolveWorkspaceContextForUserBySlug() {
-        return null;
-      }
-    },
-    workspacePendingInvitationsService: {
-      async listPendingInvitesForUser() {
-        return [];
-      }
-    },
-    usersRepository: {
-      async findByIdentity() {
-        return null;
-      }
-    },
-    userSettingsRepository: {
-      async ensureForUserId() {
-        return {};
-      }
-    },
-    workspaceInvitationsEnabled: false,
-    tenancyProfile: {
-      mode: TENANCY_MODE_PERSONAL,
-      workspace: {
-        enabled: true,
-        autoProvision: true,
-        allowSelfCreate: false,
-        slugPolicy: WORKSPACE_SLUG_POLICY_IMMUTABLE_USERNAME
-      }
-    },
-    appConfig: {
-      tenancyMode: "none"
-    }
-  });
-
-  const payload = await contributor.contribute({
-    request: {
-      async executeAction() {
-        return {
-          authenticated: false
-        };
-      }
-    },
-    reply: {}
-  });
-
-  assert.deepEqual(payload.tenancy, {
-    mode: TENANCY_MODE_PERSONAL,
-    workspace: {
-      enabled: true,
-      autoProvision: true,
-      allowSelfCreate: false,
-      slugPolicy: WORKSPACE_SLUG_POLICY_IMMUTABLE_USERNAME
-    }
-  });
-  assert.equal(payload.app.tenancyMode, undefined);
-});
-
 test("workspace bootstrap contributor resolves workspace slug from bootstrap query", async () => {
   const profile = createAuthenticatedProfile();
   const calls = [];
@@ -229,162 +79,56 @@ test("workspace bootstrap contributor resolves workspace slug from bootstrap que
       }
     },
     usersRepository: {
-      async findByIdentity() {
+      async findById() {
         return profile;
       }
     },
-    userSettingsRepository: {
-      async ensureForUserId() {
-        return {
-          theme: "system",
-          locale: "en",
-          timeZone: "UTC",
-          dateFormat: "YYYY-MM-DD",
-          numberFormat: "1,234.56",
-          currencyCode: "USD",
-          avatarSize: 64,
-          productUpdates: true,
-          accountActivity: true,
-          securityAlerts: true
-        };
-      }
-    },
     workspaceInvitationsEnabled: true,
     appConfig: {
       tenancyMode: "workspaces"
     }
   });
 
-  await contributor.contribute({
+  const payload = await contributor.contribute({
     query: {
       workspaceSlug: "  AcMe  "
     },
-    request: {
-      async executeAction() {
-        return {
-          authenticated: true,
-          profile
-        };
+    payload: {
+      session: {
+        authenticated: true,
+        userId: profile.id
       }
-    },
-    reply: {}
-  });
-
-  assert.deepEqual(calls, ["acme"]);
-});
-
-test("workspace bootstrap contributor returns global payload with requestedWorkspace=forbidden when slug access is denied", async () => {
-  const profile = createAuthenticatedProfile();
-  const contributor = createWorkspaceBootstrapContributor({
-    workspaceService: {
-      async listWorkspacesForUser() {
-        return [{ id: 3, slug: "chiara", name: "Chiara Workspace" }];
-      },
-      async resolveWorkspaceContextForUserBySlug() {
-        const error = new Error("Forbidden.");
-        error.status = 403;
-        throw error;
-      }
-    },
-    workspacePendingInvitationsService: {
-      async listPendingInvitesForUser() {
-        return [];
-      }
-    },
-    usersRepository: {
-      async findByIdentity() {
-        return profile;
-      }
-    },
-    userSettingsRepository: {
-      async ensureForUserId() {
-        return {
-          theme: "system",
-          locale: "en",
-          timeZone: "UTC",
-          dateFormat: "YYYY-MM-DD",
-          numberFormat: "1,234.56",
-          currencyCode: "USD",
-          avatarSize: 64,
-          productUpdates: true,
-          accountActivity: true,
-          securityAlerts: true
-        };
-      }
-    },
-    workspaceInvitationsEnabled: true,
-    appConfig: {
-      tenancyMode: "workspaces"
     }
   });
 
-  const payload = await contributor.contribute({
-    query: {
-      workspaceSlug: "tonymobily"
-    },
-    request: {
-      async executeAction() {
-        return {
-          authenticated: true,
-          profile
-        };
-      }
-    },
-    reply: {}
-  });
-
-  assert.equal(payload.session.authenticated, true);
-  assert.deepEqual(payload.workspaces, [{ id: 3, slug: "chiara", name: "Chiara Workspace" }]);
+  assert.deepEqual(calls, ["acme"]);
   assert.deepEqual(payload.requestedWorkspace, {
-    slug: "tonymobily",
-    status: "forbidden"
+    slug: "acme",
+    status: "resolved"
   });
-  assert.equal(payload.activeWorkspace, null);
-  assert.equal(payload.membership, null);
-  assert.deepEqual(payload.permissions, []);
-  assert.equal(payload.workspaceSettings, null);
 });
 
-test("workspace bootstrap contributor returns requestedWorkspace=not_found when slug does not exist", async () => {
-  const profile = createAuthenticatedProfile();
+test("workspace bootstrap contributor reports unauthenticated requested workspace without generic bootstrap work", async () => {
   const contributor = createWorkspaceBootstrapContributor({
     workspaceService: {
       async listWorkspacesForUser() {
-        return [{ id: 1, slug: "acme", name: "Acme Workspace" }];
+        assert.fail("listWorkspacesForUser should not run for unauthenticated payloads");
       },
       async resolveWorkspaceContextForUserBySlug() {
-        const error = new Error("Workspace not found.");
-        error.status = 404;
-        throw error;
+        assert.fail("resolveWorkspaceContextForUserBySlug should not run for unauthenticated payloads");
       }
     },
     workspacePendingInvitationsService: {
       async listPendingInvitesForUser() {
-        return [];
+        assert.fail("listPendingInvitesForUser should not run for unauthenticated payloads");
       }
     },
     usersRepository: {
-      async findByIdentity() {
-        return profile;
-      }
-    },
-    userSettingsRepository: {
-      async ensureForUserId() {
-        return {
-          theme: "system",
-          locale: "en",
-          timeZone: "UTC",
-          dateFormat: "YYYY-MM-DD",
-          numberFormat: "1,234.56",
-          currencyCode: "USD",
-          avatarSize: 64,
-          productUpdates: true,
-          accountActivity: true,
-          securityAlerts: true
-        };
+      async findById() {
+        assert.fail("findById should not run for unauthenticated payloads");
       }
     },
-    workspaceInvitationsEnabled: false,
+    workspaceInvitationsEnabled: true,
     appConfig: {
       tenancyMode: "workspaces"
     }
@@ -392,75 +136,19 @@ test("workspace bootstrap contributor returns requestedWorkspace=not_found when
 
   const payload = await contributor.contribute({
     query: {
-      workspaceSlug: "missing-workspace"
+      workspaceSlug: "AcMe"
     },
-    request: {
-      async executeAction() {
-        return {
-          authenticated: true,
-          profile
-        };
+    payload: {
+      session: {
+        authenticated: false
       }
-    },
-    reply: {}
-  });
-
-  assert.deepEqual(payload.requestedWorkspace, {
-    slug: "missing-workspace",
-    status: "not_found"
-  });
-  assert.deepEqual(payload.workspaces, [{ id: 1, slug: "acme", name: "Acme Workspace" }]);
-});
-
-test("workspace bootstrap contributor returns requestedWorkspace=unauthenticated for anonymous workspace slug query", async () => {
-  const contributor = createWorkspaceBootstrapContributor({
-    workspaceService: {
-      async listWorkspacesForUser() {
-        return [];
-      },
-      async resolveWorkspaceContextForUserBySlug() {
-        return null;
-      }
-    },
-    workspacePendingInvitationsService: {
-      async listPendingInvitesForUser() {
-        return [];
-      }
-    },
-    usersRepository: {
-      async findByIdentity() {
-        return null;
-      }
-    },
-    userSettingsRepository: {
-      async ensureForUserId() {
-        return {};
-      }
-    },
-    workspaceInvitationsEnabled: false,
-    appConfig: {
-      tenancyMode: "workspaces"
     }
   });
 
-  const payload = await contributor.contribute({
-    query: {
-      workspaceSlug: "tonymobily"
-    },
-    request: {
-      async executeAction() {
-        return {
-          authenticated: false
-        };
-      }
-    },
-    reply: {}
-  });
-
-  assert.equal(payload.session.authenticated, false);
-  assert.deepEqual(payload.requestedWorkspace, {
-    slug: "tonymobily",
-    status: "unauthenticated"
+  assert.deepEqual(payload, {
+    requestedWorkspace: {
+      slug: "acme",
+      status: "unauthenticated"
+    }
   });
-  assert.deepEqual(payload.workspaces, []);
 });

package/test-support/registerDefaultSettingsFields.js

@@ -1,3 +1,3 @@
-import "../templates/packages/main/src/shared/resources/workspaceSettingsFields.js";
+import "../../workspaces-core/templates/packages/main/src/shared/resources/workspaceSettingsFields.js";
 import "../templates/packages/main/src/shared/resources/consoleSettingsFields.js";
 import "../templates/packages/main/src/shared/resources/userSettingsFields.js";

package/templates/config/roles.js

@@ -1,27 +0,0 @@
-export const roleCatalog = {
-  workspace: {
-    defaultInviteRole: "member"
-  },
-  roles: {
-    owner: {
-      assignable: false,
-      permissions: ["*"]
-    },
-    admin: {
-      assignable: true,
-      inherits: "member",
-      permissions: [
-        "workspace.roles.view",
-        "workspace.settings.update",
-        "workspace.members.view",
-        "workspace.members.invite",
-        "workspace.members.manage",
-        "workspace.invites.revoke"
-      ]
-    },
-    member: {
-      assignable: true,
-      permissions: ["workspace.settings.view"]
-    }
-  }
-};

package/templates/migrations/users_core_initial.cjs

@@ -1,123 +0,0 @@
-/**
- * @param {import('knex').Knex} knex
- */
-exports.up = async function up(knex) {
-  await knex.schema.createTable("users", (table) => {
-    table.increments("id").primary();
-    table.string("auth_provider", 64).notNullable();
-    table.string("auth_provider_user_sid", 191).notNullable();
-    table.string("email", 255).notNullable();
-    table.string("username", 120).notNullable();
-    table.string("display_name", 160).notNullable();
-    table.string("avatar_storage_key", 512).nullable();
-    table.string("avatar_version", 64).nullable();
-    table.timestamp("avatar_updated_at", { useTz: false }).nullable();
-    table.timestamp("created_at", { useTz: false }).notNullable().defaultTo(knex.fn.now());
-    table.unique(["auth_provider", "auth_provider_user_sid"], "uq_users_identity");
-    table.unique(["email"], "uq_users_email");
-    table.unique(["username"], "uq_users_username");
-  });
-
-  await knex.schema.createTable("workspaces", (table) => {
-    table.increments("id").primary();
-    table.string("slug", 120).notNullable().unique();
-    table.string("name", 160).notNullable();
-    table.integer("owner_user_id").unsigned().notNullable().references("id").inTable("users").onDelete("CASCADE");
-    table.boolean("is_personal").notNullable().defaultTo(true);
-    table.string("avatar_url", 512).notNullable().defaultTo("");
-    table.string("color", 7).notNullable().defaultTo("#1867C0");
-    table.timestamp("created_at", { useTz: false }).notNullable().defaultTo(knex.fn.now());
-    table.timestamp("updated_at", { useTz: false }).notNullable().defaultTo(knex.fn.now());
-    table.timestamp("deleted_at", { useTz: false }).nullable();
-  });
-
-  await knex.schema.createTable("workspace_memberships", (table) => {
-    table.increments("id").primary();
-    table.integer("workspace_id").unsigned().notNullable().references("id").inTable("workspaces").onDelete("CASCADE");
-    table.integer("user_id").unsigned().notNullable().references("id").inTable("users").onDelete("CASCADE");
-    table.string("role_sid", 64).notNullable().defaultTo("member");
-    table.string("status", 32).notNullable().defaultTo("active");
-    table.timestamp("created_at", { useTz: false }).notNullable().defaultTo(knex.fn.now());
-    table.timestamp("updated_at", { useTz: false }).notNullable().defaultTo(knex.fn.now());
-    table.unique(["workspace_id", "user_id"], "uq_workspace_memberships_workspace_user");
-  });
-
-  await knex.schema.createTable("workspace_settings", (table) => {
-    table.integer("workspace_id").unsigned().primary().references("id").inTable("workspaces").onDelete("CASCADE");
-    table.string("name", 160).notNullable().defaultTo("Workspace");
-    table.string("avatar_url", 512).notNullable().defaultTo("");
-    table.string("light_primary_color", 7).notNullable().defaultTo("#1867C0");
-    table.string("light_secondary_color", 7).notNullable().defaultTo("#48A9A6");
-    table.string("light_surface_color", 7).notNullable().defaultTo("#FFFFFF");
-    table.string("light_surface_variant_color", 7).notNullable().defaultTo("#424242");
-    table.string("dark_primary_color", 7).notNullable().defaultTo("#2196F3");
-    table.string("dark_secondary_color", 7).notNullable().defaultTo("#54B6B2");
-    table.string("dark_surface_color", 7).notNullable().defaultTo("#212121");
-    table.string("dark_surface_variant_color", 7).notNullable().defaultTo("#C8C8C8");
-    table.boolean("invites_enabled").notNullable().defaultTo(true);
-    table.timestamp("created_at", { useTz: false }).notNullable().defaultTo(knex.fn.now());
-    table.timestamp("updated_at", { useTz: false }).notNullable().defaultTo(knex.fn.now());
-  });
-
-  await knex.schema.createTable("workspace_invites", (table) => {
-    table.increments("id").primary();
-    table.integer("workspace_id").unsigned().notNullable().references("id").inTable("workspaces").onDelete("CASCADE");
-    table.string("email", 255).notNullable();
-    table.string("role_sid", 64).notNullable().defaultTo("member");
-    table.string("status", 32).notNullable().defaultTo("pending");
-    table.string("token_hash", 191).notNullable();
-    table.integer("invited_by_user_id").unsigned().nullable().references("id").inTable("users").onDelete("SET NULL");
-    table.timestamp("expires_at", { useTz: false }).nullable();
-    table.timestamp("accepted_at", { useTz: false }).nullable();
-    table.timestamp("revoked_at", { useTz: false }).nullable();
-    table.timestamp("created_at", { useTz: false }).notNullable().defaultTo(knex.fn.now());
-    table.timestamp("updated_at", { useTz: false }).notNullable().defaultTo(knex.fn.now());
-    table.unique(["token_hash"], "uq_workspace_invites_token_hash");
-    table.index(["workspace_id", "status"], "idx_workspace_invites_workspace_status");
-  });
-
-  await knex.schema.createTable("user_settings", (table) => {
-    table.integer("user_id").unsigned().primary().references("id").inTable("users").onDelete("CASCADE");
-    table.integer("last_active_workspace_id").unsigned().nullable().references("id").inTable("workspaces").onDelete("SET NULL");
-    table.string("theme", 32).notNullable().defaultTo("system");
-    table.string("locale", 24).notNullable().defaultTo("en");
-    table.string("time_zone", 64).notNullable().defaultTo("UTC");
-    table.string("date_format", 32).notNullable().defaultTo("yyyy-mm-dd");
-    table.string("number_format", 32).notNullable().defaultTo("1,234.56");
-    table.string("currency_code", 3).notNullable().defaultTo("USD");
-    table.integer("avatar_size").notNullable().defaultTo(64);
-    table.boolean("password_sign_in_enabled").notNullable().defaultTo(true);
-    table.boolean("password_setup_required").notNullable().defaultTo(false);
-    table.boolean("notify_product_updates").notNullable().defaultTo(true);
-    table.boolean("notify_account_activity").notNullable().defaultTo(true);
-    table.boolean("notify_security_alerts").notNullable().defaultTo(true);
-    table.timestamp("created_at", { useTz: false }).notNullable().defaultTo(knex.fn.now());
-    table.timestamp("updated_at", { useTz: false }).notNullable().defaultTo(knex.fn.now());
-  });
-
-  await knex.schema.createTable("console_settings", (table) => {
-    table.integer("id").primary();
-    table.integer("owner_user_id").unsigned().nullable().references("id").inTable("users").onDelete("SET NULL");
-    table.timestamp("created_at", { useTz: false }).notNullable().defaultTo(knex.fn.now());
-    table.timestamp("updated_at", { useTz: false }).notNullable().defaultTo(knex.fn.now());
-  });
-
-  await knex("console_settings").insert({
-    id: 1,
-    created_at: knex.fn.now(),
-    updated_at: knex.fn.now()
-  });
-};
-
-/**
- * @param {import('knex').Knex} knex
- */
-exports.down = async function down(knex) {
-  await knex.schema.dropTableIfExists("console_settings");
-  await knex.schema.dropTableIfExists("user_settings");
-  await knex.schema.dropTableIfExists("workspace_invites");
-  await knex.schema.dropTableIfExists("workspace_settings");
-  await knex.schema.dropTableIfExists("workspace_memberships");
-  await knex.schema.dropTableIfExists("workspaces");
-  await knex.schema.dropTableIfExists("users");
-};

package/templates/migrations/users_core_workspace_settings_single_name_source.cjs

@@ -1,71 +0,0 @@
-const WORKSPACE_SETTINGS_TABLE = "workspace_settings";
-const WORKSPACES_TABLE = "workspaces";
-const LEGACY_NAME_COLUMN = "name";
-const LEGACY_AVATAR_COLUMN = "avatar_url";
-
-async function hasTable(knex, tableName) {
-  return knex.schema.hasTable(tableName);
-}
-
-async function hasColumn(knex, tableName, columnName) {
-  return knex.schema.hasColumn(tableName, columnName);
-}
-
-exports.up = async function up(knex) {
-  const hasWorkspaceSettings = await hasTable(knex, WORKSPACE_SETTINGS_TABLE);
-  if (!hasWorkspaceSettings) {
-    return;
-  }
-
-  const hasLegacyName = await hasColumn(knex, WORKSPACE_SETTINGS_TABLE, LEGACY_NAME_COLUMN);
-  const hasLegacyAvatarUrl = await hasColumn(knex, WORKSPACE_SETTINGS_TABLE, LEGACY_AVATAR_COLUMN);
-  if (!hasLegacyName && !hasLegacyAvatarUrl) {
-    return;
-  }
-
-  await knex.schema.alterTable(WORKSPACE_SETTINGS_TABLE, (table) => {
-    if (hasLegacyName) {
-      table.dropColumn(LEGACY_NAME_COLUMN);
-    }
-    if (hasLegacyAvatarUrl) {
-      table.dropColumn(LEGACY_AVATAR_COLUMN);
-    }
-  });
-};
-
-exports.down = async function down(knex) {
-  const hasWorkspaceSettings = await hasTable(knex, WORKSPACE_SETTINGS_TABLE);
-  if (!hasWorkspaceSettings) {
-    return;
-  }
-
-  const hasLegacyName = await hasColumn(knex, WORKSPACE_SETTINGS_TABLE, LEGACY_NAME_COLUMN);
-  const hasLegacyAvatarUrl = await hasColumn(knex, WORKSPACE_SETTINGS_TABLE, LEGACY_AVATAR_COLUMN);
-  if (!hasLegacyName || !hasLegacyAvatarUrl) {
-    await knex.schema.alterTable(WORKSPACE_SETTINGS_TABLE, (table) => {
-      if (!hasLegacyName) {
-        table.string(LEGACY_NAME_COLUMN, 160).notNullable().defaultTo("Workspace");
-      }
-      if (!hasLegacyAvatarUrl) {
-        table.string(LEGACY_AVATAR_COLUMN, 512).notNullable().defaultTo("");
-      }
-    });
-  }
-
-  const hasWorkspaces = await hasTable(knex, WORKSPACES_TABLE);
-  if (!hasWorkspaces) {
-    return;
-  }
-
-  const workspaceRows = await knex(WORKSPACES_TABLE).select("id", "name", "avatar_url");
-  for (const workspaceRow of workspaceRows) {
-    const normalizedName = String(workspaceRow?.name || "").trim() || "Workspace";
-    const normalizedAvatarUrl = String(workspaceRow?.avatar_url || "").trim();
-    await knex(WORKSPACE_SETTINGS_TABLE)
-      .where({ workspace_id: Number(workspaceRow.id) })
-      .update({
-        name: normalizedName,
-        avatar_url: normalizedAvatarUrl
-      });
-  }
-};