@jskit-ai/users-core 0.1.25 → 0.1.27

package/src/server/registerWorkspaceCore.js

@@ -1,4 +1,3 @@
-import { AUTH_POLICY_CONTEXT_RESOLVER_TOKEN } from "@jskit-ai/auth-core/server/lib/tokens";
 import {
   registerActionContextContributor
 } from "@jskit-ai/kernel/server/actions";
@@ -11,17 +10,7 @@ import { createWorkspaceActionContextContributor } from "./common/contributors/w
 import { createWorkspaceRouteVisibilityResolver } from "./common/contributors/workspaceRouteVisibilityResolver.js";
 import { createWorkspaceAuthPolicyContextResolver } from "./common/contributors/workspaceAuthPolicyContextResolver.js";
 import { resolveWorkspaceInvitationsPolicy } from "./support/workspaceInvitationsPolicy.js";
-import {
-  USERS_PROFILE_SYNC_SERVICE_TOKEN,
-  USERS_TENANCY_PROFILE_TOKEN,
-  USERS_WORKSPACE_ENABLED_TOKEN,
-  USERS_WORKSPACE_INVITATIONS_ENABLED_TOKEN,
-  USERS_WORKSPACE_SELF_CREATE_ENABLED_TOKEN,
-  USERS_WORKSPACE_TENANCY_ENABLED_TOKEN
-} from "./common/diTokens.js";
 
-const USERS_WORKSPACE_CONTEXT_CONTRIBUTOR_TOKEN = "users.core.workspace.actionContextContributor";
-const USERS_WORKSPACE_VISIBILITY_RESOLVER_TOKEN = "users.core.workspace.routeVisibilityResolver";
 
 function registerWorkspaceCore(app) {
   if (!app || typeof app.singleton !== "function") {
@@ -38,54 +27,54 @@ function registerWorkspaceCore(app) {
     });
   });
 
