@jskit-ai/users-core 0.1.23 → 0.1.25

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/users-core",
-  version: "0.1.23",
+  version: "0.1.25",
   description: "Users/workspace domain runtime plus HTTP routes for workspace, account, and console features.",
   dependsOn: [
     "@jskit-ai/auth-core",
@@ -261,6 +261,15 @@ export default Object.freeze({
         category: "migration",
         id: "users-core-workspace-settings-single-name-source"
       },
+      {
+        op: "install-migration",
+        from: "templates/migrations/users_core_workspaces_drop_color.cjs",
+        toDir: "migrations",
+        extension: ".cjs",
+        reason: "Drop legacy workspaces.color now that workspace theme colors live in workspace_settings.",
+        category: "migration",
+        id: "users-core-workspaces-drop-color"
+      },
       {
         from: "templates/packages/main/src/shared/resources/workspaceSettingsFields.js",
         to: "packages/main/src/shared/resources/workspaceSettingsFields.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/users-core",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "type": "module",
   "scripts": {
     "test": "node --test"

package/src/server/common/formatters/workspaceFormatter.js

@@ -1,7 +1,4 @@
-import {
-  coerceWorkspaceColor,
-  resolveWorkspaceThemePalettes
-} from "../../../shared/settings.js";
+import { resolveWorkspaceThemePalettes } from "../../../shared/settings.js";
 import { normalizeLowerText, normalizeText } from "@jskit-ai/kernel/shared/actions/textNormalization";
 
 function mapWorkspaceSummary(workspace, membership) {
@@ -9,7 +6,6 @@ function mapWorkspaceSummary(workspace, membership) {
     id: Number(workspace.id),
     slug: normalizeText(workspace.slug),
     name: normalizeText(workspace.name),
-    color: coerceWorkspaceColor(workspace.color),
     avatarUrl: normalizeText(workspace.avatarUrl),
     roleId: normalizeLowerText(membership?.roleId || "member") || "member",
     isAccessible: normalizeLowerText(membership?.status || "active") === "active"

package/src/server/common/repositories/workspacesRepository.js

@@ -6,13 +6,11 @@ import {
   nowDb,
   isDuplicateEntryError
 } from "./repositoryUtils.js";
-import { coerceWorkspaceColor } from "../../../shared/settings.js";
 
 function mapRow(row) {
   if (!row) {
     return null;
   }
-  const color = coerceWorkspaceColor(row.color);
 
   return {
     id: Number(row.id),
@@ -21,7 +19,6 @@ function mapRow(row) {
     ownerUserId: Number(row.owner_user_id),
     isPersonal: Boolean(row.is_personal),
     avatarUrl: row.avatar_url ? normalizeText(row.avatar_url) : "",
-    color,
     createdAt: toIsoString(row.created_at),
     updatedAt: toIsoString(row.updated_at),
     deletedAt: toNullableIso(row.deleted_at)
@@ -53,7 +50,6 @@ function createRepository(knex) {
       "w.owner_user_id",
       "w.is_personal",
       "w.avatar_url",
-      "w.color",
       "w.created_at",
       "w.updated_at",
       "w.deleted_at"
@@ -107,7 +103,6 @@ function createRepository(knex) {
       owner_user_id: Number(source.ownerUserId),
       is_personal: source.isPersonal ? 1 : 0,
       avatar_url: normalizeText(source.avatarUrl),
-      color: coerceWorkspaceColor(source.color),
       created_at: nowDb(),
       updated_at: nowDb(),
       deleted_at: null
@@ -146,9 +141,6 @@ function createRepository(knex) {
     if (Object.hasOwn(source, "avatarUrl")) {
       dbPatch.avatar_url = normalizeText(source.avatarUrl);
     }
-    if (Object.hasOwn(source, "color")) {
-      dbPatch.color = coerceWorkspaceColor(source.color);
-    }
 
     await client("workspaces").where({ id: Number(workspaceId) }).update(dbPatch);
     return findById(workspaceId, { trx: client });

package/src/server/common/services/workspaceContextService.js

@@ -4,7 +4,6 @@ import {
   TENANCY_MODE_NONE,
   resolveTenancyProfile
 } from "../../../shared/tenancyProfile.js";
-import { coerceWorkspaceColor } from "../../../shared/settings.js";
 import {
   resolveRolePermissions
 } from "../../../shared/roles.js";
@@ -84,7 +83,6 @@ function createService({
   const resolvedTenancyProfile = resolveTenancyProfile(appConfig);
   const resolvedTenancyMode = resolvedTenancyProfile.mode;
   const workspacePolicy = resolvedTenancyProfile.workspace;
-  const resolvedWorkspaceColor = coerceWorkspaceColor(appConfig.workspaceColor);
   async function ensureUniqueWorkspaceSlug(baseSlug, options = {}) {
     let suffix = 0;
     while (suffix < 1000) {
@@ -125,8 +123,7 @@ function createService({
         name: buildWorkspaceName(normalizedUser),
         ownerUserId: normalizedUser.id,
         isPersonal: true,
-        avatarUrl: "",
-        color: resolvedWorkspaceColor
+        avatarUrl: ""
       },
       options
     );
@@ -194,8 +191,7 @@ function createService({
         name: createInput.name,
         ownerUserId: normalizedUser.id,
         isPersonal: false,
-        avatarUrl: "",
-        color: resolvedWorkspaceColor
+        avatarUrl: ""
       },
       options
     );

package/src/shared/resources/workspaceMembersResource.js

@@ -11,8 +11,7 @@ const workspaceSummaryOutputSchema = Type.Object(
     slug: Type.String({ minLength: 1 }),
     name: Type.String({ minLength: 1 }),
     ownerUserId: Type.Integer({ minimum: 1 }),
-    avatarUrl: Type.String(),
-    color: Type.String({ minLength: 1 })
+    avatarUrl: Type.String()
   },
   { additionalProperties: false }
 );
@@ -49,8 +48,7 @@ function normalizeWorkspaceAdminSummary(workspace) {
     slug: normalizeText(source.slug),
     name: normalizeText(source.name),
     ownerUserId: Number(source.ownerUserId),
-    avatarUrl: normalizeText(source.avatarUrl),
-    color: normalizeText(source.color)
+    avatarUrl: normalizeText(source.avatarUrl)
   };
 }
 

package/src/shared/resources/workspaceResource.js

@@ -36,10 +36,6 @@ function normalizeWorkspaceInput(payload = {}) {
   if (Object.hasOwn(source, "avatarUrl")) {
     normalized.avatarUrl = normalizeWorkspaceAvatarUrl(source.avatarUrl);
   }
-  if (Object.hasOwn(source, "color")) {
-    const color = normalizeText(source.color);
-    normalized.color = /^#[0-9A-Fa-f]{6}$/.test(color) ? color.toUpperCase() : null;
-  }
   if (Object.hasOwn(source, "isPersonal")) {
     normalized.isPersonal = source.isPersonal === true;
   }
@@ -55,8 +51,7 @@ function normalizeWorkspaceOutput(payload = {}) {
     slug: normalizeLowerText(source.slug),
     name: normalizeText(source.name),
     ownerUserId: Number(source.ownerUserId),
-    avatarUrl: normalizeText(source.avatarUrl),
-    color: normalizeText(source.color).toUpperCase()
+    avatarUrl: normalizeText(source.avatarUrl)
   };
 }
 
@@ -67,7 +62,6 @@ function normalizeWorkspaceListItemOutput(payload = {}) {
     id: Number(source.id),
     slug: normalizeLowerText(source.slug),
     name: normalizeText(source.name),
-    color: normalizeText(source.color).toUpperCase(),
     avatarUrl: normalizeText(source.avatarUrl),
     roleId: normalizeLowerText(source.roleId || "member") || "member",
     isAccessible: source.isAccessible !== false
@@ -80,8 +74,7 @@ const responseRecordSchema = Type.Object(
     slug: Type.String({ minLength: 1 }),
     name: Type.String({ minLength: 1, maxLength: 160 }),
     ownerUserId: Type.Integer({ minimum: 1 }),
-    avatarUrl: Type.String(),
-    color: Type.String({ minLength: 7, maxLength: 7, pattern: "^#[0-9A-Fa-f]{6}$" })
+    avatarUrl: Type.String()
   },
   { additionalProperties: false }
 );
@@ -91,7 +84,6 @@ const listItemSchema = Type.Object(
     id: Type.Integer({ minimum: 1 }),
     slug: Type.String({ minLength: 1 }),
     name: Type.String({ minLength: 1, maxLength: 160 }),
-    color: Type.String({ minLength: 7, maxLength: 7, pattern: "^#[0-9A-Fa-f]{6}$" }),
     avatarUrl: Type.String(),
     roleId: Type.String({ minLength: 1 }),
     isAccessible: Type.Boolean()
@@ -118,17 +110,6 @@ const patchRequestBodySchema = Type.Object(
           default: "Workspace avatar URL must be a valid absolute URL (http:// or https://)."
         }
       })
-    ),
-    color: Type.Optional(
-      Type.String({
-        minLength: 7,
-        maxLength: 7,
-        pattern: "^#[0-9A-Fa-f]{6}$",
-        messages: {
-          pattern: "Workspace color must be a hex color like #1867C0.",
-          default: "Workspace color must be a hex color like #1867C0."
-        }
-      })
     )
   },
   { additionalProperties: false }

package/templates/migrations/users_core_workspaces_drop_color.cjs

@@ -0,0 +1,85 @@
+const WORKSPACES_TABLE = "workspaces";
+const WORKSPACE_SETTINGS_TABLE = "workspace_settings";
+const LEGACY_COLOR_COLUMN = "color";
+const SETTINGS_LIGHT_PRIMARY_COLOR_COLUMN = "light_primary_color";
+const DEFAULT_WORKSPACE_COLOR = "#1867C0";
+
+async function hasTable(knex, tableName) {
+  return knex.schema.hasTable(tableName);
+}
+
+async function hasColumn(knex, tableName, columnName) {
+  return knex.schema.hasColumn(tableName, columnName);
+}
+
+function normalizeHexColor(value) {
+  const normalized = String(value || "").trim().toUpperCase();
+  return /^#[0-9A-F]{6}$/.test(normalized) ? normalized : "";
+}
+
+exports.up = async function up(knex) {
+  const hasWorkspaces = await hasTable(knex, WORKSPACES_TABLE);
+  if (!hasWorkspaces) {
+    return;
+  }
+
+  const hasLegacyColor = await hasColumn(knex, WORKSPACES_TABLE, LEGACY_COLOR_COLUMN);
+  if (!hasLegacyColor) {
+    return;
+  }
+
+  await knex.schema.alterTable(WORKSPACES_TABLE, (table) => {
+    table.dropColumn(LEGACY_COLOR_COLUMN);
+  });
+};
+
+exports.down = async function down(knex) {
+  const hasWorkspaces = await hasTable(knex, WORKSPACES_TABLE);
+  if (!hasWorkspaces) {
+    return;
+  }
+
+  const hasLegacyColor = await hasColumn(knex, WORKSPACES_TABLE, LEGACY_COLOR_COLUMN);
+  if (!hasLegacyColor) {
+    await knex.schema.alterTable(WORKSPACES_TABLE, (table) => {
+      table.string(LEGACY_COLOR_COLUMN, 7).notNullable().defaultTo(DEFAULT_WORKSPACE_COLOR);
+    });
+  }
+
+  const hasWorkspaceSettings = await hasTable(knex, WORKSPACE_SETTINGS_TABLE);
+  if (!hasWorkspaceSettings) {
+    return;
+  }
+
+  const hasLightPrimaryColor = await hasColumn(
+    knex,
+    WORKSPACE_SETTINGS_TABLE,
+    SETTINGS_LIGHT_PRIMARY_COLOR_COLUMN
+  );
+  if (!hasLightPrimaryColor) {
+    return;
+  }
+
+  const workspaceSettingsRows = await knex(WORKSPACE_SETTINGS_TABLE).select(
+    "workspace_id",
+    SETTINGS_LIGHT_PRIMARY_COLOR_COLUMN
+  );
+
+  for (const row of workspaceSettingsRows) {
+    const workspaceId = Number(row?.workspace_id || 0);
+    if (!Number.isInteger(workspaceId) || workspaceId < 1) {
+      continue;
+    }
+
+    const restoredColor = normalizeHexColor(row?.[SETTINGS_LIGHT_PRIMARY_COLOR_COLUMN]);
+    if (!restoredColor) {
+      continue;
+    }
+
+    await knex(WORKSPACES_TABLE)
+      .where({ id: workspaceId })
+      .update({
+        color: restoredColor
+      });
+  }
+};

package/test/usersRouteRequestInputValidator.test.js

@@ -471,7 +471,7 @@ test("workspace route handlers build action input from request.input", async ()
     createActionRequest({
       input: {
         params: { workspaceSlug: "acme" },
-        body: { name: "Acme", avatarUrl: "https://example.com/acme.png", color: "#0F6B54" }
+        body: { name: "Acme", avatarUrl: "https://example.com/acme.png" }
       },
       executeAction
     }),
@@ -482,7 +482,7 @@ test("workspace route handlers build action input from request.input", async ()
     actionId: "workspace.workspaces.update",
     input: {
       workspaceSlug: "acme",
-      patch: { name: "Acme", avatarUrl: "https://example.com/acme.png", color: "#0F6B54" }
+      patch: { name: "Acme", avatarUrl: "https://example.com/acme.png" }
     }
   });
 });

package/test/workspaceMembersService.test.js

@@ -42,8 +42,7 @@ function createFixture() {
     slug: "tonymobily3",
     name: "TonyMobily3",
     ownerUserId: 9,
-    avatarUrl: "",
-    color: "#0F6B54"
+    avatarUrl: ""
   };
 
   const service = createService({
@@ -248,8 +247,7 @@ test("workspaceMembersService.listMembers uses the resolved workspace directly",
     slug: "tonymobily3",
     name: "TonyMobily3",
     ownerUserId: 9,
-    avatarUrl: "",
-    color: "#0F6B54"
+    avatarUrl: ""
   });
   assert.equal(response.members.length, 1);
   assert.equal(response.members[0].displayName, "Alice");
@@ -278,8 +276,7 @@ test("workspaceMembersService.removeMember marks membership revoked and returns
     slug: "tonymobily3",
     name: "TonyMobily3",
     ownerUserId: 9,
-    avatarUrl: "",
-    color: "#0F6B54"
+    avatarUrl: ""
   };
   const service = createService({
     workspaceMembershipsRepository: {
@@ -349,8 +346,7 @@ test("workspaceMembersService.removeMember rejects removing the owner", async ()
     slug: "tonymobily3",
     name: "TonyMobily3",
     ownerUserId: 9,
-    avatarUrl: "",
-    color: "#0F6B54"
+    avatarUrl: ""
   };
   const service = createService({
     workspaceMembershipsRepository: {

package/test/workspaceService.test.js

@@ -31,8 +31,7 @@ function createWorkspaceServiceFixture({
     name: "TonyMobily3",
     ownerUserId: 7,
     isPersonal: true,
-    avatarUrl: "",
-    color: "#0F6B54"
+    avatarUrl: ""
   }
 } = {}) {
   const calls = {
@@ -96,7 +95,6 @@ function createWorkspaceServiceFixture({
             slug: "tonymobily3",
             name: "TonyMobily3",
             avatarUrl: "",
-            color: "#0F6B54",
             roleId: "owner",
             membershipStatus: "active"
           },
@@ -105,7 +103,6 @@ function createWorkspaceServiceFixture({
             slug: "pending-workspace",
             name: "Pending Workspace",
             avatarUrl: "",
-            color: "#0F6B54",
             roleId: "member",
             membershipStatus: "pending"
           }
@@ -121,8 +118,7 @@ function createWorkspaceServiceFixture({
           name: String(payload.name || ""),
           ownerUserId: Number(payload.ownerUserId),
           isPersonal: payload.isPersonal === true,
-          avatarUrl: String(payload.avatarUrl || ""),
-          color: String(payload.color || "#0F6B54")
+          avatarUrl: String(payload.avatarUrl || "")
         };
         workspaceBySlug.set(String(inserted.slug).trim().toLowerCase(), inserted);
         return inserted;
@@ -143,9 +139,6 @@ function createWorkspaceServiceFixture({
           if (Object.hasOwn(patch, "avatarUrl")) {
             updated.avatarUrl = String(patch.avatarUrl || "");
           }
-          if (Object.hasOwn(patch, "color")) {
-            updated.color = String(patch.color || "#0F6B54");
-          }
           workspaceBySlug.set(slug, updated);
           return {
             ...updated
@@ -227,7 +220,6 @@ test("workspaceService.listWorkspacesForUser returns all active memberships in p
         slug: "chiaramobily",
         name: "Chiara Personal",
         avatarUrl: "",
-        color: "#0F6B54",
         roleId: "owner",
         membershipStatus: "active"
       },
@@ -236,7 +228,6 @@ test("workspaceService.listWorkspacesForUser returns all active memberships in p
         slug: "tonymobily",
         name: "Tony Workspace",
         avatarUrl: "",
-        color: "#0F6B54",
         roleId: "member",
         membershipStatus: "active"
       },
@@ -245,7 +236,6 @@ test("workspaceService.listWorkspacesForUser returns all active memberships in p
         slug: "pending-workspace",
         name: "Pending Workspace",
         avatarUrl: "",
-        color: "#0F6B54",
         roleId: "member",
         membershipStatus: "pending"
       }
@@ -379,8 +369,7 @@ test("workspaceService.resolveWorkspaceContextForUserBySlug allows personal tena
       name: "My Personal",
       ownerUserId: 7,
       isPersonal: true,
-      avatarUrl: "",
-      color: "#0F6B54"
+      avatarUrl: ""
     },
     additionalWorkspaces: [
       {
@@ -389,8 +378,7 @@ test("workspaceService.resolveWorkspaceContextForUserBySlug allows personal tena
         name: "Team Alpha",
         ownerUserId: 99,
         isPersonal: false,
-        avatarUrl: "",
-        color: "#0F6B54"
+        avatarUrl: ""
       }
     ]
   });
@@ -429,8 +417,7 @@ test("workspaceService.resolveWorkspaceContextForUserBySlug grants owner access
           name: "TonyMobily",
           ownerUserId: 7,
           isPersonal: true,
-          avatarUrl: "",
-          color: "#0F6B54"
+          avatarUrl: ""
         };
       },
       async findPersonalByOwnerUserId() {
@@ -515,8 +502,7 @@ test("workspaceService.getWorkspaceForAuthenticatedUser resolves workspace from
         name: "Team Alpha",
         ownerUserId: 99,
         isPersonal: false,
-        avatarUrl: "",
-        color: "#0F6B54"
+        avatarUrl: ""
       }
     ]
   });
@@ -546,13 +532,11 @@ test("workspaceService.updateWorkspaceForAuthenticatedUser updates workspace pro
     "tonymobily3",
     {
       name: "Updated Workspace",
-      avatarUrl: "https://example.com/acme.png",
-      color: "#123ABC"
+      avatarUrl: "https://example.com/acme.png"
     }
   );
 
   assert.equal(calls.updateById, 1);
   assert.equal(workspace.name, "Updated Workspace");
   assert.equal(workspace.avatarUrl, "https://example.com/acme.png");
-  assert.equal(workspace.color, "#123ABC");
 });

package/test/workspaceSettingsService.test.js

@@ -25,8 +25,7 @@ function createFixture({ workspaceInvitationsEnabled = true } = {}) {
       id: 7,
       slug: "tonymobily3",
       name: "TonyMobily3",
-      ownerUserId: 9,
-      color: defaultTheme.light.color
+      ownerUserId: 9
     },
     settings: {
       lightPrimaryColor: defaultTheme.light.color,