@jskit-ai/users-core 0.1.32 → 0.1.35

package/package.descriptor.mjs

@@ -1,9 +1,9 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/users-core",
-  version: "0.1.32",
+  version: "0.1.35",
   kind: "runtime",
-  description: "Users/workspace domain runtime plus HTTP routes for workspace, account, and console features.",
+  description: "Users/account runtime plus HTTP routes for account and console features.",
   dependsOn: [
     "@jskit-ai/auth-core",
     "@jskit-ai/database-runtime",
@@ -44,11 +44,11 @@ export default Object.freeze({
         {
           subpath: "./server",
           summary:
-            "Exports UsersCoreServiceProvider, users/workspace/console repositories/services, feature route registration modules, and action definitions."
+            "Exports UsersCoreServiceProvider, users/console repositories and services, account feature route registration modules, and action definitions."
         },
         {
           subpath: "./shared",
-          summary: "Exports shared users/workspace role and settings utilities."
+          summary: "Exports shared users settings and tenancy utilities."
         },
         {
           subpath: "./client",
@@ -62,66 +62,6 @@ export default Object.freeze({
     },
     server: {
       routes: [
-        {
-          method: "POST",
-          path: "/api/workspaces",
-          summary: "Create a workspace for the authenticated user."
-        },
-        {
-          method: "GET",
-          path: "/api/workspaces",
-          summary: "List workspaces visible to authenticated user."
-        },
-        {
-          method: "GET",
-          path: "/api/workspace/invitations/pending",
-          summary: "List pending workspace invitations for authenticated user."
-        },
-        {
-          method: "POST",
-          path: "/api/workspace/invitations/redeem",
-          summary: "Accept or refuse a workspace invitation using an invite token."
-        },
-        {
-          method: "GET",
-          path: "/api/w/:workspaceSlug/settings",
-          summary: "Get workspace settings and role catalog by workspace slug."
-        },
-        {
-          method: "PATCH",
-          path: "/api/w/:workspaceSlug/settings",
-          summary: "Update workspace settings by workspace slug."
-        },
-        {
-          method: "GET",
-          path: "/api/w/:workspaceSlug/roles",
-          summary: "Get workspace role catalog by workspace slug."
-        },
-        {
-          method: "GET",
-          path: "/api/w/:workspaceSlug/members",
-          summary: "List members by workspace slug."
-        },
-        {
-          method: "PATCH",
-          path: "/api/w/:workspaceSlug/members/:memberUserId/role",
-          summary: "Update workspace member role by workspace slug."
-        },
-        {
-          method: "GET",
-          path: "/api/w/:workspaceSlug/invites",
-          summary: "List workspace invites by workspace slug."
-        },
-        {
-          method: "POST",
-          path: "/api/w/:workspaceSlug/invites",
-          summary: "Create workspace invite by workspace slug."
-        },
-        {
-          method: "DELETE",
-          path: "/api/w/:workspaceSlug/invites/:inviteId",
-          summary: "Revoke workspace invite by workspace slug."
-        },
         {
           method: "GET",
           path: "/api/settings",
@@ -198,36 +138,29 @@ export default Object.freeze({
   mutations: {
     dependencies: {
       runtime: {
-        "@jskit-ai/auth-core": "0.1.22",
-        "@jskit-ai/database-runtime": "0.1.23",
-        "@jskit-ai/http-runtime": "0.1.22",
-        "@jskit-ai/kernel": "0.1.23",
-        "@jskit-ai/uploads-runtime": "0.1.1",
+        "@jskit-ai/auth-core": "0.1.24",
+        "@jskit-ai/database-runtime": "0.1.25",
+        "@jskit-ai/http-runtime": "0.1.24",
+        "@jskit-ai/kernel": "0.1.25",
+        "@jskit-ai/uploads-runtime": "0.1.3",
         "@fastify/type-provider-typebox": "^6.1.0",
-        "typebox": "^1.0.81"
+        typebox: "^1.0.81"
       },
       dev: {}
     },
     packageJson: {
-      scripts: {
-        "server:app": "SERVER_SURFACE=app node ./bin/server.js",
-        "server:admin": "SERVER_SURFACE=admin node ./bin/server.js",
-        "dev:app": "VITE_SURFACE=app vite",
-        "dev:admin": "VITE_SURFACE=admin vite",
-        "build:app": "VITE_SURFACE=app vite build",
-        "build:admin": "VITE_SURFACE=admin vite build"
-      }
+      scripts: {}
     },
     procfile: {},
     files: [
       {
         op: "install-migration",
-        from: "templates/migrations/users_core_initial.cjs",
+        from: "templates/migrations/users_core_generic_initial.cjs",
         toDir: "migrations",
         extension: ".cjs",
-        reason: "Install users/workspace core schema migration.",
+        reason: "Install users/account core schema migration.",
         category: "migration",
-        id: "users-core-initial-schema"
+        id: "users-core-generic-initial-schema"
       },
       {
         op: "install-migration",
@@ -243,36 +176,10 @@ export default Object.freeze({
         from: "templates/migrations/users_core_console_owner.cjs",
         toDir: "migrations",
         extension: ".cjs",
-        reason: "Install users/workspace console owner migration.",
+        reason: "Install console owner migration.",
         category: "migration",
         id: "users-core-console-owner-schema"
       },
-      {
-        op: "install-migration",
-        from: "templates/migrations/users_core_workspace_settings_single_name_source.cjs",
-        toDir: "migrations",
-        extension: ".cjs",
-        reason: "Remove workspace_settings name/avatar fields so workspace identity data comes from workspaces only.",
-        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",
-        preserveOnRemove: true,
-        reason: "Install app-owned workspace settings field definitions.",
-        category: "users-core",
-        id: "users-core-app-owned-workspace-settings-fields"
-      },
       {
         from: "templates/packages/main/src/shared/resources/consoleSettingsFields.js",
         to: "packages/main/src/shared/resources/consoleSettingsFields.js",
@@ -288,14 +195,6 @@ export default Object.freeze({
         reason: "Install app-owned user settings field definitions.",
         category: "users-core",
         id: "users-core-app-owned-user-settings-fields"
-      },
-      {
-        from: "templates/config/workspaceRoles.js",
-        to: "config/workspaceRoles.js",
-        preserveOnRemove: true,
-        reason: "Install app-owned workspace role catalog in a dedicated config file.",
-        category: "users-core",
-        id: "users-core-app-owned-workspace-roles-config"
       }
     ],
     text: [
@@ -308,16 +207,6 @@ export default Object.freeze({
         category: "runtime-config",
         id: "users-core-auth-profile-mode"
       },
-      {
-        op: "append-text",
-        file: "packages/main/src/shared/index.js",
-        position: "top",
-        skipIfContains: "import \"./resources/workspaceSettingsFields.js\";",
-        value: "import \"./resources/workspaceSettingsFields.js\";\n",
-        reason: "Load app-owned workspace settings field definitions inside the main shared module.",
-        category: "users-core",
-        id: "users-core-main-shared-workspace-settings-field-import"
-      },
       {
         op: "append-text",
         file: "packages/main/src/shared/index.js",
@@ -357,125 +246,7 @@ export default Object.freeze({
         reason: "Ensure server runtime loads app-owned shared settings field registration.",
         category: "users-core",
         id: "users-core-server-import-main-shared"
-      },
-      {
-        op: "append-text",
-        file: "config/public.js",
-        position: "top",
-        skipIfContains: "import { workspaceRoles } from \"./workspaceRoles.js\";",
-        value: "import { workspaceRoles } from \"./workspaceRoles.js\";\n",
-        reason: "Load app-owned workspace role catalog from dedicated config file.",
-        category: "users-core",
-        id: "users-core-workspace-roles-public-import"
-      },
-      {
-        op: "append-text",
-        file: "config/public.js",
-        position: "top",
-        skipIfContains: "import { surfaceAccessPolicies } from \"./surfaceAccessPolicies.js\";",
-        value: "import { surfaceAccessPolicies } from \"./surfaceAccessPolicies.js\";\n",
-        reason: "Load app-owned surface access policy catalog from dedicated config file.",
-        category: "users-core",
-        id: "users-core-surface-access-policies-public-import"
-      },
-      {
-        op: "append-text",
-        file: "config/surfaceAccessPolicies.js",
-        position: "top",
-        skipIfContains: "export const surfaceAccessPolicies = {};",
-        value: "export const surfaceAccessPolicies = {};\n\n",
-        reason: "Initialize app-owned surface access policy config if missing.",
-        category: "users-core",
-        id: "users-core-surface-access-policies-config-init"
-      },
-      {
-        op: "append-text",
-        file: "config/surfaceAccessPolicies.js",
-        position: "bottom",
-        skipIfContains: "surfaceAccessPolicies.workspace_member = {",
-        value: "\nsurfaceAccessPolicies.workspace_member = {\n  requireAuth: true,\n  requireWorkspaceMembership: true\n};\n",
-        reason: "Register workspace-member surface access policy for workspace surfaces.",
-        category: "users-core",
-        id: "users-core-surface-access-policies-workspace-member"
-      },
-      {
-        op: "append-text",
-        file: "config/public.js",
-        position: "bottom",
-        skipIfContains: "config.surfaceDefinitions.app = {",
-        value:
-          "\nconfig.surfaceDefinitions.app = {\n  id: \"app\",\n  label: \"App\",\n  pagesRoot: \"w/[workspaceSlug]\",\n  enabled: true,\n  requiresAuth: true,\n  requiresWorkspace: true,\n  accessPolicyId: \"workspace_member\",\n  origin: \"\"\n};\n\nconfig.surfaceDefinitions.admin = {\n  id: \"admin\",\n  label: \"Admin\",\n  pagesRoot: \"w/[workspaceSlug]/admin\",\n  enabled: true,\n  requiresAuth: true,\n  requiresWorkspace: true,\n  accessPolicyId: \"workspace_member\",\n  origin: \"\"\n};\n",
-        reason: "Append workspace surface topology when tenancy enables workspace routing.",
-        category: "users-core",
-        id: "users-core-surface-config-workspace",
-        when: {
-          config: "tenancyMode",
-          in: ["personal", "workspaces"]
-        }
-      },
-      {
-        op: "append-text",
-        file: "config/public.js",
-        position: "bottom",
-        skipIfContains: "config.workspaceSwitching =",
-        value:
-          "\nconfig.workspaceSwitching = true;\nconfig.workspaceInvitations = {\n  enabled: true,\n  allowInPersonalMode: true\n};\nconfig.assistantEnabled = false;\nconfig.assistantRequiredPermission = \"\";\nconfig.socialEnabled = false;\nconfig.socialFederationEnabled = false;\n",
-        reason: "Append default public users/workspace feature toggles into app-owned config.",
-        category: "users-core",
-        id: "users-core-public-config"
-      },
-      {
-        op: "append-text",
-        file: "config/public.js",
-        position: "bottom",
-        skipIfContains: "config.workspaceRoles = workspaceRoles;",
-        value: "\nconfig.workspaceRoles = workspaceRoles;\n",
-        reason: "Bind app-owned workspace role catalog onto public config.",
-        category: "users-core",
-        id: "users-core-workspace-roles-public-config"
-      },
-      {
-        op: "append-text",
-        file: "config/public.js",
-        position: "bottom",
-        skipIfContains: "config.surfaceAccessPolicies = surfaceAccessPolicies;",
-        value: "\nconfig.surfaceAccessPolicies = surfaceAccessPolicies;\n",
-        reason: "Bind app-owned surface access policies onto public config.",
-        category: "users-core",
-        id: "users-core-surface-access-policies-public-config"
-      },
-      {
-        op: "append-text",
-        file: "config/server.js",
-        position: "bottom",
-        skipIfContains: "config.workspaceColor =",
-        value: "\nconfig.workspaceColor = \"#1867C0\";\n",
-        reason: "Append default server-only users/workspace settings into app-owned config.",
-        category: "users-core",
-        id: "users-core-server-config"
-      },
-      {
-        op: "append-text",
-        file: "config/server.js",
-        position: "bottom",
-        skipIfContains: "config.workspaceSettings =",
-        value:
-          "\nconfig.workspaceSettings = {\n  defaults: {\n    invitesEnabled: true\n  }\n};\n",
-        reason: "Append app-owned workspace settings defaults into the server config.",
-        category: "users-core",
-        id: "users-core-workspace-settings-server-config"
-      },
-      {
-        op: "append-text",
-        file: "config/server.js",
-        position: "bottom",
-        skipIfContains: "config.workspaceMembers =",
-        value:
-          "\nconfig.workspaceMembers = {\n  defaults: {\n    inviteExpiresInMs: 604800000\n  }\n};\n",
-        reason: "Append app-owned workspace member invite policy defaults into the server config.",
-        category: "users-core",
-        id: "users-core-workspace-members-server-config"
-      },
+      }
     ]
   }
 });

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@jskit-ai/users-core",
-  "version": "0.1.32",
+  "version": "0.1.35",
   "type": "module",
   "scripts": {
     "test": "node --test"
   },
   "exports": {
-    "./server/support/workspaceActionSurfaces": "./src/server/support/workspaceActionSurfaces.js",
+    "./server/UsersWorkspacesServiceProvider": "./src/server/UsersWorkspacesServiceProvider.js",
     "./server/support/workspaceRouteInput": "./src/server/support/workspaceRouteInput.js",
     "./server/support/resolveWorkspace": "./src/server/support/resolveWorkspace.js",
     "./server/validators/routeParamsValidator": "./src/server/common/validators/routeParamsValidator.js",
@@ -24,11 +24,11 @@
     "./shared/resources/consoleSettingsFields": "./src/shared/resources/consoleSettingsFields.js"
   },
   "dependencies": {
-    "@jskit-ai/auth-core": "0.1.22",
-    "@jskit-ai/database-runtime": "0.1.23",
-    "@jskit-ai/http-runtime": "0.1.22",
-    "@jskit-ai/kernel": "0.1.23",
-    "@jskit-ai/uploads-runtime": "0.1.1",
+    "@jskit-ai/auth-core": "0.1.24",
+    "@jskit-ai/database-runtime": "0.1.25",
+    "@jskit-ai/http-runtime": "0.1.24",
+    "@jskit-ai/kernel": "0.1.25",
+    "@jskit-ai/uploads-runtime": "0.1.3",
     "@fastify/type-provider-typebox": "^6.1.0",
     "typebox": "^1.0.81"
   }

package/src/server/UsersCoreServiceProvider.js

@@ -1,14 +1,4 @@
 import { USERS_SHARED_API } from "../shared/index.js";
-import { bootWorkspaceDirectoryRoutes } from "./workspaceDirectory/bootWorkspaceDirectoryRoutes.js";
-import { registerWorkspaceDirectory } from "./workspaceDirectory/registerWorkspaceDirectory.js";
-import {
-  registerWorkspacePendingInvitations
-} from "./workspacePendingInvitations/registerWorkspacePendingInvitations.js";
-import { bootWorkspacePendingInvitations } from "./workspacePendingInvitations/bootWorkspacePendingInvitations.js";
-import { registerWorkspaceMembers } from "./workspaceMembers/registerWorkspaceMembers.js";
-import { bootWorkspaceMembers } from "./workspaceMembers/bootWorkspaceMembers.js";
-import { registerWorkspaceSettings } from "./workspaceSettings/registerWorkspaceSettings.js";
-import { bootWorkspaceSettings } from "./workspaceSettings/bootWorkspaceSettings.js";
 import { bootAccountProfileRoutes } from "./accountProfile/bootAccountProfileRoutes.js";
 import { bootAccountPreferencesRoutes } from "./accountPreferences/bootAccountPreferencesRoutes.js";
 import { bootAccountNotificationsRoutes } from "./accountNotifications/bootAccountNotificationsRoutes.js";
@@ -16,14 +6,13 @@ import { bootAccountSecurityRoutes } from "./accountSecurity/bootAccountSecurity
 import { bootConsoleSettingsRoutes } from "./consoleSettings/bootConsoleSettingsRoutes.js";
 import { registerSharedApi } from "./common/registerSharedApi.js";
 import { registerCommonRepositories } from "./common/registerCommonRepositories.js";
-import { registerWorkspaceCore } from "./registerWorkspaceCore.js";
-import { registerWorkspaceBootstrap } from "./registerWorkspaceBootstrap.js";
+import { registerUsersCore } from "./registerUsersCore.js";
+import { registerUsersBootstrap } from "./registerUsersBootstrap.js";
 import { registerAccountPreferences } from "./accountPreferences/registerAccountPreferences.js";
 import { registerAccountNotifications } from "./accountNotifications/registerAccountNotifications.js";
 import { registerAccountProfile } from "./accountProfile/registerAccountProfile.js";
 import { registerAccountSecurity } from "./accountSecurity/registerAccountSecurity.js";
 import { registerConsoleSettings } from "./consoleSettings/registerConsoleSettings.js";
-import { registerUsersCoreActionSurfaceSources } from "./support/workspaceActionSurfaces.js";
 
 class UsersCoreServiceProvider {
   static id = "users.core";
@@ -31,15 +20,10 @@ class UsersCoreServiceProvider {
   static dependsOn = ["runtime.server", "runtime.actions", "runtime.database", "runtime.storage", "auth.provider", "runtime.uploads"];
 
   register(app) {
-    registerUsersCoreActionSurfaceSources(app);
     registerSharedApi(app, USERS_SHARED_API);
     registerCommonRepositories(app);
-    registerWorkspaceCore(app);
-    registerWorkspaceBootstrap(app);
-    registerWorkspaceDirectory(app);
-    registerWorkspaceMembers(app);
-    registerWorkspaceSettings(app);
-    registerWorkspacePendingInvitations(app);
+    registerUsersCore(app);
+    registerUsersBootstrap(app);
 
     registerAccountProfile(app);
     registerAccountPreferences(app);
@@ -49,14 +33,6 @@ class UsersCoreServiceProvider {
   }
 
   async boot(app) {
-    if (app.make("users.workspace.enabled") === true) {
-      bootWorkspaceDirectoryRoutes(app);
-      if (app.make("users.workspace.invitations.enabled") === true) {
-        bootWorkspacePendingInvitations(app);
-      }
-      bootWorkspaceSettings(app);
-      bootWorkspaceMembers(app);
-    }
     bootAccountProfileRoutes(app);
     bootAccountPreferencesRoutes(app);
     bootAccountNotificationsRoutes(app);

package/src/server/UsersWorkspacesServiceProvider.js

@@ -0,0 +1,44 @@
+import { bootWorkspaceDirectoryRoutes } from "./workspaceDirectory/bootWorkspaceDirectoryRoutes.js";
+import { registerWorkspaceDirectory } from "./workspaceDirectory/registerWorkspaceDirectory.js";
+import {
+  registerWorkspacePendingInvitations
+} from "./workspacePendingInvitations/registerWorkspacePendingInvitations.js";
+import { bootWorkspacePendingInvitations } from "./workspacePendingInvitations/bootWorkspacePendingInvitations.js";
+import { registerWorkspaceMembers } from "./workspaceMembers/registerWorkspaceMembers.js";
+import { bootWorkspaceMembers } from "./workspaceMembers/bootWorkspaceMembers.js";
+import { registerWorkspaceSettings } from "./workspaceSettings/registerWorkspaceSettings.js";
+import { bootWorkspaceSettings } from "./workspaceSettings/bootWorkspaceSettings.js";
+import { registerWorkspaceRepositories } from "./registerWorkspaceRepositories.js";
+import { registerWorkspaceCore } from "./registerWorkspaceCore.js";
+import { registerWorkspaceBootstrap } from "./registerWorkspaceBootstrap.js";
+
+class UsersWorkspacesServiceProvider {
+  static id = "workspaces.core";
+
+  static dependsOn = ["users.core"];
+
+  register(app) {
+    registerWorkspaceRepositories(app);
+    registerWorkspaceCore(app);
+    registerWorkspaceBootstrap(app);
+    registerWorkspaceDirectory(app);
+    registerWorkspaceMembers(app);
+    registerWorkspaceSettings(app);
+    registerWorkspacePendingInvitations(app);
+  }
+
+  async boot(app) {
+    if (app.make("users.workspace.enabled") !== true) {
+      return;
+    }
+
+    bootWorkspaceDirectoryRoutes(app);
+    if (app.make("users.workspace.invitations.enabled") === true) {
+      bootWorkspacePendingInvitations(app);
+    }
+    bootWorkspaceSettings(app);
+    bootWorkspaceMembers(app);
+  }
+}
+
+export { UsersWorkspacesServiceProvider };

package/src/server/accountNotifications/accountNotificationsService.js

@@ -9,15 +9,15 @@ import {
 
 function createService({
   userSettingsRepository,
-  userProfilesRepository,
+  usersRepository,
   authService
 } = {}) {
-  if (!userSettingsRepository || !userProfilesRepository) {
+  if (!userSettingsRepository || !usersRepository) {
     throw new Error("accountNotificationsService requires repositories.");
   }
 
   async function updateNotifications(request, user, payload = {}, options = {}) {
-    const profile = await resolveUserProfile(userProfilesRepository, user);
+    const profile = await resolveUserProfile(usersRepository, user);
     if (!profile) {
       throw new AppError(404, "User profile was not found.");
     }

package/src/server/accountNotifications/registerAccountNotifications.js

@@ -14,7 +14,7 @@ function registerAccountNotifications(app) {
     (scope) =>
       createAccountNotificationsService({
         userSettingsRepository: scope.make("userSettingsRepository"),
-        userProfilesRepository: scope.make("userProfilesRepository"),
+        usersRepository: scope.make("usersRepository"),
         authService: scope.make("authService")
       }),
     {

package/src/server/accountPreferences/accountPreferencesService.js

@@ -9,15 +9,15 @@ import {
 
 function createService({
   userSettingsRepository,
-  userProfilesRepository,
+  usersRepository,
   authService
 } = {}) {
-  if (!userSettingsRepository || !userProfilesRepository) {
+  if (!userSettingsRepository || !usersRepository) {
     throw new Error("accountPreferencesService requires repositories.");
   }
 
   async function updatePreferences(request, user, payload = {}, options = {}) {
-    const profile = await resolveUserProfile(userProfilesRepository, user);
+    const profile = await resolveUserProfile(usersRepository, user);
     if (!profile) {
       throw new AppError(404, "User profile was not found.");
     }

package/src/server/accountPreferences/registerAccountPreferences.js

@@ -14,7 +14,7 @@ function registerAccountPreferences(app) {
     (scope) =>
       createAccountPreferencesService({
         userSettingsRepository: scope.make("userSettingsRepository"),
-        userProfilesRepository: scope.make("userProfilesRepository"),
+        usersRepository: scope.make("usersRepository"),
         authService: scope.make("authService")
       }),
     {

package/src/server/accountProfile/accountProfileActions.js

@@ -95,10 +95,17 @@ const accountProfileActions = Object.freeze([
     },
     observability: {},
     async execute(input, context, deps) {
+      const avatarUpload = {
+        stream: input.stream,
+        mimeType: input.mimeType,
+        fileName: input.fileName,
+        uploadDimension: input.uploadDimension
+      };
+
       return deps.accountProfileService.uploadAvatar(
         resolveRequest(context),
         resolveActionUser(context, input),
-        input,
+        avatarUpload,
         {
           context
         }
@@ -125,7 +132,6 @@ const accountProfileActions = Object.freeze([
       return deps.accountProfileService.deleteAvatar(
         resolveRequest(context),
         resolveActionUser(context, input),
-        input,
         {
           context
         }

package/src/server/accountProfile/accountProfileService.js

@@ -9,16 +9,16 @@ import {
 
 function createService({
   userSettingsRepository,
-  userProfilesRepository,
+  usersRepository,
   authService,
   avatarService
 } = {}) {
-  if (!userSettingsRepository || !userProfilesRepository || !avatarService) {
+  if (!userSettingsRepository || !usersRepository || !avatarService) {
     throw new Error("accountProfileService requires repositories and avatarService.");
   }
 
   async function getForUser(request, user, options = {}) {
-    const profile = await resolveUserProfile(userProfilesRepository, user);
+    const profile = await resolveUserProfile(usersRepository, user);
     if (!profile) {
       throw new AppError(404, "User profile was not found.");
     }
@@ -35,7 +35,7 @@ function createService({
   }
 
   async function updateProfile(request, user, payload = {}, options = {}) {
-    const profile = await resolveUserProfile(userProfilesRepository, user);
+    const profile = await resolveUserProfile(usersRepository, user);
     if (!profile) {
       throw new AppError(404, "User profile was not found.");
     }
@@ -49,7 +49,7 @@ function createService({
     }
 
     if (!updatedProfile) {
-      updatedProfile = await userProfilesRepository.updateDisplayNameById(profile.id, payload.displayName);
+      updatedProfile = await usersRepository.updateDisplayNameById(profile.id, payload.displayName);
     }
 
     const settings = await userSettingsRepository.ensureForUserId(updatedProfile.id);
@@ -66,11 +66,11 @@ function createService({
     };
   }
 
-  async function uploadAvatar(request, user, payload = {}, options = {}) {
+  async function uploadAvatar(request, user, avatarUpload = {}, options = {}) {
     void options;
 
-    const avatarUpload = await avatarService.uploadForUser(user, payload);
-    const profile = avatarUpload?.profile || null;
+    const result = await avatarService.uploadForUser(user, avatarUpload);
+    const profile = result?.profile || null;
     if (!profile) {
       throw new AppError(500, "Avatar upload completed without a profile result.");
     }
@@ -86,7 +86,7 @@ function createService({
     });
   }
 
-  async function deleteAvatar(request, user, _payload = {}, options = {}) {
+  async function deleteAvatar(request, user, options = {}) {
     void options;
 
     const profile = await avatarService.clearForUser(user);
@@ -101,7 +101,7 @@ function createService({
     });
   }
 
-  async function readAvatar(_request, user, _payload = {}, options = {}) {
+  async function readAvatar(_request, user, options = {}) {
     void options;
 
     const avatar = await avatarService.readForUser(user);