@jskit-ai/users-core 0.1.26 → 0.1.27

package/package.descriptor.mjs

@@ -1,7 +1,8 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/users-core",
-  version: "0.1.26",
+  version: "0.1.27",
+  kind: "runtime",
   description: "Users/workspace domain runtime plus HTTP routes for workspace, account, and console features.",
   dependsOn: [
     "@jskit-ai/auth-core",
@@ -53,15 +54,7 @@ export default Object.freeze({
         }
       ],
       containerTokens: {
-        server: [
-          "users.core",
-          "users.profile.sync.service",
-          "users.workspace.service",
-          "users.workspace.members.service",
-          "users.workspace.settings.service",
-          "users.settings.service",
-          "users.console.settings.service"
-        ],
+        server: [],
         client: []
       }
     },
@@ -89,42 +82,42 @@ export default Object.freeze({
         },
         {
           method: "GET",
-          path: "/api/w/:workspaceSlug/workspace/settings",
+          path: "/api/w/:workspaceSlug/settings",
           summary: "Get workspace settings and role catalog by workspace slug."
         },
         {
           method: "PATCH",
-          path: "/api/w/:workspaceSlug/workspace/settings",
+          path: "/api/w/:workspaceSlug/settings",
           summary: "Update workspace settings by workspace slug."
         },
         {
           method: "GET",
-          path: "/api/w/:workspaceSlug/workspace/roles",
+          path: "/api/w/:workspaceSlug/roles",
           summary: "Get workspace role catalog by workspace slug."
         },
         {
           method: "GET",
-          path: "/api/w/:workspaceSlug/workspace/members",
+          path: "/api/w/:workspaceSlug/members",
           summary: "List members by workspace slug."
         },
         {
           method: "PATCH",
-          path: "/api/w/:workspaceSlug/workspace/members/:memberUserId/role",
+          path: "/api/w/:workspaceSlug/members/:memberUserId/role",
           summary: "Update workspace member role by workspace slug."
         },
         {
           method: "GET",
-          path: "/api/w/:workspaceSlug/workspace/invites",
+          path: "/api/w/:workspaceSlug/invites",
           summary: "List workspace invites by workspace slug."
         },
         {
           method: "POST",
-          path: "/api/w/:workspaceSlug/workspace/invites",
+          path: "/api/w/:workspaceSlug/invites",
           summary: "Create workspace invite by workspace slug."
         },
         {
           method: "DELETE",
-          path: "/api/w/:workspaceSlug/workspace/invites/:inviteId",
+          path: "/api/w/:workspaceSlug/invites/:inviteId",
           summary: "Revoke workspace invite by workspace slug."
         },
         {
@@ -203,10 +196,10 @@ export default Object.freeze({
   mutations: {
     dependencies: {
       runtime: {
-        "@jskit-ai/auth-core": "0.1.16",
-        "@jskit-ai/database-runtime": "0.1.17",
-        "@jskit-ai/http-runtime": "0.1.16",
-        "@jskit-ai/kernel": "0.1.17",
+        "@jskit-ai/auth-core": "0.1.17",
+        "@jskit-ai/database-runtime": "0.1.18",
+        "@jskit-ai/http-runtime": "0.1.17",
+        "@jskit-ai/kernel": "0.1.18",
         "@fastify/multipart": "^9.4.0",
         "@fastify/type-provider-typebox": "^6.1.0",
         "typebox": "^1.0.81"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/users-core",
-  "version": "0.1.26",
+  "version": "0.1.27",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -11,7 +11,6 @@
     "./server/support/resolveWorkspace": "./src/server/support/resolveWorkspace.js",
     "./server/validators/routeParamsValidator": "./src/server/common/validators/routeParamsValidator.js",
     "./shared/settings": "./src/shared/settings.js",
-    "./shared/events/usersEvents": "./src/shared/events/usersEvents.js",
     "./shared/tenancyProfile": "./src/shared/tenancyProfile.js",
     "./shared/support/usersVisibility": "./src/shared/support/usersVisibility.js",
     "./shared/support/workspacePathModel": "./src/shared/support/workspacePathModel.js",
@@ -25,10 +24,10 @@
     "./shared/resources/consoleSettingsFields": "./src/shared/resources/consoleSettingsFields.js"
   },
   "dependencies": {
-    "@jskit-ai/auth-core": "0.1.16",
-    "@jskit-ai/database-runtime": "0.1.17",
-    "@jskit-ai/http-runtime": "0.1.16",
-    "@jskit-ai/kernel": "0.1.17",
+    "@jskit-ai/auth-core": "0.1.17",
+    "@jskit-ai/database-runtime": "0.1.18",
+    "@jskit-ai/http-runtime": "0.1.17",
+    "@jskit-ai/kernel": "0.1.18",
     "@fastify/multipart": "^9.4.0",
     "@fastify/type-provider-typebox": "^6.1.0",
     "typebox": "^1.0.81"

package/src/server/UsersCoreServiceProvider.js

@@ -14,10 +14,6 @@ import { bootAccountPreferencesRoutes } from "./accountPreferences/bootAccountPr
 import { bootAccountNotificationsRoutes } from "./accountNotifications/bootAccountNotificationsRoutes.js";
 import { bootAccountSecurityRoutes } from "./accountSecurity/bootAccountSecurityRoutes.js";
 import { bootConsoleSettingsRoutes } from "./consoleSettings/bootConsoleSettingsRoutes.js";
-import {
-  USERS_WORKSPACE_INVITATIONS_ENABLED_TOKEN,
-  USERS_WORKSPACE_ENABLED_TOKEN
-} from "./common/diTokens.js";
 import { registerSharedApi } from "./common/registerSharedApi.js";
 import { registerCommonRepositories } from "./common/registerCommonRepositories.js";
 import { registerWorkspaceCore } from "./registerWorkspaceCore.js";
@@ -54,9 +50,9 @@ class UsersCoreServiceProvider {
   }
 
   async boot(app) {
-    if (app.make(USERS_WORKSPACE_ENABLED_TOKEN) === true) {
+    if (app.make("users.workspace.enabled") === true) {
       bootWorkspaceDirectoryRoutes(app);
-      if (app.make(USERS_WORKSPACE_INVITATIONS_ENABLED_TOKEN) === true) {
+      if (app.make("users.workspace.invitations.enabled") === true) {
         bootWorkspacePendingInvitations(app);
       }
       bootWorkspaceSettings(app);

package/src/server/accountNotifications/bootAccountNotificationsRoutes.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 { userSettingsResource } from "../../shared/resources/userSettingsResource.js";
 
 function bootAccountNotificationsRoutes(app) {
@@ -7,7 +6,7 @@ function bootAccountNotificationsRoutes(app) {
     throw new Error("bootAccountNotificationsRoutes requires application make().");
   }
 
-  const router = app.make(KERNEL_TOKENS.HttpRouter);
+  const router = app.make("jskit.http.router");
 
   router.register(
     "PATCH",

package/src/server/accountNotifications/registerAccountNotifications.js

@@ -4,15 +4,13 @@ import { accountNotificationsActions } from "./accountNotificationsActions.js";
 import { deepFreeze } from "../common/support/deepFreeze.js";
 import { ACCOUNT_SETTINGS_AND_BOOTSTRAP_EVENTS } from "../common/support/realtimeServiceEvents.js";
 
-const USERS_ACCOUNT_NOTIFICATIONS_SERVICE_TOKEN = "users.accountNotifications.service";
-
 function registerAccountNotifications(app) {
   if (!app || typeof app.singleton !== "function" || typeof app.service !== "function" || typeof app.actions !== "function") {
     throw new Error("registerAccountNotifications requires application singleton()/service()/actions().");
   }
 
   app.service(
-    USERS_ACCOUNT_NOTIFICATIONS_SERVICE_TOKEN,
+    "users.accountNotifications.service",
     (scope) =>
       createAccountNotificationsService({
         userSettingsRepository: scope.make("userSettingsRepository"),
@@ -30,7 +28,7 @@ function registerAccountNotifications(app) {
     withActionDefaults(accountNotificationsActions, {
       domain: "settings",
       dependencies: {
-        accountNotificationsService: USERS_ACCOUNT_NOTIFICATIONS_SERVICE_TOKEN
+        accountNotificationsService: "users.accountNotifications.service"
       }
     })
   );

package/src/server/accountPreferences/bootAccountPreferencesRoutes.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 { userSettingsResource } from "../../shared/resources/userSettingsResource.js";
 
 function bootAccountPreferencesRoutes(app) {
@@ -7,7 +6,7 @@ function bootAccountPreferencesRoutes(app) {
     throw new Error("bootAccountPreferencesRoutes requires application make().");
   }
 
-  const router = app.make(KERNEL_TOKENS.HttpRouter);
+  const router = app.make("jskit.http.router");
 
   router.register(
     "PATCH",

package/src/server/accountPreferences/registerAccountPreferences.js

@@ -4,15 +4,13 @@ import { accountPreferencesActions } from "./accountPreferencesActions.js";
 import { deepFreeze } from "../common/support/deepFreeze.js";
 import { ACCOUNT_SETTINGS_AND_BOOTSTRAP_EVENTS } from "../common/support/realtimeServiceEvents.js";
 
-const USERS_ACCOUNT_PREFERENCES_SERVICE_TOKEN = "users.accountPreferences.service";
-
 function registerAccountPreferences(app) {
   if (!app || typeof app.singleton !== "function" || typeof app.service !== "function" || typeof app.actions !== "function") {
     throw new Error("registerAccountPreferences requires application singleton()/service()/actions().");
   }
 
   app.service(
-    USERS_ACCOUNT_PREFERENCES_SERVICE_TOKEN,
+    "users.accountPreferences.service",
     (scope) =>
       createAccountPreferencesService({
         userSettingsRepository: scope.make("userSettingsRepository"),
@@ -30,7 +28,7 @@ function registerAccountPreferences(app) {
     withActionDefaults(accountPreferencesActions, {
       domain: "settings",
       dependencies: {
-        accountPreferencesService: USERS_ACCOUNT_PREFERENCES_SERVICE_TOKEN
+        accountPreferencesService: "users.accountPreferences.service"
       }
     })
   );

package/src/server/accountProfile/bootAccountProfileRoutes.js

@@ -1,18 +1,16 @@
 import { AppError } from "@jskit-ai/kernel/server/runtime/errors";
-import { KERNEL_TOKENS } from "@jskit-ai/kernel/shared/support/tokens";
 import { withStandardErrorResponses } from "@jskit-ai/http-runtime/shared/validators/errorResponses";
 import { userSettingsResource } from "../../shared/resources/userSettingsResource.js";
 import { userProfileResource } from "../../shared/resources/userProfileResource.js";
-import { USERS_ACCOUNT_PROFILE_SERVICE_TOKEN } from "./registerAccountProfile.js";
 
 function bootAccountProfileRoutes(app) {
   if (!app || typeof app.make !== "function") {
     throw new Error("bootAccountProfileRoutes requires application make().");
   }
 
-  const router = app.make(KERNEL_TOKENS.HttpRouter);
+  const router = app.make("jskit.http.router");
   const authService = app.make("authService");
-  const accountProfileService = app.make(USERS_ACCOUNT_PROFILE_SERVICE_TOKEN);
+  const accountProfileService = app.make("users.accountProfile.service");
 
   router.register(
     "GET",

package/src/server/accountProfile/registerAccountProfile.js

@@ -1,44 +1,38 @@
-import { KERNEL_TOKENS } from "@jskit-ai/kernel/shared/support/tokens";
 import { withActionDefaults } from "@jskit-ai/kernel/shared/actions";
 import { createService as createAccountProfileService } from "./accountProfileService.js";
 import { createService as createAvatarStorageService } from "./avatarStorageService.js";
 import { createService as createAvatarService } from "./avatarService.js";
 import { accountProfileActions } from "./accountProfileActions.js";
 import { deepFreeze } from "../common/support/deepFreeze.js";
-import {
-  USERS_AVATAR_STORAGE_SERVICE_TOKEN,
-  USERS_AVATAR_SERVICE_TOKEN
-} from "../common/diTokens.js";
 import { ACCOUNT_SETTINGS_AND_BOOTSTRAP_EVENTS } from "../common/support/realtimeServiceEvents.js";
 
-const USERS_ACCOUNT_PROFILE_SERVICE_TOKEN = "users.accountProfile.service";
 
 function registerAccountProfile(app) {
   if (!app || typeof app.singleton !== "function" || typeof app.service !== "function" || typeof app.actions !== "function") {
     throw new Error("registerAccountProfile requires application singleton()/service()/actions().");
   }
 
-  app.singleton(USERS_AVATAR_STORAGE_SERVICE_TOKEN, (scope) =>
+  app.singleton("users.avatar.storage.service", (scope) =>
     createAvatarStorageService({
-      storage: scope.make(KERNEL_TOKENS.Storage)
+      storage: scope.make("jskit.storage")
     })
   );
 
-  app.singleton(USERS_AVATAR_SERVICE_TOKEN, (scope) =>
+  app.singleton("users.avatar.service", (scope) =>
     createAvatarService({
       userProfilesRepository: scope.make("userProfilesRepository"),
-      avatarStorageService: scope.make(USERS_AVATAR_STORAGE_SERVICE_TOKEN)
+      avatarStorageService: scope.make("users.avatar.storage.service")
     })
   );
 
   app.service(
-    USERS_ACCOUNT_PROFILE_SERVICE_TOKEN,
+    "users.accountProfile.service",
     (scope) =>
       createAccountProfileService({
         userSettingsRepository: scope.make("userSettingsRepository"),
         userProfilesRepository: scope.make("userProfilesRepository"),
         authService: scope.make("authService"),
-        avatarService: scope.make(USERS_AVATAR_SERVICE_TOKEN)
+        avatarService: scope.make("users.avatar.service")
       }),
     {
       events: deepFreeze({
@@ -53,10 +47,10 @@ function registerAccountProfile(app) {
     withActionDefaults(accountProfileActions, {
       domain: "settings",
       dependencies: {
-        accountProfileService: USERS_ACCOUNT_PROFILE_SERVICE_TOKEN
+        accountProfileService: "users.accountProfile.service"
       }
     })
   );
 }
 
-export { USERS_ACCOUNT_PROFILE_SERVICE_TOKEN, registerAccountProfile };
+export { registerAccountProfile };

package/src/server/accountProfile/registerAvatarMultipartSupport.js

@@ -1,28 +1,25 @@
 import fastifyMultipart from "@fastify/multipart";
-import { KERNEL_TOKENS } from "@jskit-ai/kernel/shared/support/tokens";
-
-const AVATAR_MULTIPART_SUPPORT_FLAG = Symbol.for("jskit.users-core.avatar.multipart.support");
 
 async function registerAvatarMultipartSupport(app) {
   if (!app || typeof app.has !== "function" || typeof app.make !== "function") {
     throw new Error("registerAvatarMultipartSupport requires application has()/make().");
   }
 
-  if (!app.has(KERNEL_TOKENS.Fastify)) {
+  if (!app.has("jskit.fastify")) {
     return;
   }
 
-  const fastify = app.make(KERNEL_TOKENS.Fastify);
+  const fastify = app.make("jskit.fastify");
   if (!fastify || typeof fastify.register !== "function") {
     throw new Error("registerAvatarMultipartSupport requires Fastify register().");
   }
 
-  if (fastify[AVATAR_MULTIPART_SUPPORT_FLAG] === true) {
+  if (fastify["jskit.users-core.avatar.multipart.support"] === true) {
     return;
   }
 
   if (typeof fastify.hasContentTypeParser === "function" && fastify.hasContentTypeParser("multipart")) {
-    Object.defineProperty(fastify, AVATAR_MULTIPART_SUPPORT_FLAG, {
+    Object.defineProperty(fastify, "jskit.users-core.avatar.multipart.support", {
       value: true,
       configurable: false,
       enumerable: false,
@@ -32,7 +29,7 @@ async function registerAvatarMultipartSupport(app) {
   }
 
   await fastify.register(fastifyMultipart);
-  Object.defineProperty(fastify, AVATAR_MULTIPART_SUPPORT_FLAG, {
+  Object.defineProperty(fastify, "jskit.users-core.avatar.multipart.support", {
     value: true,
     configurable: false,
     enumerable: false,

package/src/server/accountSecurity/bootAccountSecurityRoutes.js

@@ -1,6 +1,5 @@
 import { Type } from "@fastify/type-provider-typebox";
 import { withStandardErrorResponses } from "@jskit-ai/http-runtime/shared/validators/errorResponses";
-import { KERNEL_TOKENS } from "@jskit-ai/kernel/shared/support/tokens";
 import { userSettingsResource } from "../../shared/resources/userSettingsResource.js";
 
 function bootAccountSecurityRoutes(app) {
@@ -8,7 +7,7 @@ function bootAccountSecurityRoutes(app) {
     throw new Error("bootAccountSecurityRoutes requires application make().");
   }
 
-  const router = app.make(KERNEL_TOKENS.HttpRouter);
+  const router = app.make("jskit.http.router");
   const authService = app.make("authService");
 
   router.register(

package/src/server/accountSecurity/registerAccountSecurity.js

@@ -2,14 +2,12 @@ import { withActionDefaults } from "@jskit-ai/kernel/shared/actions";
 import { createService as createAccountSecurityService } from "./accountSecurityService.js";
 import { accountSecurityActions } from "./accountSecurityActions.js";
 
-const USERS_ACCOUNT_SECURITY_SERVICE_TOKEN = "users.accountSecurity.service";
-
 function registerAccountSecurity(app) {
   if (!app || typeof app.singleton !== "function" || typeof app.actions !== "function") {
     throw new Error("registerAccountSecurity requires application singleton()/actions().");
   }
 
-  app.singleton(USERS_ACCOUNT_SECURITY_SERVICE_TOKEN, (scope) => {
+  app.singleton("users.accountSecurity.service", (scope) => {
     const authService = scope.has("authService") ? scope.make("authService") : null;
     return createAccountSecurityService({
       userSettingsRepository: scope.make("userSettingsRepository"),
@@ -22,7 +20,7 @@ function registerAccountSecurity(app) {
     withActionDefaults(accountSecurityActions, {
       domain: "settings",
       dependencies: {
-        accountSecurityService: USERS_ACCOUNT_SECURITY_SERVICE_TOKEN
+        accountSecurityService: "users.accountSecurity.service"
       }
     })
   );

package/src/server/common/README.md

@@ -11,7 +11,6 @@ Use these folders:
 - `routes/`: shared route schema maps used by more than one route adapter.
 
 Keep these files here:
-- `diTokens.js`: shared DI tokens used across slices.
 - `registerCommonRepositories.js`: shared repository bindings.
 - `registerSharedApi.js`: shared API metadata registration.
 

package/src/server/common/registerCommonRepositories.js

@@ -1,4 +1,3 @@
-import { KERNEL_TOKENS } from "@jskit-ai/kernel/shared/support/tokens";
 import { createRepository as createUserProfilesRepository } from "./repositories/userProfilesRepository.js";
 import { createRepository as createUserSettingsRepository } from "./repositories/userSettingsRepository.js";
 import { createRepository as createWorkspacesRepository } from "./repositories/workspacesRepository.js";
@@ -12,32 +11,32 @@ function registerCommonRepositories(app) {
   }
 
   app.singleton("userProfilesRepository", (scope) => {
-    const knex = scope.make(KERNEL_TOKENS.Knex);
+    const knex = scope.make("jskit.database.knex");
     return createUserProfilesRepository(knex);
   });
 
   app.singleton("userSettingsRepository", (scope) => {
-    const knex = scope.make(KERNEL_TOKENS.Knex);
+    const knex = scope.make("jskit.database.knex");
     return createUserSettingsRepository(knex);
   });
 
   app.singleton("workspacesRepository", (scope) => {
-    const knex = scope.make(KERNEL_TOKENS.Knex);
+    const knex = scope.make("jskit.database.knex");
     return createWorkspacesRepository(knex);
   });
 
   app.singleton("workspaceMembershipsRepository", (scope) => {
-    const knex = scope.make(KERNEL_TOKENS.Knex);
+    const knex = scope.make("jskit.database.knex");
     return createWorkspaceMembershipsRepository(knex);
   });
 
   app.singleton("workspaceInvitesRepository", (scope) => {
-    const knex = scope.make(KERNEL_TOKENS.Knex);
+    const knex = scope.make("jskit.database.knex");
     return createWorkspaceInvitesRepository(knex);
   });
 
   app.singleton("consoleSettingsRepository", (scope) => {
-    const knex = scope.make(KERNEL_TOKENS.Knex);
+    const knex = scope.make("jskit.database.knex");
     return createConsoleSettingsRepository(knex);
   });
 }

package/src/server/common/support/realtimeServiceEvents.js

@@ -1,7 +1,3 @@
-import {
-  ACCOUNT_SETTINGS_CHANGED_EVENT,
-  USERS_BOOTSTRAP_CHANGED_EVENT
-} from "../../../shared/events/usersEvents.js";
 import { deepFreeze } from "./deepFreeze.js";
 
 function resolveActorScopedEntityId({ options } = {}) {
@@ -22,7 +18,7 @@ const ACCOUNT_SETTINGS_AND_BOOTSTRAP_EVENTS = deepFreeze([
     operation: "updated",
     entityId: resolveActorScopedEntityId,
     realtime: {
-      event: ACCOUNT_SETTINGS_CHANGED_EVENT,
+      event: "account.settings.changed",
       audience: "actor_user"
     }
   },
@@ -33,7 +29,7 @@ const ACCOUNT_SETTINGS_AND_BOOTSTRAP_EVENTS = deepFreeze([
     operation: "updated",
     entityId: resolveActorScopedEntityId,
     realtime: {
-      event: USERS_BOOTSTRAP_CHANGED_EVENT,
+      event: "users.bootstrap.changed",
       audience: "actor_user"
     }
   }
@@ -84,7 +80,7 @@ function createWorkspaceEntityAndBootstrapEvents({
       operation: "updated",
       entityId: bootstrapEntityId,
       realtime: {
-        event: USERS_BOOTSTRAP_CHANGED_EVENT,
+        event: "users.bootstrap.changed",
         audience: bootstrapAudience
       }
     }

package/src/server/consoleSettings/bootConsoleSettingsRoutes.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 { consoleSettingsResource } from "../../shared/resources/consoleSettingsResource.js";
 
 function bootConsoleSettingsRoutes(app) {
@@ -7,7 +6,7 @@ function bootConsoleSettingsRoutes(app) {
     throw new Error("bootConsoleSettingsRoutes requires application make().");
   }
 
-  const router = app.make(KERNEL_TOKENS.HttpRouter);
+  const router = app.make("jskit.http.router");
 
   router.register(
     "GET",

package/src/server/consoleSettings/registerConsoleSettings.js

@@ -1,5 +1,4 @@
 import { withActionDefaults } from "@jskit-ai/kernel/shared/actions";
-import { CONSOLE_SETTINGS_CHANGED_EVENT } from "../../shared/events/usersEvents.js";
 import { createService as createConsoleSettingsService } from "./consoleSettingsService.js";
 import { createService as createConsoleService } from "./consoleService.js";
 import { consoleSettingsActions } from "./consoleSettingsActions.js";
@@ -35,7 +34,7 @@ function registerConsoleSettings(app) {
             operation: "updated",
             entityId: 1,
             realtime: Object.freeze({
-              event: CONSOLE_SETTINGS_CHANGED_EVENT,
+              event: "console.settings.changed",
               audience: "all_users"
             })
           })

package/src/server/registerWorkspaceBootstrap.js

@@ -1,32 +1,26 @@
 import { registerBootstrapPayloadContributor } from "@jskit-ai/kernel/server/runtime";
 import { resolveAppConfig } from "@jskit-ai/kernel/server/support";
-import {
-  USERS_WORKSPACE_INVITATIONS_ENABLED_TOKEN,
-  USERS_TENANCY_PROFILE_TOKEN,
-  USERS_WORKSPACE_PENDING_INVITATIONS_SERVICE_TOKEN
-} from "./common/diTokens.js";
 import { createWorkspaceBootstrapContributor } from "./workspaceBootstrapContributor.js";
 
-const USERS_WORKSPACE_BOOTSTRAP_PAYLOAD_CONTRIBUTOR_TOKEN = "users.core.workspace.bootstrap.payloadContributor";
 
 function registerWorkspaceBootstrap(app) {
   if (!app || typeof app.singleton !== "function") {
     throw new Error("registerWorkspaceBootstrap requires application singleton().");
   }
 
-  registerBootstrapPayloadContributor(app, USERS_WORKSPACE_BOOTSTRAP_PAYLOAD_CONTRIBUTOR_TOKEN, (scope) => {
-    const workspaceInvitationsEnabled = scope.make(USERS_WORKSPACE_INVITATIONS_ENABLED_TOKEN);
+  registerBootstrapPayloadContributor(app, "users.core.workspace.bootstrap.payloadContributor", (scope) => {
+    const workspaceInvitationsEnabled = scope.make("users.workspace.invitations.enabled");
 
     return createWorkspaceBootstrapContributor({
       workspaceService: scope.make("users.workspace.service"),
       workspacePendingInvitationsService: workspaceInvitationsEnabled
-        ? scope.make(USERS_WORKSPACE_PENDING_INVITATIONS_SERVICE_TOKEN)
+        ? scope.make("users.workspace.pending-invitations.service")
         : null,
       workspaceInvitationsEnabled,
       userProfilesRepository: scope.make("userProfilesRepository"),
       userSettingsRepository: scope.make("userSettingsRepository"),
       appConfig: resolveAppConfig(scope),
-      tenancyProfile: scope.make(USERS_TENANCY_PROFILE_TOKEN),
+      tenancyProfile: scope.make("users.tenancy.profile"),
       authService: scope.make("authService"),
       consoleService: scope.has("consoleService") ? scope.make("consoleService") : null
     });