@jskit-ai/users-core 0.1.25 → 0.1.27

package/test/usersApiPaths.test.js

@@ -18,7 +18,7 @@ test("resolveApiBasePath resolves workspace and non-workspace API base paths", (
       surfaceRequiresWorkspace: true,
       relativePath: "/customers"
     }),
-    "/api/w/:workspaceSlug/workspace/customers"
+    "/api/w/:workspaceSlug/customers"
   );
 
   assert.equal(
@@ -36,7 +36,7 @@ test("resolveApiBasePath preserves query strings and hash fragments", () => {
       surfaceRequiresWorkspace: true,
       relativePath: "/customers?search=buddy#top"
     }),
-    "/api/w/:workspaceSlug/workspace/customers?search=buddy#top"
+    "/api/w/:workspaceSlug/customers?search=buddy#top"
   );
 
   assert.equal(

package/test/usersRouteRequestInputValidator.test.js

@@ -1,6 +1,5 @@
 import assert from "node:assert/strict";
 import test from "node:test";
-import { KERNEL_TOKENS } from "@jskit-ai/kernel/shared/support/tokens";
 import { UsersCoreServiceProvider } from "../src/server/UsersCoreServiceProvider.js";
 import { resolveTenancyProfile } from "../src/shared/tenancyProfile.js";
 
@@ -49,7 +48,7 @@ async function registerRoutes({
   };
 
   const bindings = new Map([
-    [KERNEL_TOKENS.HttpRouter, router],
+    ["jskit.http.router", router],
     ["authService", authService],
     [
       "users.accountProfile.service",
@@ -124,27 +123,27 @@ test("workspace and settings routes attach only the shared transport normalizers
 
   const workspaceSettings = findRoute(routes, {
     method: "GET",
-    path: "/api/w/:workspaceSlug/workspace/settings"
+    path: "/api/w/:workspaceSlug/settings"
   });
   const workspacePatch = findRoute(routes, {
     method: "PATCH",
-    path: "/api/w/:workspaceSlug/workspace"
+    path: "/api/w/:workspaceSlug"
   });
   const workspaceSettingsPatch = findRoute(routes, {
     method: "PATCH",
-    path: "/api/w/:workspaceSlug/workspace/settings"
+    path: "/api/w/:workspaceSlug/settings"
   });
   const workspaceMemberRole = findRoute(routes, {
     method: "PATCH",
-    path: "/api/w/:workspaceSlug/workspace/members/:memberUserId/role"
+    path: "/api/w/:workspaceSlug/members/:memberUserId/role"
   });
   const workspaceMemberDelete = findRoute(routes, {
     method: "DELETE",
-    path: "/api/w/:workspaceSlug/workspace/members/:memberUserId"
+    path: "/api/w/:workspaceSlug/members/:memberUserId"
   });
   const workspaceInviteDelete = findRoute(routes, {
     method: "DELETE",
-    path: "/api/w/:workspaceSlug/workspace/invites/:inviteId"
+    path: "/api/w/:workspaceSlug/invites/:inviteId"
   });
   const settingsProfilePatch = findRoute(routes, {
     method: "PATCH",
@@ -176,19 +175,19 @@ test("workspace core/settings routes mount one canonical workspace endpoint", as
   const routes = await registerRoutes();
   const workspace = findRoute(routes, {
     method: "GET",
-    path: "/api/w/:workspaceSlug/workspace"
+    path: "/api/w/:workspaceSlug"
   });
   const workspacePatch = findRoute(routes, {
     method: "PATCH",
-    path: "/api/w/:workspaceSlug/workspace"
+    path: "/api/w/:workspaceSlug"
   });
   const workspaceSettings = findRoute(routes, {
     method: "GET",
-    path: "/api/w/:workspaceSlug/workspace/settings"
+    path: "/api/w/:workspaceSlug/settings"
   });
   const workspaceSettingsPatch = findRoute(routes, {
     method: "PATCH",
-    path: "/api/w/:workspaceSlug/workspace/settings"
+    path: "/api/w/:workspaceSlug/settings"
   });
   const adminWorkspaceSettings = findRoute(routes, {
     method: "GET",
@@ -223,9 +222,9 @@ test("users-core boot skips workspace routes when workspace policy is disabled",
 
   assert.equal(findRoute(routes, { method: "GET", path: "/api/workspaces" }), null);
   assert.equal(findRoute(routes, { method: "POST", path: "/api/workspaces" }), null);
-  assert.equal(findRoute(routes, { method: "GET", path: "/api/w/:workspaceSlug/workspace" }), null);
-  assert.equal(findRoute(routes, { method: "PATCH", path: "/api/w/:workspaceSlug/workspace" }), null);
-  assert.equal(findRoute(routes, { method: "GET", path: "/api/w/:workspaceSlug/workspace/settings" }), null);
+  assert.equal(findRoute(routes, { method: "GET", path: "/api/w/:workspaceSlug" }), null);
+  assert.equal(findRoute(routes, { method: "PATCH", path: "/api/w/:workspaceSlug" }), null);
+  assert.equal(findRoute(routes, { method: "GET", path: "/api/w/:workspaceSlug/settings" }), null);
   assert.equal(findRoute(routes, { method: "GET", path: "/api/settings" })?.path, "/api/settings");
 });
 
@@ -262,24 +261,24 @@ test("users-core route registration follows tenancy mode matrix", async () => {
 
   assert.equal(findRoute(noneRoutes, { method: "GET", path: "/api/workspaces" }), null);
   assert.equal(findRoute(noneRoutes, { method: "POST", path: "/api/workspaces" }), null);
-  assert.equal(findRoute(noneRoutes, { method: "GET", path: "/api/w/:workspaceSlug/workspace" }), null);
-  assert.equal(findRoute(noneRoutes, { method: "PATCH", path: "/api/w/:workspaceSlug/workspace" }), null);
-  assert.equal(findRoute(noneRoutes, { method: "GET", path: "/api/w/:workspaceSlug/workspace/settings" }), null);
+  assert.equal(findRoute(noneRoutes, { method: "GET", path: "/api/w/:workspaceSlug" }), null);
+  assert.equal(findRoute(noneRoutes, { method: "PATCH", path: "/api/w/:workspaceSlug" }), null);
+  assert.equal(findRoute(noneRoutes, { method: "GET", path: "/api/w/:workspaceSlug/settings" }), null);
   assert.equal(findRoute(noneRoutes, { method: "GET", path: "/api/workspace/invitations/pending" }), null);
 
   assert.equal(findRoute(personalRoutes, { method: "GET", path: "/api/workspaces" })?.path, "/api/workspaces");
   assert.equal(findRoute(personalRoutes, { method: "POST", path: "/api/workspaces" }), null);
   assert.equal(
-    findRoute(personalRoutes, { method: "GET", path: "/api/w/:workspaceSlug/workspace" })?.path,
-    "/api/w/:workspaceSlug/workspace"
+    findRoute(personalRoutes, { method: "GET", path: "/api/w/:workspaceSlug" })?.path,
+    "/api/w/:workspaceSlug"
   );
   assert.equal(
-    findRoute(personalRoutes, { method: "PATCH", path: "/api/w/:workspaceSlug/workspace" })?.path,
-    "/api/w/:workspaceSlug/workspace"
+    findRoute(personalRoutes, { method: "PATCH", path: "/api/w/:workspaceSlug" })?.path,
+    "/api/w/:workspaceSlug"
   );
   assert.equal(
-    findRoute(personalRoutes, { method: "GET", path: "/api/w/:workspaceSlug/workspace/settings" })?.path,
-    "/api/w/:workspaceSlug/workspace/settings"
+    findRoute(personalRoutes, { method: "GET", path: "/api/w/:workspaceSlug/settings" })?.path,
+    "/api/w/:workspaceSlug/settings"
   );
   assert.equal(
     findRoute(personalRoutes, { method: "GET", path: "/api/workspace/invitations/pending" })?.path,
@@ -289,16 +288,16 @@ test("users-core route registration follows tenancy mode matrix", async () => {
   assert.equal(findRoute(workspaceRoutes, { method: "GET", path: "/api/workspaces" })?.path, "/api/workspaces");
   assert.equal(findRoute(workspaceRoutes, { method: "POST", path: "/api/workspaces" }), null);
   assert.equal(
-    findRoute(workspaceRoutes, { method: "GET", path: "/api/w/:workspaceSlug/workspace" })?.path,
-    "/api/w/:workspaceSlug/workspace"
+    findRoute(workspaceRoutes, { method: "GET", path: "/api/w/:workspaceSlug" })?.path,
+    "/api/w/:workspaceSlug"
   );
   assert.equal(
-    findRoute(workspaceRoutes, { method: "PATCH", path: "/api/w/:workspaceSlug/workspace" })?.path,
-    "/api/w/:workspaceSlug/workspace"
+    findRoute(workspaceRoutes, { method: "PATCH", path: "/api/w/:workspaceSlug" })?.path,
+    "/api/w/:workspaceSlug"
   );
   assert.equal(
-    findRoute(workspaceRoutes, { method: "GET", path: "/api/w/:workspaceSlug/workspace/settings" })?.path,
-    "/api/w/:workspaceSlug/workspace/settings"
+    findRoute(workspaceRoutes, { method: "GET", path: "/api/w/:workspaceSlug/settings" })?.path,
+    "/api/w/:workspaceSlug/settings"
   );
   assert.equal(
     findRoute(workspaceRoutes, { method: "GET", path: "/api/workspace/invitations/pending" })?.path,
@@ -321,9 +320,9 @@ test("users-core boot skips invitation redeem/list routes when workspace invitat
 
   assert.equal(findRoute(routes, { method: "GET", path: "/api/workspace/invitations/pending" }), null);
   assert.equal(findRoute(routes, { method: "POST", path: "/api/workspace/invitations/redeem" }), null);
-  assert.equal(findRoute(routes, { method: "GET", path: "/api/w/:workspaceSlug/workspace/invites" }), null);
-  assert.equal(findRoute(routes, { method: "POST", path: "/api/w/:workspaceSlug/workspace/invites" }), null);
-  assert.equal(findRoute(routes, { method: "DELETE", path: "/api/w/:workspaceSlug/workspace/invites/:inviteId" }), null);
+  assert.equal(findRoute(routes, { method: "GET", path: "/api/w/:workspaceSlug/invites" }), null);
+  assert.equal(findRoute(routes, { method: "POST", path: "/api/w/:workspaceSlug/invites" }), null);
+  assert.equal(findRoute(routes, { method: "DELETE", path: "/api/w/:workspaceSlug/invites/:inviteId" }), null);
 });
 
 test("workspace invite and member handlers build action input from request.input", async () => {
@@ -338,19 +337,19 @@ test("workspace invite and member handlers build action input from request.input
   });
   const workspaceMemberRolePatch = findRoute(routes, {
     method: "PATCH",
-    path: "/api/w/:workspaceSlug/workspace/members/:memberUserId/role"
+    path: "/api/w/:workspaceSlug/members/:memberUserId/role"
   });
   const workspaceMemberDelete = findRoute(routes, {
     method: "DELETE",
-    path: "/api/w/:workspaceSlug/workspace/members/:memberUserId"
+    path: "/api/w/:workspaceSlug/members/:memberUserId"
   });
   const workspaceInviteCreate = findRoute(routes, {
     method: "POST",
-    path: "/api/w/:workspaceSlug/workspace/invites"
+    path: "/api/w/:workspaceSlug/invites"
   });
   const workspaceInviteDelete = findRoute(routes, {
     method: "DELETE",
-    path: "/api/w/:workspaceSlug/workspace/invites/:inviteId"
+    path: "/api/w/:workspaceSlug/invites/:inviteId"
   });
   const calls = [];
   const executeAction = async (payload) => {
@@ -430,7 +429,7 @@ test("workspace settings route handlers build action input from request.input",
   const routes = await registerRoutes();
   const workspaceSettingsPatch = findRoute(routes, {
     method: "PATCH",
-    path: "/api/w/:workspaceSlug/workspace/settings"
+    path: "/api/w/:workspaceSlug/settings"
   });
   const calls = [];
   const executeAction = async (payload) => {
@@ -459,7 +458,7 @@ test("workspace route handlers build action input from request.input", async ()
   const routes = await registerRoutes();
   const workspacePatch = findRoute(routes, {
     method: "PATCH",
-    path: "/api/w/:workspaceSlug/workspace"
+    path: "/api/w/:workspaceSlug"
   });
   const calls = [];
   const executeAction = async (payload) => {

package/test/workspaceSettingsRepository.test.js

@@ -1,6 +1,7 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 import "../test-support/registerDefaultSettingsFields.js";
+import { toIsoString } from "@jskit-ai/database-runtime/shared";
 import { resolveWorkspaceThemePalettes } from "../src/shared/settings.js";
 import { createRepository } from "../src/server/workspaceSettings/workspaceSettingsRepository.js";
 
@@ -9,6 +10,7 @@ function createDefaultWorkspaceSettings() {
 }
 
 const DEFAULT_WORKSPACE_THEME = resolveWorkspaceThemePalettes({});
+const STUB_CREATED_AT = "2026-03-09 00:26:35.710";
 
 function createKnexStub(rowOverrides = {}) {
   const state = {
@@ -25,8 +27,8 @@ function createKnexStub(rowOverrides = {}) {
       dark_surface_color: DEFAULT_WORKSPACE_THEME.dark.surfaceColor,
       dark_surface_variant_color: DEFAULT_WORKSPACE_THEME.dark.surfaceVariantColor,
       invites_enabled: 1,
-      created_at: "2026-03-09 00:26:35.710",
-      updated_at: "2026-03-09 00:26:35.710",
+      created_at: STUB_CREATED_AT,
+      updated_at: STUB_CREATED_AT,
       ...rowOverrides
     }
   };
@@ -121,8 +123,8 @@ test("workspaceSettingsRepository.findByWorkspaceId maps the stored row", async
     darkSurfaceColor: DEFAULT_WORKSPACE_THEME.dark.surfaceColor,
     darkSurfaceVariantColor: DEFAULT_WORKSPACE_THEME.dark.surfaceVariantColor,
     invitesEnabled: true,
-    createdAt: "2026-03-08T16:26:35.710Z",
-    updatedAt: "2026-03-08T16:26:35.710Z"
+    createdAt: toIsoString(STUB_CREATED_AT),
+    updatedAt: toIsoString(STUB_CREATED_AT)
   });
 });
 

package/src/server/common/diTokens.js

@@ -1,21 +0,0 @@
-const USERS_WORKSPACE_PENDING_INVITATIONS_SERVICE_TOKEN = "users.workspace.pending-invitations.service";
-const USERS_WORKSPACE_ENABLED_TOKEN = "users.workspace.enabled";
-const USERS_WORKSPACE_TENANCY_ENABLED_TOKEN = "users.workspace.tenancy.enabled";
-const USERS_WORKSPACE_INVITATIONS_ENABLED_TOKEN = "users.workspace.invitations.enabled";
-const USERS_WORKSPACE_SELF_CREATE_ENABLED_TOKEN = "users.workspace.self-create.enabled";
-const USERS_TENANCY_PROFILE_TOKEN = "users.tenancy.profile";
-const USERS_AVATAR_STORAGE_SERVICE_TOKEN = "users.avatar.storage.service";
-const USERS_AVATAR_SERVICE_TOKEN = "users.avatar.service";
-const USERS_PROFILE_SYNC_SERVICE_TOKEN = "users.profile.sync.service";
-
-export {
-  USERS_WORKSPACE_PENDING_INVITATIONS_SERVICE_TOKEN,
-  USERS_WORKSPACE_ENABLED_TOKEN,
-  USERS_WORKSPACE_TENANCY_ENABLED_TOKEN,
-  USERS_WORKSPACE_INVITATIONS_ENABLED_TOKEN,
-  USERS_WORKSPACE_SELF_CREATE_ENABLED_TOKEN,
-  USERS_TENANCY_PROFILE_TOKEN,
-  USERS_AVATAR_STORAGE_SERVICE_TOKEN,
-  USERS_AVATAR_SERVICE_TOKEN,
-  USERS_PROFILE_SYNC_SERVICE_TOKEN
-};

package/src/shared/events/usersEvents.js

@@ -1,19 +0,0 @@
-const ACCOUNT_SETTINGS_CHANGED_EVENT = "account.settings.changed";
-const CONSOLE_SETTINGS_CHANGED_EVENT = "console.settings.changed";
-const USERS_BOOTSTRAP_CHANGED_EVENT = "users.bootstrap.changed";
-const WORKSPACE_SETTINGS_CHANGED_EVENT = "workspace.settings.changed";
-const WORKSPACE_MEMBERS_CHANGED_EVENT = "workspace.members.changed";
-const WORKSPACE_INVITES_CHANGED_EVENT = "workspace.invites.changed";
-const WORKSPACES_CHANGED_EVENT = "workspaces.changed";
-const WORKSPACE_PENDING_INVITATIONS_CHANGED_EVENT = "workspace.invitations.pending.changed";
-
-export {
-  ACCOUNT_SETTINGS_CHANGED_EVENT,
-  CONSOLE_SETTINGS_CHANGED_EVENT,
-  USERS_BOOTSTRAP_CHANGED_EVENT,
-  WORKSPACE_SETTINGS_CHANGED_EVENT,
-  WORKSPACE_MEMBERS_CHANGED_EVENT,
-  WORKSPACE_INVITES_CHANGED_EVENT,
-  WORKSPACES_CHANGED_EVENT,
-  WORKSPACE_PENDING_INVITATIONS_CHANGED_EVENT
-};