@jskit-ai/users-core 0.1.47 → 0.1.49

package/package.descriptor.mjs

@@ -1,9 +1,9 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/users-core",
-  version: "0.1.47",
+  version: "0.1.49",
   kind: "runtime",
-  description: "Users/account runtime plus HTTP routes for account and console features.",
+  description: "Users/account runtime plus HTTP routes for account features.",
   dependsOn: [
     "@jskit-ai/auth-core",
     "@jskit-ai/database-runtime",
@@ -44,11 +44,11 @@ export default Object.freeze({
         {
           subpath: "./server",
           summary:
-            "Exports UsersCoreServiceProvider, users/console repositories and services, account feature route registration modules, and action definitions."
+            "Exports UsersCoreServiceProvider plus account feature route registration modules and action definitions."
         },
         {
           subpath: "./shared",
-          summary: "Exports shared users settings and tenancy utilities."
+          summary: "Exports shared users settings resources and defaults."
         },
         {
           subpath: "./client",
@@ -121,16 +121,6 @@ export default Object.freeze({
           method: "POST",
           path: "/api/settings/security/logout-others",
           summary: "Sign out from other active sessions."
-        },
-        {
-          method: "GET",
-          path: "/api/console/settings",
-          summary: "Get console settings."
-        },
-        {
-          method: "PATCH",
-          path: "/api/console/settings",
-          summary: "Update console settings."
         }
       ]
     }
@@ -138,11 +128,11 @@ export default Object.freeze({
   mutations: {
     dependencies: {
       runtime: {
-        "@jskit-ai/auth-core": "0.1.36",
-        "@jskit-ai/database-runtime": "0.1.37",
-        "@jskit-ai/http-runtime": "0.1.36",
-        "@jskit-ai/kernel": "0.1.37",
-        "@jskit-ai/uploads-runtime": "0.1.15",
+        "@jskit-ai/auth-core": "0.1.38",
+        "@jskit-ai/database-runtime": "0.1.39",
+        "@jskit-ai/http-runtime": "0.1.38",
+        "@jskit-ai/kernel": "0.1.39",
+        "@jskit-ai/uploads-runtime": "0.1.17",
         "@fastify/type-provider-typebox": "^6.1.0",
         typebox: "^1.0.81"
       },
@@ -171,23 +161,6 @@ export default Object.freeze({
         category: "migration",
         id: "users-core-profile-username-schema"
       },
-      {
-        op: "install-migration",
-        from: "templates/migrations/users_core_console_owner.cjs",
-        toDir: "migrations",
-        extension: ".cjs",
-        reason: "Install console owner migration.",
-        category: "migration",
-        id: "users-core-console-owner-schema"
-      },
-      {
-        from: "templates/packages/main/src/shared/resources/consoleSettingsFields.js",
-        to: "packages/main/src/shared/resources/consoleSettingsFields.js",
-        preserveOnRemove: true,
-        reason: "Install app-owned console settings field definitions.",
-        category: "users-core",
-        id: "users-core-app-owned-console-settings-fields"
-      },
       {
         from: "templates/packages/main/src/shared/resources/userSettingsFields.js",
         to: "packages/main/src/shared/resources/userSettingsFields.js",
@@ -207,16 +180,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/consoleSettingsFields.js\";",
-        value: "import \"./resources/consoleSettingsFields.js\";\n",
-        reason: "Load app-owned console settings field definitions inside the main shared module.",
-        category: "users-core",
-        id: "users-core-main-shared-console-settings-field-import"
-      },
       {
         op: "append-text",
         file: "packages/main/src/shared/index.js",

package/package.json

@@ -1,34 +1,23 @@
 {
   "name": "@jskit-ai/users-core",
-  "version": "0.1.47",
+  "version": "0.1.49",
   "type": "module",
   "scripts": {
     "test": "node --test"
   },
   "exports": {
-    "./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",
+    "./server/profileSyncLifecycleContributorRegistry": "./src/server/profileSyncLifecycleContributorRegistry.js",
     "./shared/settings": "./src/shared/settings.js",
-    "./shared/tenancyProfile": "./src/shared/tenancyProfile.js",
-    "./shared/support/usersVisibility": "./src/shared/support/usersVisibility.js",
-    "./shared/support/workspacePathModel": "./src/shared/support/workspacePathModel.js",
-    "./shared/support/usersApiPaths": "./src/shared/support/usersApiPaths.js",
-    "./shared/resources/workspaceResource": "./src/shared/resources/workspaceResource.js",
-    "./shared/resources/workspaceSettingsResource": "./src/shared/resources/workspaceSettingsResource.js",
-    "./shared/resources/workspaceSettingsFields": "./src/shared/resources/workspaceSettingsFields.js",
     "./shared/resources/userProfileResource": "./src/shared/resources/userProfileResource.js",
     "./shared/resources/userSettingsFields": "./src/shared/resources/userSettingsFields.js",
-    "./shared/resources/userSettingsResource": "./src/shared/resources/userSettingsResource.js",
-    "./shared/resources/consoleSettingsFields": "./src/shared/resources/consoleSettingsFields.js"
+    "./shared/resources/userSettingsResource": "./src/shared/resources/userSettingsResource.js"
   },
   "dependencies": {
-    "@jskit-ai/auth-core": "0.1.36",
-    "@jskit-ai/database-runtime": "0.1.37",
-    "@jskit-ai/http-runtime": "0.1.36",
-    "@jskit-ai/kernel": "0.1.37",
-    "@jskit-ai/uploads-runtime": "0.1.15",
+    "@jskit-ai/auth-core": "0.1.38",
+    "@jskit-ai/database-runtime": "0.1.39",
+    "@jskit-ai/http-runtime": "0.1.38",
+    "@jskit-ai/kernel": "0.1.39",
+    "@jskit-ai/uploads-runtime": "0.1.17",
     "@fastify/type-provider-typebox": "^6.1.0",
     "typebox": "^1.0.81"
   }

package/src/server/UsersCoreServiceProvider.js

@@ -3,7 +3,6 @@ import { bootAccountProfileRoutes } from "./accountProfile/bootAccountProfileRou
 import { bootAccountPreferencesRoutes } from "./accountPreferences/bootAccountPreferencesRoutes.js";
 import { bootAccountNotificationsRoutes } from "./accountNotifications/bootAccountNotificationsRoutes.js";
 import { bootAccountSecurityRoutes } from "./accountSecurity/bootAccountSecurityRoutes.js";
-import { bootConsoleSettingsRoutes } from "./consoleSettings/bootConsoleSettingsRoutes.js";
 import { registerSharedApi } from "./common/registerSharedApi.js";
 import { registerCommonRepositories } from "./common/registerCommonRepositories.js";
 import { registerUsersCore } from "./registerUsersCore.js";
@@ -12,7 +11,6 @@ import { registerAccountPreferences } from "./accountPreferences/registerAccount
 import { registerAccountNotifications } from "./accountNotifications/registerAccountNotifications.js";
 import { registerAccountProfile } from "./accountProfile/registerAccountProfile.js";
 import { registerAccountSecurity } from "./accountSecurity/registerAccountSecurity.js";
-import { registerConsoleSettings } from "./consoleSettings/registerConsoleSettings.js";
 
 class UsersCoreServiceProvider {
   static id = "users.core";
@@ -29,7 +27,6 @@ class UsersCoreServiceProvider {
     registerAccountPreferences(app);
     registerAccountNotifications(app);
     registerAccountSecurity(app);
-    registerConsoleSettings(app);
   }
 
   async boot(app) {
@@ -37,7 +34,6 @@ class UsersCoreServiceProvider {
     bootAccountPreferencesRoutes(app);
     bootAccountNotificationsRoutes(app);
     bootAccountSecurityRoutes(app);
-    bootConsoleSettingsRoutes(app);
   }
 }
 

package/src/server/common/registerCommonRepositories.js

@@ -1,6 +1,5 @@
 import { createRepository as createUsersRepository } from "./repositories/usersRepository.js";
 import { createRepository as createUserSettingsRepository } from "./repositories/userSettingsRepository.js";
-import { createRepository as createConsoleSettingsRepository } from "../consoleSettings/consoleSettingsRepository.js";
 
 function registerCommonRepositories(app) {
   if (!app || typeof app.singleton !== "function") {
@@ -16,10 +15,6 @@ function registerCommonRepositories(app) {
     const knex = scope.make("jskit.database.knex");
     return createUserSettingsRepository(knex);
   });
-  app.singleton("consoleSettingsRepository", (scope) => {
-    const knex = scope.make("jskit.database.knex");
-    return createConsoleSettingsRepository(knex);
-  });
 }
 
 export { registerCommonRepositories };

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

@@ -54,7 +54,17 @@ function requireSynchronizedProfile(profile) {
   throw new Error("Profile synchronization failed.");
 }
 
-function createService({ usersRepository, workspaceProvisioningService = null, userSettingsRepository = null } = {}) {
+function normalizeLifecycleContributors(entries = []) {
+  if (!Array.isArray(entries)) {
+    return [];
+  }
+
+  return entries.filter(
+    (entry) => entry && typeof entry === "object" && typeof entry.afterIdentityProfileSynced === "function"
+  );
+}
+
+function createService({ usersRepository, lifecycleContributors = [], userSettingsRepository = null } = {}) {
   if (!usersRepository || typeof usersRepository.findByIdentity !== "function") {
     throw new Error("authProfileSyncService requires usersRepository.findByIdentity().");
   }
@@ -68,6 +78,8 @@ function createService({ usersRepository, workspaceProvisioningService = null, u
     throw new Error("authProfileSyncService requires userSettingsRepository.ensureForUserId().");
   }
 
+  const normalizedLifecycleContributors = normalizeLifecycleContributors(lifecycleContributors);
+
   async function findByIdentity(identityLike, options = {}) {
     const normalized = buildNormalizedIdentityKey(identityLike);
     return usersRepository.findByIdentity(
@@ -99,21 +111,30 @@ function createService({ usersRepository, workspaceProvisioningService = null, u
     const runSync = async (trx = null) => {
       const operationOptions = trx ? { ...options, trx } : options;
       const existing = await findByIdentity(normalized, operationOptions);
+      let created = false;
       if (!profileNeedsUpdate(existing, normalized)) {
         const synchronizedProfile = requireSynchronizedProfile(existing);
         await userSettingsRepository.ensureForUserId(synchronizedProfile.id, operationOptions);
+        for (const contributor of normalizedLifecycleContributors) {
+          await contributor.afterIdentityProfileSynced({
+            profile: synchronizedProfile,
+            created,
+            options: operationOptions
+          });
+        }
         return synchronizedProfile;
       }
 
       const upserted = await upsertByIdentity(normalized, operationOptions);
       const synchronizedProfile = requireSynchronizedProfile(upserted);
       await userSettingsRepository.ensureForUserId(synchronizedProfile.id, operationOptions);
-      if (
-        !existing &&
-        workspaceProvisioningService &&
-        typeof workspaceProvisioningService.provisionWorkspaceForNewUser === "function"
-      ) {
-        await workspaceProvisioningService.provisionWorkspaceForNewUser(synchronizedProfile, operationOptions);
+      created = !existing;
+      for (const contributor of normalizedLifecycleContributors) {
+        await contributor.afterIdentityProfileSynced({
+          profile: synchronizedProfile,
+          created,
+          options: operationOptions
+        });
       }
 
       return synchronizedProfile;

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

@@ -5,12 +5,6 @@ function resolveActorScopedEntityId({ options } = {}) {
   return normalizeRecordId(options?.context?.actor?.id, { fallback: "" });
 }
 
-function resolveWorkspaceSlugPayload({ args } = {}) {
-  return {
-    workspaceSlug: String(args?.[0]?.slug || "").trim()
-  };
-}
-
 const ACCOUNT_SETTINGS_AND_BOOTSTRAP_EVENTS = deepFreeze([
   {
     type: "entity.changed",
@@ -36,56 +30,4 @@ const ACCOUNT_SETTINGS_AND_BOOTSTRAP_EVENTS = deepFreeze([
   }
 ]);
 
-function createWorkspaceEntityAndBootstrapEvents({
-  workspaceEntity,
-  workspaceOperation,
-  workspaceRealtimeEvent,
-  workspaceEntityId = ({ args }) => args?.[0]?.id,
-  bootstrapEntityId = ({ args }) => args?.[0]?.id,
-  bootstrapAudience = "event_scope"
-} = {}) {
-  const normalizedWorkspaceEntity = String(workspaceEntity || "").trim();
-  const normalizedWorkspaceOperation = String(workspaceOperation || "")
-    .trim()
-    .toLowerCase();
-  const normalizedWorkspaceRealtimeEvent = String(workspaceRealtimeEvent || "").trim();
-  if (!normalizedWorkspaceEntity || !normalizedWorkspaceOperation || !normalizedWorkspaceRealtimeEvent) {
-    throw new Error(
-      "createWorkspaceEntityAndBootstrapEvents requires workspaceEntity, workspaceOperation, and workspaceRealtimeEvent."
-    );
-  }
-  if (typeof workspaceEntityId !== "function") {
-    throw new Error("createWorkspaceEntityAndBootstrapEvents requires workspaceEntityId to be a function.");
-  }
-  if (typeof bootstrapEntityId !== "function") {
-    throw new Error("createWorkspaceEntityAndBootstrapEvents requires bootstrapEntityId to be a function.");
-  }
-
-  return deepFreeze([
-    {
-      type: "entity.changed",
-      source: "workspace",
-      entity: normalizedWorkspaceEntity,
-      operation: normalizedWorkspaceOperation,
-      entityId: (payload = {}) => normalizeRecordId(workspaceEntityId(payload), { fallback: "" }),
-      realtime: {
-        event: normalizedWorkspaceRealtimeEvent,
-        payload: resolveWorkspaceSlugPayload,
-        audience: "event_scope"
-      }
-    },
-    {
-      type: "entity.changed",
-      source: "users",
-      entity: "bootstrap",
-      operation: "updated",
-      entityId: (payload = {}) => normalizeRecordId(bootstrapEntityId(payload), { fallback: "" }),
-      realtime: {
-        event: "users.bootstrap.changed",
-        audience: bootstrapAudience
-      }
-    }
-  ]);
-}
-
-export { ACCOUNT_SETTINGS_AND_BOOTSTRAP_EVENTS, createWorkspaceEntityAndBootstrapEvents };
+export { ACCOUNT_SETTINGS_AND_BOOTSTRAP_EVENTS };

package/src/server/profileSyncLifecycleContributorRegistry.js

@@ -0,0 +1,56 @@
+import { registerTaggedSingleton, resolveTaggedEntries } from "@jskit-ai/kernel/server/registries";
+
+const PROFILE_SYNC_LIFECYCLE_CONTRIBUTOR_TAG = "jskit.users.profileSync.lifecycleContributors";
+
+function normalizeProfileSyncLifecycleContributor(entry) {
+  if (typeof entry === "function") {
+    return Object.freeze({
+      contributorId: String(entry.name || "anonymous"),
+      order: 0,
+      afterIdentityProfileSynced: entry
+    });
+  }
+
+  if (!entry || typeof entry !== "object" || typeof entry.afterIdentityProfileSynced !== "function") {
+    return null;
+  }
+
+  const contributorId = String(entry.contributorId || "anonymous");
+  const order = Number.isFinite(entry.order) ? Number(entry.order) : 0;
+
+  return Object.freeze({
+    ...entry,
+    contributorId,
+    order,
+    afterIdentityProfileSynced: entry.afterIdentityProfileSynced
+  });
+}
+
+function registerProfileSyncLifecycleContributor(app, token, factory) {
+  registerTaggedSingleton(app, token, factory, PROFILE_SYNC_LIFECYCLE_CONTRIBUTOR_TAG, {
+    context: "registerProfileSyncLifecycleContributor"
+  });
+}
+
+function resolveProfileSyncLifecycleContributors(scope) {
+  return resolveTaggedEntries(scope, PROFILE_SYNC_LIFECYCLE_CONTRIBUTOR_TAG)
+    .map((entry, index) => ({
+      contributor: normalizeProfileSyncLifecycleContributor(entry),
+      index
+    }))
+    .filter((entry) => Boolean(entry.contributor))
+    .sort((left, right) => {
+      if (left.contributor.order !== right.contributor.order) {
+        return left.contributor.order - right.contributor.order;
+      }
+
+      return left.index - right.index;
+    })
+    .map((entry) => entry.contributor);
+}
+
+export {
+  PROFILE_SYNC_LIFECYCLE_CONTRIBUTOR_TAG,
+  registerProfileSyncLifecycleContributor,
+  resolveProfileSyncLifecycleContributors
+};

package/src/server/registerUsersBootstrap.js

@@ -12,9 +12,7 @@ function registerUsersBootstrap(app) {
       usersRepository: scope.make("usersRepository"),
       userSettingsRepository: scope.make("userSettingsRepository"),
       appConfig: resolveAppConfig(scope),
-      tenancyProfile: scope.make("users.tenancy.profile"),
-      authService: scope.make("authService"),
-      consoleService: scope.has("consoleService") ? scope.make("consoleService") : null
+      authService: scope.make("authService")
     });
   });
 }

package/src/server/registerUsersCore.js

@@ -1,30 +1,18 @@
-import { resolveAppConfig } from "@jskit-ai/kernel/server/support";
-import { resolveTenancyProfile } from "../shared/tenancyProfile.js";
 import { createService as createAuthProfileSyncService } from "./common/services/authProfileSyncService.js";
-import { registerUsersCoreActionSurfaceSources } from "./support/workspaceActionSurfaces.js";
+import { resolveProfileSyncLifecycleContributors } from "./profileSyncLifecycleContributorRegistry.js";
 
 function registerUsersCore(app) {
   if (!app || typeof app.singleton !== "function") {
     throw new Error("registerUsersCore requires application singleton().");
   }
 
-  registerUsersCoreActionSurfaceSources(app);
-
   app.singleton("users.profile.sync.service", (scope) => {
     return createAuthProfileSyncService({
       usersRepository: scope.make("usersRepository"),
       userSettingsRepository: scope.make("userSettingsRepository"),
-      workspaceProvisioningService:
-        typeof scope.has === "function" && scope.has("users.workspace.service")
-          ? scope.make("users.workspace.service")
-          : null
+      lifecycleContributors: resolveProfileSyncLifecycleContributors(scope)
     });
   });
-
-  app.singleton("users.tenancy.profile", (scope) => {
-    const appConfig = resolveAppConfig(scope);
-    return resolveTenancyProfile(appConfig);
-  });
 }
 
 export { registerUsersCore };

package/src/server/usersBootstrapContributor.js

@@ -1,19 +1,10 @@
 import { AppError } from "@jskit-ai/kernel/server/runtime";
 import { requireServiceMethod } from "@jskit-ai/kernel/shared/actions/actionContributorHelpers";
 import { normalizeLowerText, normalizeText } from "@jskit-ai/kernel/shared/actions/textNormalization";
-import {
-  TENANCY_MODE_NONE,
-  TENANCY_MODE_PERSONAL,
-  TENANCY_MODE_WORKSPACES,
-  WORKSPACE_SLUG_POLICY_NONE,
-  WORKSPACE_SLUG_POLICY_IMMUTABLE_USERNAME,
-  WORKSPACE_SLUG_POLICY_USER_SELECTED,
-  resolveTenancyProfile
-} from "../shared/tenancyProfile.js";
+import { normalizeObject } from "@jskit-ai/kernel/shared/support/normalize";
 import { accountAvatarFormatter } from "./common/formatters/accountAvatarFormatter.js";
 import { authenticatedUserValidator } from "./common/validators/authenticatedUserValidator.js";
 import { userSettingsFields } from "../shared/resources/userSettingsFields.js";
-import { normalizeRecordId } from "@jskit-ai/kernel/shared/support/normalize";
 
 function getOAuthProviderCatalogPayload(authService) {
   if (!authService || typeof authService.getOAuthProviderCatalog !== "function") {
@@ -56,10 +47,8 @@ function normalizeBoolean(value, fallback) {
   return fallback;
 }
 
-function resolveAppState(appConfig = {}, { workspaceInvitationsEnabled = false } = {}) {
+function resolveAppState(appConfig = {}) {
   const features = {
-    workspaceSwitching: normalizeBoolean(appConfig.workspaceSwitching, false),
-    workspaceInvites: workspaceInvitationsEnabled === true,
     assistantEnabled: normalizeBoolean(appConfig.assistantEnabled, false),
     assistantRequiredPermission: normalizeText(appConfig.assistantRequiredPermission),
     socialEnabled: normalizeBoolean(appConfig.socialEnabled, false),
@@ -71,56 +60,14 @@ function resolveAppState(appConfig = {}, { workspaceInvitationsEnabled = false }
   };
 }
 
-function normalizeSlugPolicy(value = "") {
-  const normalizedValue = normalizeLowerText(value);
-  if (
-    normalizedValue === WORKSPACE_SLUG_POLICY_IMMUTABLE_USERNAME ||
-    normalizedValue === WORKSPACE_SLUG_POLICY_USER_SELECTED
-  ) {
-    return normalizedValue;
-  }
-  return WORKSPACE_SLUG_POLICY_NONE;
-}
-
-function isSupportedTenancyMode(value = "") {
-  return value === TENANCY_MODE_NONE || value === TENANCY_MODE_PERSONAL || value === TENANCY_MODE_WORKSPACES;
-}
-
-function resolveBootstrapTenancyProfile(tenancyProfile = null, appConfig = {}) {
-  const fallback = resolveTenancyProfile(appConfig);
-  const source = tenancyProfile && typeof tenancyProfile === "object" ? tenancyProfile : fallback;
-  const mode = isSupportedTenancyMode(source?.mode) ? source.mode : fallback.mode;
-  const workspace = source?.workspace && typeof source.workspace === "object" ? source.workspace : fallback.workspace;
-
-  return Object.freeze({
-    mode,
-    workspace: Object.freeze({
-      enabled: workspace.enabled === true,
-      autoProvision: workspace.autoProvision === true,
-      allowSelfCreate: workspace.allowSelfCreate === true,
-      slugPolicy: normalizeSlugPolicy(workspace.slugPolicy)
-    })
-  });
-}
-
-function createAnonymousBootstrapPayload({ appState, tenancyProfile }) {
+function createAnonymousBootstrapPayload({ appState, surfaceAccess = {} }) {
   return {
     session: {
       authenticated: false
     },
     profile: null,
-    tenancy: tenancyProfile,
     app: appState,
-    workspaces: [],
-    pendingInvites: [],
-    activeWorkspace: null,
-    membership: null,
-    requestedWorkspace: null,
-    permissions: [],
-    surfaceAccess: {
-      consoleowner: false
-    },
-    workspaceSettings: null,
+    surfaceAccess: normalizeObject(surfaceAccess),
     userSettings: null,
     requestMeta: {
       hasRequest: false
@@ -153,13 +100,10 @@ function createUsersBootstrapContributor({
   usersRepository,
   userSettingsRepository,
   appConfig = {},
-  tenancyProfile = null,
-  authService,
-  consoleService = null
+  authService
 } = {}) {
   const contributorId = "users.bootstrap";
   const appState = resolveAppState(appConfig);
-  const resolvedTenancyProfile = resolveBootstrapTenancyProfile(tenancyProfile, appConfig);
 
   requireServiceMethod(usersRepository, "findById", contributorId, {
     serviceLabel: "usersRepository"
@@ -170,7 +114,8 @@ function createUsersBootstrapContributor({
 
   return Object.freeze({
     contributorId,
-    async contribute({ request = null, reply = null } = {}) {
+    order: 100,
+    async contribute({ request = null, reply = null, payload: existingPayload = {} } = {}) {
       const authResult = await request.executeAction({
         actionId: "auth.session.read"
       });
@@ -186,26 +131,16 @@ function createUsersBootstrapContributor({
       }
 
       const normalizedUser = authenticatedUserValidator.normalize(authResult?.authenticated ? authResult?.profile : null);
+      const inheritedSurfaceAccess = normalizeObject(existingPayload?.surfaceAccess);
       let payload = createAnonymousBootstrapPayload({
         appState,
-        tenancyProfile: resolvedTenancyProfile
+        surfaceAccess: inheritedSurfaceAccess
       });
 
       if (normalizedUser) {
         const latestProfile = (await usersRepository.findById(normalizedUser.id)) || normalizedUser;
         const userSettings = await userSettingsRepository.ensureForUserId(latestProfile.id);
 
-        let seededConsoleOwnerUserId = null;
-        if (
-          consoleService &&
-          typeof consoleService.ensureInitialConsoleMember === "function"
-        ) {
-          seededConsoleOwnerUserId = normalizeRecordId(
-            await consoleService.ensureInitialConsoleMember(latestProfile.id),
-            { fallback: null }
-          );
-        }
-
         payload = {
           session: {
             authenticated: true,
@@ -216,18 +151,8 @@ function createUsersBootstrapContributor({
             email: latestProfile.email,
             avatar: accountAvatarFormatter(latestProfile, userSettings)
           },
-          tenancy: resolvedTenancyProfile,
           app: appState,
-          workspaces: [],
-          pendingInvites: [],
-          activeWorkspace: null,
-          membership: null,
-          requestedWorkspace: null,
-          permissions: [],
-          surfaceAccess: {
-            consoleowner: Boolean(seededConsoleOwnerUserId) && seededConsoleOwnerUserId === String(latestProfile.id)
-          },
-          workspaceSettings: null,
+          surfaceAccess: inheritedSurfaceAccess,
           userSettings: mapUserSettingsBootstrap(userSettings),
           requestMeta: {
             hasRequest: Boolean(request)