-  app.singleton(USERS_PROFILE_SYNC_SERVICE_TOKEN, (scope) => {
+  app.singleton("users.profile.sync.service", (scope) => {
     return createAuthProfileSyncService({
       userProfilesRepository: scope.make("userProfilesRepository"),
       workspaceProvisioningService: scope.make("users.workspace.service")
     });
   });
 
-  app.singleton(USERS_TENANCY_PROFILE_TOKEN, (scope) => {
+  app.singleton("users.tenancy.profile", (scope) => {
     const appConfig = resolveAppConfig(scope);
     return resolveTenancyProfile(appConfig);
   });
 
-  app.singleton(USERS_WORKSPACE_ENABLED_TOKEN, (scope) => {
-    return scope.make(USERS_TENANCY_PROFILE_TOKEN).workspace.enabled === true;
+  app.singleton("users.workspace.enabled", (scope) => {
+    return scope.make("users.tenancy.profile").workspace.enabled === true;
   });
 
-  app.singleton(USERS_WORKSPACE_SELF_CREATE_ENABLED_TOKEN, (scope) => {
-    return scope.make(USERS_TENANCY_PROFILE_TOKEN).workspace.allowSelfCreate === true;
+  app.singleton("users.workspace.self-create.enabled", (scope) => {
+    return scope.make("users.tenancy.profile").workspace.allowSelfCreate === true;
   });
 
-  app.singleton(USERS_WORKSPACE_TENANCY_ENABLED_TOKEN, (scope) => {
-    return scope.make(USERS_TENANCY_PROFILE_TOKEN).mode === TENANCY_MODE_WORKSPACES;
+  app.singleton("users.workspace.tenancy.enabled", (scope) => {
+    return scope.make("users.tenancy.profile").mode === TENANCY_MODE_WORKSPACES;
   });
 
-  app.singleton(USERS_WORKSPACE_INVITATIONS_ENABLED_TOKEN, (scope) => {
+  app.singleton("users.workspace.invitations.enabled", (scope) => {
     const appConfig = resolveAppConfig(scope);
-    const tenancyProfile = scope.make(USERS_TENANCY_PROFILE_TOKEN);
+    const tenancyProfile = scope.make("users.tenancy.profile");
     return resolveWorkspaceInvitationsPolicy({
       appConfig,
       tenancyProfile
     }).enabled;
   });
 
-  registerActionContextContributor(app, USERS_WORKSPACE_CONTEXT_CONTRIBUTOR_TOKEN, (scope) => {
+  registerActionContextContributor(app, "users.core.workspace.actionContextContributor", (scope) => {
     return createWorkspaceActionContextContributor({
       workspaceService: scope.make("users.workspace.service")
     });
   });
 
-  if (typeof app.has !== "function" || !app.has(AUTH_POLICY_CONTEXT_RESOLVER_TOKEN)) {
-    app.singleton(AUTH_POLICY_CONTEXT_RESOLVER_TOKEN, (scope) =>
+  if (typeof app.has !== "function" || !app.has("auth.policy.contextResolver")) {
+    app.singleton("auth.policy.contextResolver", (scope) =>
       createWorkspaceAuthPolicyContextResolver({
         workspaceService: scope.make("users.workspace.service")
       })
     );
   }
 
-  registerRouteVisibilityResolver(app, USERS_WORKSPACE_VISIBILITY_RESOLVER_TOKEN, (scope) =>
+  registerRouteVisibilityResolver(app, "users.core.workspace.routeVisibilityResolver", (scope) =>
     createWorkspaceRouteVisibilityResolver({
       workspaceService: scope.make("users.workspace.service")
     })

package/src/server/workspaceDirectory/bootWorkspaceDirectoryRoutes.js

@@ -1,9 +1,5 @@
 import { withStandardErrorResponses } from "@jskit-ai/http-runtime/shared/validators/errorResponses";
-import { KERNEL_TOKENS } from "@jskit-ai/kernel/shared/support/tokens";
 import { workspaceResource } from "../../shared/resources/workspaceResource.js";
-import {
-  USERS_WORKSPACE_SELF_CREATE_ENABLED_TOKEN
-} from "../common/diTokens.js";
 import { resolveWorkspaceRoutePath } from "../common/support/workspaceRoutePaths.js";
 import { workspaceSlugParamsValidator } from "../common/validators/routeParamsValidator.js";
 import { resolveDefaultWorkspaceRouteSurfaceIdFromAppConfig } from "../support/workspaceActionSurfaces.js";
@@ -13,11 +9,11 @@ function bootWorkspaceDirectoryRoutes(app) {
     throw new Error("bootWorkspaceDirectoryRoutes requires application make()/has().");
   }
 
-  const router = app.make(KERNEL_TOKENS.HttpRouter);
+  const router = app.make("jskit.http.router");
   const appConfig = app.has("appConfig") ? app.make("appConfig") : {};
   const workspaceRouteSurfaceId = resolveDefaultWorkspaceRouteSurfaceIdFromAppConfig(appConfig);
-  const workspaceSelfCreateEnabled = app.has(USERS_WORKSPACE_SELF_CREATE_ENABLED_TOKEN)
-    ? app.make(USERS_WORKSPACE_SELF_CREATE_ENABLED_TOKEN) === true
+  const workspaceSelfCreateEnabled = app.has("users.workspace.self-create.enabled")
+    ? app.make("users.workspace.self-create.enabled") === true
     : false;
 
   if (workspaceSelfCreateEnabled) {

package/src/server/workspaceMembers/bootWorkspaceMembers.js

@@ -1,8 +1,6 @@
 import { withStandardErrorResponses } from "@jskit-ai/http-runtime/shared/validators/errorResponses";
-import { KERNEL_TOKENS } from "@jskit-ai/kernel/shared/support/tokens";
 import { workspaceMembersResource } from "../../shared/resources/workspaceMembersResource.js";
 import { resolveWorkspaceRoutePath } from "../common/support/workspaceRoutePaths.js";
-import { USERS_WORKSPACE_INVITATIONS_ENABLED_TOKEN } from "../common/diTokens.js";
 import {
   routeParamsValidator,
   workspaceSlugParamsValidator
@@ -14,11 +12,11 @@ function bootWorkspaceMembers(app) {
     throw new Error("bootWorkspaceMembers requires application make().");
   }
 
-  const router = app.make(KERNEL_TOKENS.HttpRouter);
+  const router = app.make("jskit.http.router");
   const appConfig = typeof app.has === "function" && app.has("appConfig") ? app.make("appConfig") : {};
   const workspaceInvitationsEnabled =
-    typeof app.has === "function" && app.has(USERS_WORKSPACE_INVITATIONS_ENABLED_TOKEN)
-      ? app.make(USERS_WORKSPACE_INVITATIONS_ENABLED_TOKEN) === true
+    typeof app.has === "function" && app.has("users.workspace.invitations.enabled")
+      ? app.make("users.workspace.invitations.enabled") === true
       : false;
   const workspaceRouteSurfaceId = resolveDefaultWorkspaceRouteSurfaceIdFromAppConfig(appConfig);
 

package/src/server/workspaceMembers/registerWorkspaceMembers.js

@@ -1,17 +1,11 @@
 import { withActionDefaults } from "@jskit-ai/kernel/shared/actions";
 import { resolveAppConfig } from "@jskit-ai/kernel/server/support";
-import {
-  WORKSPACE_MEMBERS_CHANGED_EVENT,
-  WORKSPACE_INVITES_CHANGED_EVENT
-} from "../../shared/events/usersEvents.js";
 import { deepFreeze } from "../common/support/deepFreeze.js";
 import { createService as createWorkspaceMembersService } from "./workspaceMembersService.js";
 import { workspaceMembersActions } from "./workspaceMembersActions.js";
 import { createWorkspaceRoleCatalog } from "../../shared/roles.js";
-import { USERS_WORKSPACE_INVITATIONS_ENABLED_TOKEN } from "../common/diTokens.js";
 import { createWorkspaceEntityAndBootstrapEvents } from "../common/support/realtimeServiceEvents.js";
 
-const USERS_WORKSPACE_MEMBERS_SERVICE_TOKEN = "users.workspace.members.service";
 
 function resolveWorkspaceMembersInviteExpiresInMs(appConfig = {}) {
   const inviteExpiresInMs = Number(appConfig?.workspaceMembers?.defaults?.inviteExpiresInMs);
@@ -58,7 +52,7 @@ function registerWorkspaceMembers(app) {
   }
 
   app.service(
-    USERS_WORKSPACE_MEMBERS_SERVICE_TOKEN,
+    "users.workspace.members.service",
     (scope) => {
       const appConfig = resolveAppConfig(scope);
       return createWorkspaceMembersService({
@@ -66,7 +60,7 @@ function registerWorkspaceMembers(app) {
         workspaceInvitesRepository: scope.make("workspaceInvitesRepository"),
         inviteExpiresInMs: resolveWorkspaceMembersInviteExpiresInMs(appConfig),
         roleCatalog: createWorkspaceRoleCatalog(appConfig),
-        workspaceInvitationsEnabled: scope.make(USERS_WORKSPACE_INVITATIONS_ENABLED_TOKEN) === true
+        workspaceInvitationsEnabled: scope.make("users.workspace.invitations.enabled") === true
       });
     },
     {
@@ -74,24 +68,24 @@ function registerWorkspaceMembers(app) {
         updateMemberRole: createWorkspaceEntityAndBootstrapEvents({
           workspaceEntity: "member",
           workspaceOperation: "updated",
-          workspaceRealtimeEvent: WORKSPACE_MEMBERS_CHANGED_EVENT
+          workspaceRealtimeEvent: "workspace.members.changed"
         }),
         removeMember: createWorkspaceEntityAndBootstrapEvents({
           workspaceEntity: "member",
           workspaceOperation: "updated",
-          workspaceRealtimeEvent: WORKSPACE_MEMBERS_CHANGED_EVENT
+          workspaceRealtimeEvent: "workspace.members.changed"
         }),
         createInvite: createWorkspaceEntityAndBootstrapEvents({
           workspaceEntity: "invite",
           workspaceOperation: "created",
-          workspaceRealtimeEvent: WORKSPACE_INVITES_CHANGED_EVENT,
+          workspaceRealtimeEvent: "workspace.invites.changed",
           bootstrapEntityId: ({ result }) => result?.createdInviteId,
           bootstrapAudience: INVITE_RECIPIENT_BOOTSTRAP_AUDIENCE
         }),
         revokeInvite: createWorkspaceEntityAndBootstrapEvents({
           workspaceEntity: "invite",
           workspaceOperation: "updated",
-          workspaceRealtimeEvent: WORKSPACE_INVITES_CHANGED_EVENT,
+          workspaceRealtimeEvent: "workspace.invites.changed",
           bootstrapEntityId: ({ result }) => result?.revokedInviteId,
           bootstrapAudience: INVITE_RECIPIENT_BOOTSTRAP_AUDIENCE
         })
@@ -103,7 +97,7 @@ function registerWorkspaceMembers(app) {
     withActionDefaults(workspaceMembersActions, {
       domain: "workspace",
       dependencies: {
-        workspaceMembersService: USERS_WORKSPACE_MEMBERS_SERVICE_TOKEN
+        workspaceMembersService: "users.workspace.members.service"
       }
     })
   );

package/src/server/workspacePendingInvitations/bootWorkspacePendingInvitations.js

@@ -1,5 +1,4 @@
 import { withStandardErrorResponses } from "@jskit-ai/http-runtime/shared/validators/errorResponses";
-import { KERNEL_TOKENS } from "@jskit-ai/kernel/shared/support/tokens";
 import { workspaceMembersResource } from "../../shared/resources/workspaceMembersResource.js";
 import { workspacePendingInvitationsResource } from "../../shared/resources/workspacePendingInvitationsResource.js";
 
@@ -8,7 +7,7 @@ function bootWorkspacePendingInvitations(app) {
     throw new Error("bootWorkspacePendingInvitations requires application make().");
   }
 
-  const router = app.make(KERNEL_TOKENS.HttpRouter);
+  const router = app.make("jskit.http.router");
 
   router.register(
     "GET",

package/src/server/workspacePendingInvitations/registerWorkspacePendingInvitations.js

@@ -1,17 +1,7 @@
 import { withActionDefaults } from "@jskit-ai/kernel/shared/actions";
 import { createService } from "./workspacePendingInvitationsService.js";
 import { workspacePendingInvitationsActions } from "./workspacePendingInvitationsActions.js";
-import {
-  USERS_BOOTSTRAP_CHANGED_EVENT,
-  WORKSPACE_INVITES_CHANGED_EVENT,
-  WORKSPACE_MEMBERS_CHANGED_EVENT,
-  WORKSPACES_CHANGED_EVENT,
-  WORKSPACE_PENDING_INVITATIONS_CHANGED_EVENT
-} from "../../shared/events/usersEvents.js";
 import { deepFreeze } from "../common/support/deepFreeze.js";
-import {
-  USERS_WORKSPACE_PENDING_INVITATIONS_SERVICE_TOKEN
-} from "../common/diTokens.js";
 
 function workspaceAudienceFromEntityId({ event } = {}) {
   const workspaceId = Number(event?.entityId);
@@ -60,12 +50,12 @@ function createInviteDecisionEvents({ includeDirectoryAndMembers = false } = {})
     createActorUserEvent({
       source: "workspace",
       entity: "invitation",
-      realtimeEvent: WORKSPACE_PENDING_INVITATIONS_CHANGED_EVENT
+      realtimeEvent: "workspace.invitations.pending.changed"
     }),
     createActorUserEvent({
       source: "users",
       entity: "bootstrap",
-      realtimeEvent: USERS_BOOTSTRAP_CHANGED_EVENT
+      realtimeEvent: "users.bootstrap.changed"
     })
   ];
 
@@ -74,11 +64,11 @@ function createInviteDecisionEvents({ includeDirectoryAndMembers = false } = {})
       createActorUserEvent({
         source: "workspace",
         entity: "directory",
-        realtimeEvent: WORKSPACES_CHANGED_EVENT
+        realtimeEvent: "workspaces.changed"
       }),
       createWorkspaceAudienceEvent({
         entity: "member",
-        realtimeEvent: WORKSPACE_MEMBERS_CHANGED_EVENT
+        realtimeEvent: "workspace.members.changed"
       })
     );
   }
@@ -86,7 +76,7 @@ function createInviteDecisionEvents({ includeDirectoryAndMembers = false } = {})
   events.push(
     createWorkspaceAudienceEvent({
       entity: "invite",
-      realtimeEvent: WORKSPACE_INVITES_CHANGED_EVENT
+      realtimeEvent: "workspace.invites.changed"
     })
   );
 
@@ -99,7 +89,7 @@ function registerWorkspacePendingInvitations(app) {
   }
 
   app.service(
-    USERS_WORKSPACE_PENDING_INVITATIONS_SERVICE_TOKEN,
+    "users.workspace.pending-invitations.service",
     (scope) =>
       createService({
         workspaceInvitesRepository: scope.make("workspaceInvitesRepository"),
@@ -119,7 +109,7 @@ function registerWorkspacePendingInvitations(app) {
     withActionDefaults(workspacePendingInvitationsActions, {
       domain: "workspace",
       dependencies: {
-        workspacePendingInvitationsService: USERS_WORKSPACE_PENDING_INVITATIONS_SERVICE_TOKEN
+        workspacePendingInvitationsService: "users.workspace.pending-invitations.service"
       }
     })
   );

package/src/server/workspaceSettings/bootWorkspaceSettings.js

@@ -1,5 +1,4 @@
 import { withStandardErrorResponses } from "@jskit-ai/http-runtime/shared/validators/errorResponses";
-import { KERNEL_TOKENS } from "@jskit-ai/kernel/shared/support/tokens";
 import { workspaceSettingsResource } from "../../shared/resources/workspaceSettingsResource.js";
 import { resolveWorkspaceRoutePath } from "../common/support/workspaceRoutePaths.js";
 import { workspaceSlugParamsValidator } from "../common/validators/routeParamsValidator.js";
@@ -10,7 +9,7 @@ function bootWorkspaceSettings(app) {
     throw new Error("bootWorkspaceSettings requires application make().");
   }
 
-  const router = app.make(KERNEL_TOKENS.HttpRouter);
+  const router = app.make("jskit.http.router");
   const appConfig = typeof app.has === "function" && app.has("appConfig") ? app.make("appConfig") : {};
   const workspaceRouteSurfaceId = resolveDefaultWorkspaceRouteSurfaceIdFromAppConfig(appConfig);
 

package/src/server/workspaceSettings/registerWorkspaceSettings.js

@@ -1,15 +1,10 @@
-import { KERNEL_TOKENS } from "@jskit-ai/kernel/shared/support/tokens";
 import { withActionDefaults } from "@jskit-ai/kernel/shared/actions";
 import { resolveAppConfig } from "@jskit-ai/kernel/server/support";
-import {
-  WORKSPACE_SETTINGS_CHANGED_EVENT
-} from "../../shared/events/usersEvents.js";
 import { deepFreeze } from "../common/support/deepFreeze.js";
 import { createRepository as createWorkspaceSettingsRepository } from "./workspaceSettingsRepository.js";
 import { createService as createWorkspaceSettingsService } from "./workspaceSettingsService.js";
 import { workspaceSettingsActions } from "./workspaceSettingsActions.js";
 import { createWorkspaceRoleCatalog } from "../../shared/roles.js";
-import { USERS_WORKSPACE_INVITATIONS_ENABLED_TOKEN } from "../common/diTokens.js";
 import { createWorkspaceEntityAndBootstrapEvents } from "../common/support/realtimeServiceEvents.js";
 
 function resolveWorkspaceSettingsDefaultInvitesEnabled(appConfig = {}) {
@@ -28,7 +23,7 @@ function registerWorkspaceSettings(app) {
   }
 
   app.singleton("workspaceSettingsRepository", (scope) => {
-    const knex = scope.make(KERNEL_TOKENS.Knex);
+    const knex = scope.make("jskit.database.knex");
     const appConfig = resolveAppConfig(scope);
     return createWorkspaceSettingsRepository(knex, {
       defaultInvitesEnabled: resolveWorkspaceSettingsDefaultInvitesEnabled(appConfig)
@@ -40,7 +35,7 @@ function registerWorkspaceSettings(app) {
     (scope) =>
       createWorkspaceSettingsService({
         workspaceSettingsRepository: scope.make("workspaceSettingsRepository"),
-        workspaceInvitationsEnabled: scope.make(USERS_WORKSPACE_INVITATIONS_ENABLED_TOKEN),
+        workspaceInvitationsEnabled: scope.make("users.workspace.invitations.enabled"),
         roleCatalog: createWorkspaceRoleCatalog(resolveAppConfig(scope))
       }),
     {
@@ -48,7 +43,7 @@ function registerWorkspaceSettings(app) {
         updateWorkspaceSettings: createWorkspaceEntityAndBootstrapEvents({
           workspaceEntity: "settings",
           workspaceOperation: "updated",
-          workspaceRealtimeEvent: WORKSPACE_SETTINGS_CHANGED_EVENT
+          workspaceRealtimeEvent: "workspace.settings.changed"
         })
       })
     }

package/src/shared/index.js

@@ -36,15 +36,6 @@ import {
   resolveTenancyProfile,
   isWorkspacesTenancyMode
 } from "./tenancyProfile.js";
-import {
-  ACCOUNT_SETTINGS_CHANGED_EVENT,
-  CONSOLE_SETTINGS_CHANGED_EVENT,
-  WORKSPACE_SETTINGS_CHANGED_EVENT,
-  WORKSPACE_MEMBERS_CHANGED_EVENT,
-  WORKSPACE_INVITES_CHANGED_EVENT,
-  WORKSPACES_CHANGED_EVENT,
-  WORKSPACE_PENDING_INVITATIONS_CHANGED_EVENT
-} from "./events/usersEvents.js";
 
 const USERS_SHARED_API = Object.freeze({
   OWNER_ROLE_ID,
@@ -77,14 +68,7 @@ const USERS_SHARED_API = Object.freeze({
   WORKSPACE_SLUG_POLICY_IMMUTABLE_USERNAME,
   WORKSPACE_SLUG_POLICY_USER_SELECTED,
   resolveTenancyProfile,
-  isWorkspacesTenancyMode,
-  ACCOUNT_SETTINGS_CHANGED_EVENT,
-  CONSOLE_SETTINGS_CHANGED_EVENT,
-  WORKSPACE_SETTINGS_CHANGED_EVENT,
-  WORKSPACE_MEMBERS_CHANGED_EVENT,
-  WORKSPACE_INVITES_CHANGED_EVENT,
-  WORKSPACES_CHANGED_EVENT,
-  WORKSPACE_PENDING_INVITATIONS_CHANGED_EVENT
+  isWorkspacesTenancyMode
 });
 
 export {
@@ -119,12 +103,5 @@ export {
   WORKSPACE_SLUG_POLICY_USER_SELECTED,
   resolveTenancyProfile,
   isWorkspacesTenancyMode,
-  ACCOUNT_SETTINGS_CHANGED_EVENT,
-  CONSOLE_SETTINGS_CHANGED_EVENT,
-  WORKSPACE_SETTINGS_CHANGED_EVENT,
-  WORKSPACE_MEMBERS_CHANGED_EVENT,
-  WORKSPACE_INVITES_CHANGED_EVENT,
-  WORKSPACES_CHANGED_EVENT,
-  WORKSPACE_PENDING_INVITATIONS_CHANGED_EVENT,
   USERS_SHARED_API
 };

package/src/shared/resources/consoleSettingsFields.js

@@ -1,8 +1,7 @@
 import { normalizeText } from "@jskit-ai/kernel/shared/actions/textNormalization";
 import { resolveGlobalArrayRegistry } from "./resolveGlobalArrayRegistry.js";
 
-const CONSOLE_SETTINGS_FIELDS_REGISTRY_KEY = Symbol.for("jskit.users-core.consoleSettingsFields");
-const consoleSettingsFields = resolveGlobalArrayRegistry(CONSOLE_SETTINGS_FIELDS_REGISTRY_KEY);
+const consoleSettingsFields = resolveGlobalArrayRegistry("jskit.users-core.consoleSettingsFields");
 
 function defineField(field = {}) {
   const key = normalizeText(field.key);

package/src/shared/resources/userSettingsFields.js

@@ -8,8 +8,7 @@ const USER_SETTINGS_SECTIONS = Object.freeze({
 
 const USER_SETTINGS_SECTION_VALUES = Object.freeze(Object.values(USER_SETTINGS_SECTIONS));
 
-const USER_SETTINGS_FIELDS_REGISTRY_KEY = Symbol.for("jskit.users-core.userSettingsFields");
-const userSettingsFields = resolveGlobalArrayRegistry(USER_SETTINGS_FIELDS_REGISTRY_KEY);
+const userSettingsFields = resolveGlobalArrayRegistry("jskit.users-core.userSettingsFields");
 
 function defineField(field = {}) {
   const key = normalizeText(field.key);

package/src/shared/resources/workspaceSettingsFields.js

@@ -1,8 +1,7 @@
 import { normalizeText } from "@jskit-ai/kernel/shared/actions/textNormalization";
 import { resolveGlobalArrayRegistry } from "./resolveGlobalArrayRegistry.js";
 
-const WORKSPACE_SETTINGS_FIELDS_REGISTRY_KEY = Symbol.for("jskit.users-core.workspaceSettingsFields");
-const workspaceSettingsFields = resolveGlobalArrayRegistry(WORKSPACE_SETTINGS_FIELDS_REGISTRY_KEY);
+const workspaceSettingsFields = resolveGlobalArrayRegistry("jskit.users-core.workspaceSettingsFields");
 
 function defineField(field = {}) {
   const key = normalizeText(field.key);

package/src/shared/support/usersApiPaths.js

@@ -2,7 +2,7 @@ import { normalizePathname } from "@jskit-ai/kernel/shared/surface/paths";
 import { splitPathQueryAndHash } from "@jskit-ai/kernel/shared/support";
 
 const USERS_PUBLIC_API_BASE_PATH = "/api";
-const USERS_WORKSPACE_API_BASE_PATH = "/api/w/:workspaceSlug/workspace";
+const USERS_WORKSPACE_API_BASE_PATH = "/api/w/:workspaceSlug";
 
 function normalizeApiRelativePath(relativePath = "/") {
   const { pathname, queryString, hash } = splitPathQueryAndHash(relativePath);

package/test/registerAvatarMultipartSupport.test.js

@@ -1,6 +1,5 @@
 import test from "node:test";
 import assert from "node:assert/strict";
-import { KERNEL_TOKENS } from "@jskit-ai/kernel/shared/support/tokens";
 import { registerAvatarMultipartSupport } from "../src/server/accountProfile/registerAvatarMultipartSupport.js";
 
 function createAppStub({ hasFastify = true, fastify = null } = {}) {
@@ -13,13 +12,13 @@ function createAppStub({ hasFastify = true, fastify = null } = {}) {
 
   return {
     has(token) {
-      if (token === KERNEL_TOKENS.Fastify) {
+      if (token === "jskit.fastify") {
         return hasFastify;
       }
       return false;
     },
     make(token) {
-      if (token === KERNEL_TOKENS.Fastify) {
+      if (token === "jskit.fastify") {
         return resolvedFastify;
       }
       return null;

package/test/registerServiceRealtimeEvents.test.js

@@ -6,15 +6,6 @@ import { registerAccountNotifications } from "../src/server/accountNotifications
 import { registerConsoleSettings } from "../src/server/consoleSettings/registerConsoleSettings.js";
 import { registerWorkspaceMembers } from "../src/server/workspaceMembers/registerWorkspaceMembers.js";
 import { registerWorkspacePendingInvitations } from "../src/server/workspacePendingInvitations/registerWorkspacePendingInvitations.js";
-import {
-  ACCOUNT_SETTINGS_CHANGED_EVENT,
-  CONSOLE_SETTINGS_CHANGED_EVENT,
-  USERS_BOOTSTRAP_CHANGED_EVENT,
-  WORKSPACE_MEMBERS_CHANGED_EVENT,
-  WORKSPACE_INVITES_CHANGED_EVENT,
-  WORKSPACES_CHANGED_EVENT,
-  WORKSPACE_PENDING_INVITATIONS_CHANGED_EVENT
-} from "../src/shared/events/usersEvents.js";
 
 function createAppDouble() {
   const serviceCalls = [];
@@ -48,43 +39,43 @@ test("account register functions publish account.settings.changed for update ope
   const profileApp = createAppDouble();
   registerAccountProfile(profileApp.app);
   const profile = findServiceCall(profileApp.serviceCalls, "users.accountProfile.service");
-  assert.equal(profile?.metadata?.events?.updateProfile?.[0]?.realtime?.event, ACCOUNT_SETTINGS_CHANGED_EVENT);
-  assert.equal(profile?.metadata?.events?.updateProfile?.[1]?.realtime?.event, USERS_BOOTSTRAP_CHANGED_EVENT);
-  assert.equal(profile?.metadata?.events?.uploadAvatar?.[0]?.realtime?.event, ACCOUNT_SETTINGS_CHANGED_EVENT);
-  assert.equal(profile?.metadata?.events?.uploadAvatar?.[1]?.realtime?.event, USERS_BOOTSTRAP_CHANGED_EVENT);
-  assert.equal(profile?.metadata?.events?.deleteAvatar?.[0]?.realtime?.event, ACCOUNT_SETTINGS_CHANGED_EVENT);
-  assert.equal(profile?.metadata?.events?.deleteAvatar?.[1]?.realtime?.event, USERS_BOOTSTRAP_CHANGED_EVENT);
+  assert.equal(profile?.metadata?.events?.updateProfile?.[0]?.realtime?.event, "account.settings.changed");
+  assert.equal(profile?.metadata?.events?.updateProfile?.[1]?.realtime?.event, "users.bootstrap.changed");
+  assert.equal(profile?.metadata?.events?.uploadAvatar?.[0]?.realtime?.event, "account.settings.changed");
+  assert.equal(profile?.metadata?.events?.uploadAvatar?.[1]?.realtime?.event, "users.bootstrap.changed");
+  assert.equal(profile?.metadata?.events?.deleteAvatar?.[0]?.realtime?.event, "account.settings.changed");
+  assert.equal(profile?.metadata?.events?.deleteAvatar?.[1]?.realtime?.event, "users.bootstrap.changed");
 
   const preferencesApp = createAppDouble();
   registerAccountPreferences(preferencesApp.app);
   const preferences = findServiceCall(preferencesApp.serviceCalls, "users.accountPreferences.service");
-  assert.equal(preferences?.metadata?.events?.updatePreferences?.[0]?.realtime?.event, ACCOUNT_SETTINGS_CHANGED_EVENT);
-  assert.equal(preferences?.metadata?.events?.updatePreferences?.[1]?.realtime?.event, USERS_BOOTSTRAP_CHANGED_EVENT);
+  assert.equal(preferences?.metadata?.events?.updatePreferences?.[0]?.realtime?.event, "account.settings.changed");
+  assert.equal(preferences?.metadata?.events?.updatePreferences?.[1]?.realtime?.event, "users.bootstrap.changed");
 
   const notificationsApp = createAppDouble();
   registerAccountNotifications(notificationsApp.app);
   const notifications = findServiceCall(notificationsApp.serviceCalls, "users.accountNotifications.service");
-  assert.equal(notifications?.metadata?.events?.updateNotifications?.[0]?.realtime?.event, ACCOUNT_SETTINGS_CHANGED_EVENT);
-  assert.equal(notifications?.metadata?.events?.updateNotifications?.[1]?.realtime?.event, USERS_BOOTSTRAP_CHANGED_EVENT);
+  assert.equal(notifications?.metadata?.events?.updateNotifications?.[0]?.realtime?.event, "account.settings.changed");
+  assert.equal(notifications?.metadata?.events?.updateNotifications?.[1]?.realtime?.event, "users.bootstrap.changed");
 });
 
 test("console settings register publishes console.settings.changed", () => {
   const payload = createAppDouble();
   registerConsoleSettings(payload.app);
   const consoleSettings = findServiceCall(payload.serviceCalls, "users.console.settings.service");
-  assert.equal(consoleSettings?.metadata?.events?.updateSettings?.[0]?.realtime?.event, CONSOLE_SETTINGS_CHANGED_EVENT);
+  assert.equal(consoleSettings?.metadata?.events?.updateSettings?.[0]?.realtime?.event, "console.settings.changed");
 });
 
 test("workspace register functions publish members/invites/workspace-list realtime events", async () => {
   const membersApp = createAppDouble();
   registerWorkspaceMembers(membersApp.app);
   const members = findServiceCall(membersApp.serviceCalls, "users.workspace.members.service");
-  assert.equal(members?.metadata?.events?.updateMemberRole?.[0]?.realtime?.event, WORKSPACE_MEMBERS_CHANGED_EVENT);
-  assert.equal(members?.metadata?.events?.updateMemberRole?.[1]?.realtime?.event, USERS_BOOTSTRAP_CHANGED_EVENT);
-  assert.equal(members?.metadata?.events?.removeMember?.[0]?.realtime?.event, WORKSPACE_MEMBERS_CHANGED_EVENT);
-  assert.equal(members?.metadata?.events?.removeMember?.[1]?.realtime?.event, USERS_BOOTSTRAP_CHANGED_EVENT);
-  assert.equal(members?.metadata?.events?.createInvite?.[0]?.realtime?.event, WORKSPACE_INVITES_CHANGED_EVENT);
-  assert.equal(members?.metadata?.events?.createInvite?.[1]?.realtime?.event, USERS_BOOTSTRAP_CHANGED_EVENT);
+  assert.equal(members?.metadata?.events?.updateMemberRole?.[0]?.realtime?.event, "workspace.members.changed");
+  assert.equal(members?.metadata?.events?.updateMemberRole?.[1]?.realtime?.event, "users.bootstrap.changed");
+  assert.equal(members?.metadata?.events?.removeMember?.[0]?.realtime?.event, "workspace.members.changed");
+  assert.equal(members?.metadata?.events?.removeMember?.[1]?.realtime?.event, "users.bootstrap.changed");
+  assert.equal(members?.metadata?.events?.createInvite?.[0]?.realtime?.event, "workspace.invites.changed");
+  assert.equal(members?.metadata?.events?.createInvite?.[1]?.realtime?.event, "users.bootstrap.changed");
   assert.equal(members?.metadata?.events?.createInvite?.[1]?.entityId?.({ result: { createdInviteId: 91 } }), 91);
   assert.equal(members?.metadata?.events?.createInvite?.[1]?.realtime?.audience?.preset, "event_scope");
   assert.equal(typeof members?.metadata?.events?.createInvite?.[1]?.realtime?.audience?.userQuery, "function");
@@ -111,8 +102,8 @@ test("workspace register functions publish members/invites/workspace-list realti
     }
   });
   assert.deepEqual(createInviteAudienceQueryResult, [{ userId: 55 }]);
-  assert.equal(members?.metadata?.events?.revokeInvite?.[0]?.realtime?.event, WORKSPACE_INVITES_CHANGED_EVENT);
-  assert.equal(members?.metadata?.events?.revokeInvite?.[1]?.realtime?.event, USERS_BOOTSTRAP_CHANGED_EVENT);
+  assert.equal(members?.metadata?.events?.revokeInvite?.[0]?.realtime?.event, "workspace.invites.changed");
+  assert.equal(members?.metadata?.events?.revokeInvite?.[1]?.realtime?.event, "users.bootstrap.changed");
   assert.equal(members?.metadata?.events?.revokeInvite?.[1]?.entityId?.({ result: { revokedInviteId: 19 } }), 19);
   assert.equal(members?.metadata?.events?.revokeInvite?.[1]?.realtime?.audience?.preset, "event_scope");
   assert.equal(typeof members?.metadata?.events?.revokeInvite?.[1]?.realtime?.audience?.userQuery, "function");
@@ -124,14 +115,14 @@ test("workspace register functions publish members/invites/workspace-list realti
     ? pending.metadata.events.acceptInviteByToken
     : [];
   const acceptInviteRealtimeEvents = acceptInviteEvents.map((entry) => entry?.realtime?.event).filter(Boolean);
-  assert.ok(acceptInviteRealtimeEvents.includes(WORKSPACE_PENDING_INVITATIONS_CHANGED_EVENT));
-  assert.ok(acceptInviteRealtimeEvents.includes(USERS_BOOTSTRAP_CHANGED_EVENT));
-  assert.ok(acceptInviteRealtimeEvents.includes(WORKSPACES_CHANGED_EVENT));
-  assert.ok(acceptInviteRealtimeEvents.includes(WORKSPACE_MEMBERS_CHANGED_EVENT));
-  assert.ok(acceptInviteRealtimeEvents.includes(WORKSPACE_INVITES_CHANGED_EVENT));
+  assert.ok(acceptInviteRealtimeEvents.includes("workspace.invitations.pending.changed"));
+  assert.ok(acceptInviteRealtimeEvents.includes("users.bootstrap.changed"));
+  assert.ok(acceptInviteRealtimeEvents.includes("workspaces.changed"));
+  assert.ok(acceptInviteRealtimeEvents.includes("workspace.members.changed"));
+  assert.ok(acceptInviteRealtimeEvents.includes("workspace.invites.changed"));
 
   const acceptedMembersChange = acceptInviteEvents.find(
-    (entry) => entry?.realtime?.event === WORKSPACE_MEMBERS_CHANGED_EVENT
+    (entry) => entry?.realtime?.event === "workspace.members.changed"
   );
   assert.equal(acceptedMembersChange?.entityId?.({ result: { workspaceId: 9 } }), 9);
   assert.deepEqual(
@@ -146,7 +137,7 @@ test("workspace register functions publish members/invites/workspace-list realti
   );
 
   const acceptedInvitesChange = acceptInviteEvents.find(
-    (entry) => entry?.realtime?.event === WORKSPACE_INVITES_CHANGED_EVENT
+    (entry) => entry?.realtime?.event === "workspace.invites.changed"
   );
   assert.equal(acceptedInvitesChange?.entityId?.({ result: { workspaceId: 9 } }), 9);
 
@@ -154,7 +145,7 @@ test("workspace register functions publish members/invites/workspace-list realti
     ? pending.metadata.events.refuseInviteByToken
     : [];
   const refuseInviteRealtimeEvents = refuseInviteEvents.map((entry) => entry?.realtime?.event).filter(Boolean);
-  assert.ok(refuseInviteRealtimeEvents.includes(WORKSPACE_PENDING_INVITATIONS_CHANGED_EVENT));
-  assert.ok(refuseInviteRealtimeEvents.includes(USERS_BOOTSTRAP_CHANGED_EVENT));
-  assert.ok(refuseInviteRealtimeEvents.includes(WORKSPACE_INVITES_CHANGED_EVENT));
+  assert.ok(refuseInviteRealtimeEvents.includes("workspace.invitations.pending.changed"));
+  assert.ok(refuseInviteRealtimeEvents.includes("users.bootstrap.changed"));
+  assert.ok(refuseInviteRealtimeEvents.includes("workspace.invites.changed"));
 });

package/test/registerWorkspaceSettings.test.js

@@ -1,10 +1,6 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 import { registerWorkspaceSettings } from "../src/server/workspaceSettings/registerWorkspaceSettings.js";
-import {
-  USERS_BOOTSTRAP_CHANGED_EVENT,
-  WORKSPACE_SETTINGS_CHANGED_EVENT
-} from "../src/shared/events/usersEvents.js";
 
 test("registerWorkspaceSettings registers workspace settings service realtime event metadata", () => {
   const singletonBindings = new Map();
@@ -36,9 +32,9 @@ test("registerWorkspaceSettings registers workspace settings service realtime ev
   assert.equal(serviceCalls.length, 1);
   assert.equal(serviceCalls[0].token, "users.workspace.settings.service");
   assert.equal(typeof serviceCalls[0].factory, "function");
-  assert.equal(serviceCalls[0].metadata?.events?.updateWorkspaceSettings?.[0]?.realtime?.event, WORKSPACE_SETTINGS_CHANGED_EVENT);
+  assert.equal(serviceCalls[0].metadata?.events?.updateWorkspaceSettings?.[0]?.realtime?.event, "workspace.settings.changed");
   assert.equal(serviceCalls[0].metadata?.events?.updateWorkspaceSettings?.[0]?.realtime?.audience, "event_scope");
-  assert.equal(serviceCalls[0].metadata?.events?.updateWorkspaceSettings?.[1]?.realtime?.event, USERS_BOOTSTRAP_CHANGED_EVENT);
+  assert.equal(serviceCalls[0].metadata?.events?.updateWorkspaceSettings?.[1]?.realtime?.event, "users.bootstrap.changed");
   assert.equal(serviceCalls[0].metadata?.events?.updateWorkspaceSettings?.[1]?.realtime?.audience, "event_scope");
   assert.equal(actionCalls.length, 1);
 });