@jskit-ai/users-core 0.1.160 → 0.1.163

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/users-core",
-  "version": "0.1.160",
+  "version": "0.1.163",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -11,14 +11,373 @@
     "./shared/resources/userSettingsResource": "./src/shared/resources/userSettingsResource.js"
   },
   "dependencies": {
-    "@jskit-ai/auth-core": "0.1.145",
-    "@jskit-ai/database-runtime": "0.1.146",
-    "@jskit-ai/http-runtime": "0.1.145",
-    "@jskit-ai/json-rest-api-core": "0.1.91",
-    "@jskit-ai/kernel": "0.1.146",
-    "@jskit-ai/resource-crud-core": "0.1.89",
-    "@jskit-ai/resource-core": "0.1.89",
-    "@jskit-ai/uploads-runtime": "0.1.122",
-    "json-rest-schema": "1.x.x"
+    "@jskit-ai/auth-core": "0.1.148",
+    "@jskit-ai/database-runtime": "0.1.150",
+    "@jskit-ai/http-runtime": "0.1.148",
+    "@jskit-ai/json-rest-api-core": "0.1.94",
+    "@jskit-ai/kernel": "0.1.150",
+    "@jskit-ai/resource-core": "0.1.92",
+    "@jskit-ai/resource-crud-core": "0.1.92",
+    "@jskit-ai/storage-runtime": "0.1.147",
+    "@jskit-ai/uploads-runtime": "0.1.125",
+    "json-rest-schema": "^1.0.17"
+  },
+  "description": "Users/account runtime plus HTTP routes for account features.",
+  "jskit": {
+    "kind": "runtime",
+    "capabilities": {
+      "provides": [
+        "users.core",
+        "users.server-routes"
+      ],
+      "requires": [
+        "runtime.actions",
+        "runtime.database",
+        "json-rest-api.core",
+        "runtime.storage",
+        "runtime.uploads",
+        "auth.provider",
+        "auth.policy"
+      ]
+    },
+    "runtime": {
+      "server": {
+        "providers": [
+          {
+            "entrypoint": "src/server/UsersCoreServiceProvider.js",
+            "export": "UsersCoreServiceProvider"
+          }
+        ]
+      },
+      "client": {
+        "providers": []
+      }
+    },
+    "metadata": {
+      "jskit": {
+        "tableOwnership": {
+          "tables": [
+            {
+              "tableName": "user_settings",
+              "provenance": "runtime-package",
+              "ownerKind": "package-runtime"
+            }
+          ]
+        }
+      },
+      "apiSummary": {
+        "surfaces": [
+          {
+            "subpath": "./server",
+            "summary": "Exports UsersCoreServiceProvider plus account feature route registration modules and action definitions."
+          },
+          {
+            "subpath": "./shared",
+            "summary": "Exports shared users settings resources and defaults."
+          },
+          {
+            "subpath": "./client",
+            "summary": "Exports no runtime API today (reserved client entrypoint)."
+          }
+        ],
+        "containerTokens": {
+          "server": [
+            "users.profile.sync.service",
+            "auth.profile.projector"
+          ],
+          "client": []
+        }
+      },
+      "server": {
+        "routes": [
+          {
+            "method": "GET",
+            "path": "/api/settings",
+            "summary": "Get authenticated user settings."
+          },
+          {
+            "method": "PATCH",
+            "path": "/api/settings/profile",
+            "summary": "Update profile settings."
+          },
+          {
+            "method": "GET",
+            "path": "/api/settings/profile/avatar",
+            "summary": "Read authenticated user's uploaded avatar."
+          },
+          {
+            "method": "POST",
+            "path": "/api/settings/profile/avatar",
+            "summary": "Upload profile avatar."
+          },
+          {
+            "method": "DELETE",
+            "path": "/api/settings/profile/avatar",
+            "summary": "Delete profile avatar."
+          },
+          {
+            "method": "PATCH",
+            "path": "/api/settings/preferences",
+            "summary": "Update user preferences."
+          },
+          {
+            "method": "PATCH",
+            "path": "/api/settings/notifications",
+            "summary": "Update notification settings."
+          },
+          {
+            "method": "POST",
+            "path": "/api/settings/security/change-password",
+            "summary": "Set or change password for authenticated user."
+          },
+          {
+            "method": "PATCH",
+            "path": "/api/settings/security/methods/password",
+            "summary": "Enable or disable password sign-in method."
+          },
+          {
+            "method": "GET",
+            "path": "/api/settings/security/oauth/:provider/start",
+            "summary": "Start linking an OAuth provider for authenticated user."
+          },
+          {
+            "method": "DELETE",
+            "path": "/api/settings/security/oauth/:provider",
+            "summary": "Unlink an OAuth provider from authenticated account."
+          },
+          {
+            "method": "POST",
+            "path": "/api/settings/security/logout-others",
+            "summary": "Sign out from other active sessions."
+          }
+        ]
+      }
+    },
+    "mutations": {
+      "dependencies": {
+        "runtime": {
+          "@jskit-ai/auth-core": "0.1.148",
+          "@jskit-ai/crud-core": "0.1.161",
+          "@jskit-ai/database-runtime": "0.1.150",
+          "@jskit-ai/http-runtime": "0.1.148",
+          "@jskit-ai/json-rest-api-core": "0.1.94",
+          "@jskit-ai/kernel": "0.1.150",
+          "@jskit-ai/resource-core": "0.1.92",
+          "@jskit-ai/resource-crud-core": "0.1.92",
+          "@local/users": "file:packages/users",
+          "@jskit-ai/uploads-runtime": "0.1.125"
+        },
+        "dev": {}
+      },
+      "packageJson": {
+        "scripts": {}
+      },
+      "procfile": {},
+      "files": [
+        {
+          "op": "install-migration",
+          "from": "templates/migrations/users_core_generic_initial.cjs",
+          "toDir": "migrations",
+          "extension": ".cjs",
+          "reason": "Install users/account core schema migration.",
+          "category": "migration",
+          "id": "users-core-generic-initial-schema"
+        },
+        {
+          "op": "install-migration",
+          "from": "templates/migrations/users_core_profile_username.cjs",
+          "toDir": "migrations",
+          "extension": ".cjs",
+          "reason": "Install users profile username migration.",
+          "category": "migration",
+          "id": "users-core-profile-username-schema"
+        },
+        {
+          "op": "install-migration",
+          "from": "templates/migrations/users_core_profile_updated_at.cjs",
+          "toDir": "migrations",
+          "extension": ".cjs",
+          "reason": "Install users profile updated-at migration.",
+          "category": "migration",
+          "id": "users-core-profile-updated-at-schema"
+        },
+        {
+          "from": "templates/packages/users/package.json",
+          "to": "packages/users/package.json",
+          "ownership": "app",
+          "preserveOnRemove": true,
+          "reason": "Install app-owned users package manifest for non-workspace tenancy.",
+          "category": "users-core",
+          "id": "users-core-users-package-json-base",
+          "when": {
+            "config": "tenancyMode",
+            "notIn": [
+              "personal",
+              "workspaces"
+            ]
+          }
+        },
+        {
+          "from": "templates/packages/users-workspace/package.json",
+          "to": "packages/users/package.json",
+          "ownership": "app",
+          "preserveOnRemove": true,
+          "reason": "Install app-owned users package manifest for workspace tenancy.",
+          "category": "users-core",
+          "id": "users-core-users-package-json-workspace",
+          "when": {
+            "config": "tenancyMode",
+            "in": [
+              "personal",
+              "workspaces"
+            ]
+          }
+        },
+        {
+          "from": "templates/packages/users/src/server/UsersProvider.js",
+          "to": "packages/users/src/server/UsersProvider.js",
+          "ownership": "app",
+          "preserveOnRemove": true,
+          "reason": "Install app-owned users CRUD provider for non-workspace tenancy.",
+          "category": "users-core",
+          "id": "users-core-users-provider-base",
+          "when": {
+            "config": "tenancyMode",
+            "notIn": [
+              "personal",
+              "workspaces"
+            ]
+          }
+        },
+        {
+          "from": "templates/packages/users-workspace/src/server/UsersProvider.js",
+          "to": "packages/users/src/server/UsersProvider.js",
+          "ownership": "app",
+          "preserveOnRemove": true,
+          "reason": "Install app-owned users CRUD provider for workspace tenancy.",
+          "category": "users-core",
+          "id": "users-core-users-provider-workspace",
+          "when": {
+            "config": "tenancyMode",
+            "in": [
+              "personal",
+              "workspaces"
+            ]
+          }
+        },
+        {
+          "from": "templates/packages/users/src/server/actions.js",
+          "to": "packages/users/src/server/actions.js",
+          "ownership": "app",
+          "preserveOnRemove": true,
+          "reason": "Install app-owned users CRUD actions for non-workspace tenancy.",
+          "category": "users-core",
+          "id": "users-core-users-actions-base",
+          "when": {
+            "config": "tenancyMode",
+            "notIn": [
+              "personal",
+              "workspaces"
+            ]
+          }
+        },
+        {
+          "from": "templates/packages/users-workspace/src/server/actions.js",
+          "to": "packages/users/src/server/actions.js",
+          "ownership": "app",
+          "preserveOnRemove": true,
+          "reason": "Install app-owned users CRUD actions for workspace tenancy.",
+          "category": "users-core",
+          "id": "users-core-users-actions-workspace",
+          "when": {
+            "config": "tenancyMode",
+            "in": [
+              "personal",
+              "workspaces"
+            ]
+          }
+        },
+        {
+          "from": "templates/packages/users/src/server/registerRoutes.js",
+          "to": "packages/users/src/server/registerRoutes.js",
+          "ownership": "app",
+          "preserveOnRemove": true,
+          "reason": "Install app-owned users CRUD routes for non-workspace tenancy.",
+          "category": "users-core",
+          "id": "users-core-users-routes-base",
+          "when": {
+            "config": "tenancyMode",
+            "notIn": [
+              "personal",
+              "workspaces"
+            ]
+          }
+        },
+        {
+          "from": "templates/packages/users-workspace/src/server/registerRoutes.js",
+          "to": "packages/users/src/server/registerRoutes.js",
+          "ownership": "app",
+          "preserveOnRemove": true,
+          "reason": "Install app-owned users CRUD routes for workspace tenancy.",
+          "category": "users-core",
+          "id": "users-core-users-routes-workspace",
+          "when": {
+            "config": "tenancyMode",
+            "in": [
+              "personal",
+              "workspaces"
+            ]
+          }
+        },
+        {
+          "from": "templates/packages/users/src/server/repository.js",
+          "to": "packages/users/src/server/repository.js",
+          "ownership": "app",
+          "preserveOnRemove": true,
+          "reason": "Install app-owned users CRUD repository.",
+          "category": "users-core",
+          "id": "users-core-users-repository"
+        },
+        {
+          "from": "templates/packages/users/src/server/service.js",
+          "to": "packages/users/src/server/service.js",
+          "ownership": "app",
+          "preserveOnRemove": true,
+          "reason": "Install app-owned users CRUD service.",
+          "category": "users-core",
+          "id": "users-core-users-service"
+        },
+        {
+          "from": "templates/packages/users/src/shared/index.js",
+          "to": "packages/users/src/shared/index.js",
+          "ownership": "app",
+          "preserveOnRemove": true,
+          "reason": "Install app-owned users shared entrypoint.",
+          "category": "users-core",
+          "id": "users-core-users-shared-index"
+        },
+        {
+          "from": "templates/packages/users/src/shared/userResource.js",
+          "to": "packages/users/src/shared/userResource.js",
+          "ownership": "app",
+          "preserveOnRemove": true,
+          "reason": "Install app-owned users shared resource.",
+          "category": "users-core",
+          "id": "users-core-users-resource"
+        }
+      ],
+      "text": [
+        {
+          "op": "append-text",
+          "file": "config/server.js",
+          "position": "bottom",
+          "skipIfContains": "config.auth.profileMode = \"users\";",
+          "value": "\nconfig.auth ||= {};\nconfig.auth.profileMode = \"users\";\n",
+          "reason": "Enable users-backed auth profile sync when users-core is installed.",
+          "category": "runtime-config",
+          "id": "users-core-auth-profile-mode"
+        }
+      ]
+    }
   }
 }

package/src/server/common/repositories/repositoryUtils.js

@@ -1,24 +1,11 @@
 import {
   normalizeDbRecordId,
-  toInsertDateTime,
-  toNullableDateTime,
   toIsoString,
   createWithTransaction
 } from "@jskit-ai/database-runtime/shared";
 import { isDuplicateEntryError } from "@jskit-ai/database-runtime/shared/duplicateEntry";
 import { normalizeLowerText, normalizeRecordId, normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
 
-function nowDb() {
-  return toInsertDateTime();
-}
-
-function toNullableIso(value) {
-  if (!value) {
-    return null;
-  }
-  return toIsoString(value);
-}
-
 function uniqueSorted(values) {
   return [...new Set(values)].sort((left, right) => String(left).localeCompare(String(right)));
 }
@@ -43,15 +30,12 @@ function toDbJson(value, fallback = {}) {
 }
 
 export {
-  toNullableDateTime,
   toIsoString,
   isDuplicateEntryError,
   normalizeText,
   normalizeLowerText,
   normalizeRecordId,
   normalizeDbRecordId,
-  nowDb,
-  toNullableIso,
   uniqueSorted,
   parseJson,
   toDbJson,

package/src/server/common/repositories/userProfilesRepository.js

@@ -5,7 +5,6 @@ import {
   normalizeLowerText,
   normalizeRecordId,
   normalizeText,
-  nowDb,
   toIsoString
 } from "./repositoryUtils.js";
 import {
@@ -89,7 +88,7 @@ function normalizeCreatePayload(payload = {}) {
     normalized.avatarVersion = normalizeNullableVersion(source.avatarVersion);
   }
   if (Object.hasOwn(source, "avatarUpdatedAt")) {
-    normalized.avatarUpdatedAt = source.avatarUpdatedAt == null ? null : new Date(source.avatarUpdatedAt);
+    normalized.avatarUpdatedAt = source.avatarUpdatedAt == null ? null : toIsoString(source.avatarUpdatedAt);
   }
 
   return normalized;
@@ -238,7 +237,7 @@ function createRepository({ api, knex } = {}) {
           RESOURCE_TYPE,
           {
             displayName,
-            updatedAt: new Date()
+            updatedAt: new Date().toISOString()
           },
           {
             id: normalizedUserId
@@ -265,8 +264,8 @@ function createRepository({ api, knex } = {}) {
           {
             avatarStorageKey: avatar.avatarStorageKey ?? null,
             avatarVersion: avatar.avatarVersion ?? null,
-            avatarUpdatedAt: avatar.avatarUpdatedAt ?? nowDb(),
-            updatedAt: new Date()
+            avatarUpdatedAt: toIsoString(avatar.avatarUpdatedAt ?? new Date()),
+            updatedAt: new Date().toISOString()
           },
           {
             id: normalizedUserId
@@ -294,7 +293,7 @@ function createRepository({ api, knex } = {}) {
             avatarStorageKey: null,
             avatarVersion: null,
             avatarUpdatedAt: null,
-            updatedAt: new Date()
+            updatedAt: new Date().toISOString()
           },
           {
             id: normalizedUserId
@@ -350,7 +349,7 @@ function createRepository({ api, knex } = {}) {
                   email,
                   displayName,
                   username,
-                  updatedAt: new Date()
+                  updatedAt: new Date().toISOString()
                 },
                 {
                   id: normalizeDbRecordId(existing.id, { fallback: null })
@@ -378,7 +377,7 @@ function createRepository({ api, knex } = {}) {
               email,
               displayName,
               username,
-              createdAt: new Date()
+              createdAt: new Date().toISOString()
             }),
             transaction: trx
           },

package/src/server/common/repositories/userSettingsRepository.js

@@ -1,6 +1,5 @@
 import {
   normalizeRecordId,
-  nowDb,
   isDuplicateEntryError,
   createWithTransaction
 } from "./repositoryUtils.js";
@@ -146,7 +145,7 @@ function createRepository({ api, knex } = {}) {
           RESOURCE_TYPE,
           {
             ...updatePayload,
-            updatedAt: nowDb()
+            updatedAt: new Date().toISOString()
           },
           {
             id: normalizedUserId

package/templates/packages/users/package.json

@@ -5,5 +5,78 @@
   "type": "module",
   "exports": {
     "./shared": "./src/shared/index.js"
+  },
+  "description": "App-local CRUD package (users).",
+  "jskit": {
+    "kind": "runtime",
+    "capabilities": {
+      "provides": [
+        "crud.users"
+      ],
+      "requires": [
+        "runtime.actions",
+        "runtime.database",
+        "auth.policy",
+        "json-rest-api.core"
+      ]
+    },
+    "runtime": {
+      "server": {
+        "providers": [
+          {
+            "entrypoint": "src/server/UsersProvider.js",
+            "export": "UsersProvider"
+          }
+        ]
+      }
+    },
+    "metadata": {
+      "jskit": {
+        "scaffoldShape": "users-core-crud-v1",
+        "tableOwnership": {
+          "tables": [
+            {
+              "tableName": "users",
+              "provenance": "users-core-template",
+              "ownerKind": "baseline-crud"
+            }
+          ]
+        }
+      },
+      "apiSummary": {
+        "surfaces": [
+          {
+            "subpath": "./shared",
+            "summary": "App-local CRUD shared resource."
+          }
+        ],
+        "containerTokens": {
+          "server": [
+            "repository.users",
+            "crud.users"
+          ]
+        }
+      }
+    },
+    "mutations": {
+      "dependencies": {
+        "runtime": {},
+        "dev": {}
+      },
+      "packageJson": {
+        "scripts": {}
+      },
+      "procfile": {},
+      "files": []
+    }
+  },
+  "dependencies": {
+    "@jskit-ai/auth-core": "0.1.146",
+    "@jskit-ai/crud-core": "0.1.159",
+    "@jskit-ai/database-runtime": "0.1.148",
+    "@jskit-ai/http-runtime": "0.1.146",
+    "@jskit-ai/json-rest-api-core": "0.1.92",
+    "@jskit-ai/resource-crud-core": "0.1.90",
+    "@jskit-ai/users-core": "0.1.161"
   }
 }

package/templates/packages/users-workspace/package.json

@@ -0,0 +1,83 @@
+{
+  "name": "@local/users",
+  "version": "0.1.0",
+  "private": true,
+  "type": "module",
+  "exports": {
+    "./shared": "./src/shared/index.js"
+  },
+  "description": "App-local CRUD package (users).",
+  "jskit": {
+    "kind": "runtime",
+    "capabilities": {
+      "provides": [
+        "crud.users"
+      ],
+      "requires": [
+        "runtime.actions",
+        "runtime.database",
+        "auth.policy",
+        "json-rest-api.core"
+      ]
+    },
+    "runtime": {
+      "server": {
+        "providers": [
+          {
+            "entrypoint": "src/server/UsersProvider.js",
+            "export": "UsersProvider"
+          }
+        ]
+      }
+    },
+    "metadata": {
+      "jskit": {
+        "scaffoldShape": "users-core-crud-v1",
+        "tableOwnership": {
+          "tables": [
+            {
+              "tableName": "users",
+              "provenance": "users-core-template",
+              "ownerKind": "baseline-crud"
+            }
+          ]
+        }
+      },
+      "apiSummary": {
+        "surfaces": [
+          {
+            "subpath": "./shared",
+            "summary": "App-local CRUD shared resource."
+          }
+        ],
+        "containerTokens": {
+          "server": [
+            "repository.users",
+            "crud.users"
+          ]
+        }
+      }
+    },
+    "mutations": {
+      "dependencies": {
+        "runtime": {},
+        "dev": {}
+      },
+      "packageJson": {
+        "scripts": {}
+      },
+      "procfile": {},
+      "files": []
+    }
+  },
+  "dependencies": {
+    "@jskit-ai/auth-core": "0.1.146",
+    "@jskit-ai/crud-core": "0.1.159",
+    "@jskit-ai/database-runtime": "0.1.148",
+    "@jskit-ai/http-runtime": "0.1.146",
+    "@jskit-ai/json-rest-api-core": "0.1.92",
+    "@jskit-ai/resource-crud-core": "0.1.90",
+    "@jskit-ai/users-core": "0.1.161",
+    "@jskit-ai/workspaces-core": "0.1.126"
+  }
+}

package/test/repositoryContracts.test.js

@@ -235,9 +235,9 @@ test("userProfilesRepository.upsert patches existing profiles with resource-back
   assert.equal(attributes.email, "ada.renamed@example.com");
   assert.equal(attributes.displayName, "Ada Renamed");
   assert.equal(attributes.username, "ada");
-  assert.ok(attributes.updatedAt instanceof Date);
+  assert.equal(typeof attributes.updatedAt, "string");
   assert.equal(record?.id, "7");
-  assert.equal(record?.updatedAt, attributes.updatedAt.toISOString());
+  assert.equal(record?.updatedAt, attributes.updatedAt);
 });
 
 test("userProfilesRepository profile patch helpers stamp updatedAt through the resource contract", async () => {
@@ -285,7 +285,7 @@ test("userProfilesRepository profile patch helpers stamp updatedAt through the r
   assert.equal(calls.length, 3);
   for (const call of calls) {
     assert.equal(call.transaction, trx);
-    assert.ok(call.inputRecord?.data?.attributes?.updatedAt instanceof Date);
+    assert.equal(typeof call.inputRecord?.data?.attributes?.updatedAt, "string");
   }
   assert.deepEqual(Object.keys(calls[0].inputRecord.data.attributes).sort(), ["displayName", "updatedAt"]);
   assert.deepEqual(Object.keys(calls[1].inputRecord.data.attributes).sort(), [
@@ -296,7 +296,7 @@ test("userProfilesRepository profile patch helpers stamp updatedAt through the r
   ]);
   assert.equal(calls[1].inputRecord.data.attributes.avatarStorageKey, "avatars/7.png");
   assert.equal(calls[1].inputRecord.data.attributes.avatarVersion, "v1");
-  assert.equal(calls[1].inputRecord.data.attributes.avatarUpdatedAt, avatarUpdatedAt);
+  assert.equal(calls[1].inputRecord.data.attributes.avatarUpdatedAt, avatarUpdatedAt.toISOString());
   assert.deepEqual(calls[2].inputRecord.data.attributes.avatarStorageKey, null);
   assert.deepEqual(calls[2].inputRecord.data.attributes.avatarVersion, null);
   assert.deepEqual(calls[2].inputRecord.data.attributes.avatarUpdatedAt, null);

package/test/usersPackageScaffoldContract.test.js

@@ -3,7 +3,9 @@ import { readFile } from "node:fs/promises";
 import path from "node:path";
 import test from "node:test";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import descriptor from "../package.descriptor.mjs";
+import packageJson from "../package.json" with { type: "json" };
+
+const packageMetadata = packageJson.jskit;
 import crudCorePackage from "../../crud-core/package.json" with { type: "json" };
 import resourceCrudCorePackage from "../../resource-crud-core/package.json" with { type: "json" };
 
@@ -11,21 +13,20 @@ const TEST_DIRECTORY = path.dirname(fileURLToPath(import.meta.url));
 const PACKAGE_ROOT = path.resolve(TEST_DIRECTORY, "..");
 
 function readFileMutationById(id) {
-  return descriptor.mutations.files.find((entry) => entry.id === id) || null;
+  return packageMetadata.mutations.files.find((entry) => entry.id === id) || null;
 }
 
 test("users-core installs the app-local users package scaffold", () => {
-  assert.equal(descriptor.mutations.dependencies.runtime["@local/users"], "file:packages/users");
-  assert.equal(descriptor.mutations.dependencies.runtime["@jskit-ai/crud-core"], crudCorePackage.version);
+  assert.equal(packageMetadata.mutations.dependencies.runtime["@local/users"], "file:packages/users");
+  assert.equal(packageMetadata.mutations.dependencies.runtime["@jskit-ai/crud-core"], crudCorePackage.version);
   assert.equal(
-    descriptor.mutations.dependencies.runtime["@jskit-ai/resource-crud-core"],
+    packageMetadata.mutations.dependencies.runtime["@jskit-ai/resource-crud-core"],
     resourceCrudCorePackage.version
   );
 
   const expectedFileIds = [
-    "users-core-users-package-json",
-    "users-core-users-package-descriptor-base",
-    "users-core-users-package-descriptor-workspace",
+    "users-core-users-package-json-base",
+    "users-core-users-package-json-workspace",
     "users-core-users-provider-base",
     "users-core-users-provider-workspace",
     "users-core-users-actions-base",
@@ -82,8 +83,8 @@ test("users-core installs all users profile schema migrations", async () => {
 });
 
 test("users-core base users package templates stay aligned with non-workspace apps", async () => {
-  const packageDescriptorSource = await readFile(
-    path.join(PACKAGE_ROOT, "templates/packages/users/package.descriptor.mjs"),
+  const packageManifestSource = await readFile(
+    path.join(PACKAGE_ROOT, "templates/packages/users/package.json"),
     "utf8"
   );
   const providerSource = await readFile(
@@ -107,13 +108,13 @@ test("users-core base users package templates stay aligned with non-workspace ap
     "utf8"
   );
 
-  assert.doesNotMatch(packageDescriptorSource, /@jskit-ai\/workspaces-core/);
-  assert.match(packageDescriptorSource, /@jskit-ai\/json-rest-api-core/);
-  assert.match(packageDescriptorSource, /json-rest-api\.core/);
-  assert.match(packageDescriptorSource, /scaffoldShape: "users-core-crud-v1"/);
-  assert.match(packageDescriptorSource, /tableName: "users"/);
-  assert.match(packageDescriptorSource, /provenance: "users-core-template"/);
-  assert.doesNotMatch(packageDescriptorSource, /server\/actionIds/);
+  assert.doesNotMatch(packageManifestSource, /@jskit-ai\/workspaces-core/);
+  assert.match(packageManifestSource, /@jskit-ai\/json-rest-api-core/);
+  assert.match(packageManifestSource, /json-rest-api\.core/);
+  assert.match(packageManifestSource, /"scaffoldShape": "users-core-crud-v1"/);
+  assert.match(packageManifestSource, /"tableName": "users"/);
+  assert.match(packageManifestSource, /"provenance": "users-core-template"/);
+  assert.doesNotMatch(packageManifestSource, /server\/actionIds/);
   assert.match(providerSource, /surface: "home"/);
   assert.doesNotMatch(providerSource, /routeSurfaceRequiresWorkspace/);
   assert.doesNotMatch(providerSource, /createCrudLookup/);
@@ -155,8 +156,8 @@ test("users-core base users package templates stay aligned with non-workspace ap
 });
 
 test("users-core workspace users package templates stay aligned with workspace apps", async () => {
-  const packageDescriptorSource = await readFile(
-    path.join(PACKAGE_ROOT, "templates/packages/users-workspace/package.descriptor.mjs"),
+  const packageManifestSource = await readFile(
+    path.join(PACKAGE_ROOT, "templates/packages/users-workspace/package.json"),
     "utf8"
   );
   const providerSource = await readFile(
@@ -176,13 +177,13 @@ test("users-core workspace users package templates stay aligned with workspace a
     "utf8"
   );
 
-  assert.match(packageDescriptorSource, /@jskit-ai\/workspaces-core/);
-  assert.match(packageDescriptorSource, /@jskit-ai\/json-rest-api-core/);
-  assert.match(packageDescriptorSource, /json-rest-api\.core/);
-  assert.match(packageDescriptorSource, /scaffoldShape: "users-core-crud-v1"/);
-  assert.match(packageDescriptorSource, /tableName: "users"/);
-  assert.match(packageDescriptorSource, /provenance: "users-core-template"/);
-  assert.doesNotMatch(packageDescriptorSource, /server\/actionIds/);
+  assert.match(packageManifestSource, /@jskit-ai\/workspaces-core/);
+  assert.match(packageManifestSource, /@jskit-ai\/json-rest-api-core/);
+  assert.match(packageManifestSource, /json-rest-api\.core/);
+  assert.match(packageManifestSource, /"scaffoldShape": "users-core-crud-v1"/);
+  assert.match(packageManifestSource, /"tableName": "users"/);
+  assert.match(packageManifestSource, /"provenance": "users-core-template"/);
+  assert.doesNotMatch(packageManifestSource, /server\/actionIds/);
   assert.match(providerSource, /surface: "admin"/);
   assert.match(providerSource, /routeSurfaceRequiresWorkspace/);
   assert.doesNotMatch(providerSource, /createCrudLookup/);

package/package.descriptor.mjs

@@ -1,357 +0,0 @@
-export default Object.freeze({
-  packageVersion: 1,
-  packageId: "@jskit-ai/users-core",
-  version: "0.1.160",
-  kind: "runtime",
-  description: "Users/account runtime plus HTTP routes for account features.",
-  dependsOn: [
-    "@jskit-ai/auth-core",
-    "@jskit-ai/database-runtime",
-    "@jskit-ai/http-runtime",
-    "@jskit-ai/json-rest-api-core",
-    "@jskit-ai/resource-core",
-    "@jskit-ai/resource-crud-core",
-    "@jskit-ai/uploads-runtime",
-    "@jskit-ai/storage-runtime"
-  ],
-  capabilities: {
-    provides: [
-      "users.core",
-      "users.server-routes"
-    ],
-    requires: [
-      "runtime.actions",
-      "runtime.database",
-      "json-rest-api.core",
-      "runtime.storage",
-      "runtime.uploads",
-      "auth.provider",
-      "auth.policy"
-    ]
-  },
-  runtime: {
-    server: {
-      providers: [
-        {
-          entrypoint: "src/server/UsersCoreServiceProvider.js",
-          export: "UsersCoreServiceProvider"
-        }
-      ]
-    },
-    client: {
-      providers: []
-    }
-  },
-  metadata: {
-    jskit: {
-      tableOwnership: {
-        tables: [
-          {
-            tableName: "user_settings",
-            provenance: "runtime-package",
-            ownerKind: "package-runtime"
-          }
-        ]
-      }
-    },
-    apiSummary: {
-      surfaces: [
-        {
-          subpath: "./server",
-          summary:
-            "Exports UsersCoreServiceProvider plus account feature route registration modules and action definitions."
-        },
-        {
-          subpath: "./shared",
-          summary: "Exports shared users settings resources and defaults."
-        },
-        {
-          subpath: "./client",
-          summary: "Exports no runtime API today (reserved client entrypoint)."
-        }
-      ],
-      containerTokens: {
-        server: [
-          "users.profile.sync.service",
-          "auth.profile.projector"
-        ],
-        client: []
-      }
-    },
-    server: {
-      routes: [
-        {
-          method: "GET",
-          path: "/api/settings",
-          summary: "Get authenticated user settings."
-        },
-        {
-          method: "PATCH",
-          path: "/api/settings/profile",
-          summary: "Update profile settings."
-        },
-        {
-          method: "GET",
-          path: "/api/settings/profile/avatar",
-          summary: "Read authenticated user's uploaded avatar."
-        },
-        {
-          method: "POST",
-          path: "/api/settings/profile/avatar",
-          summary: "Upload profile avatar."
-        },
-        {
-          method: "DELETE",
-          path: "/api/settings/profile/avatar",
-          summary: "Delete profile avatar."
-        },
-        {
-          method: "PATCH",
-          path: "/api/settings/preferences",
-          summary: "Update user preferences."
-        },
-        {
-          method: "PATCH",
-          path: "/api/settings/notifications",
-          summary: "Update notification settings."
-        },
-        {
-          method: "POST",
-          path: "/api/settings/security/change-password",
-          summary: "Set or change password for authenticated user."
-        },
-        {
-          method: "PATCH",
-          path: "/api/settings/security/methods/password",
-          summary: "Enable or disable password sign-in method."
-        },
-        {
-          method: "GET",
-          path: "/api/settings/security/oauth/:provider/start",
-          summary: "Start linking an OAuth provider for authenticated user."
-        },
-        {
-          method: "DELETE",
-          path: "/api/settings/security/oauth/:provider",
-          summary: "Unlink an OAuth provider from authenticated account."
-        },
-        {
-          method: "POST",
-          path: "/api/settings/security/logout-others",
-          summary: "Sign out from other active sessions."
-        }
-      ]
-    }
-  },
-  mutations: {
-    dependencies: {
-      runtime: {
-        "@jskit-ai/auth-core": "0.1.145",
-        "@jskit-ai/crud-core": "0.1.157",
-        "@jskit-ai/database-runtime": "0.1.146",
-        "@jskit-ai/http-runtime": "0.1.145",
-        "@jskit-ai/json-rest-api-core": "0.1.91",
-        "@jskit-ai/kernel": "0.1.146",
-        "@jskit-ai/resource-core": "0.1.89",
-        "@jskit-ai/resource-crud-core": "0.1.89",
-        "@local/users": "file:packages/users",
-        "@jskit-ai/uploads-runtime": "0.1.122"
-      },
-      dev: {}
-    },
-    packageJson: {
-      scripts: {}
-    },
-    procfile: {},
-    files: [
-      {
-        op: "install-migration",
-        from: "templates/migrations/users_core_generic_initial.cjs",
-        toDir: "migrations",
-        extension: ".cjs",
-        reason: "Install users/account core schema migration.",
-        category: "migration",
-        id: "users-core-generic-initial-schema"
-      },
-      {
-        op: "install-migration",
-        from: "templates/migrations/users_core_profile_username.cjs",
-        toDir: "migrations",
-        extension: ".cjs",
-        reason: "Install users profile username migration.",
-        category: "migration",
-        id: "users-core-profile-username-schema"
-      },
-      {
-        op: "install-migration",
-        from: "templates/migrations/users_core_profile_updated_at.cjs",
-        toDir: "migrations",
-        extension: ".cjs",
-        reason: "Install users profile updated-at migration.",
-        category: "migration",
-        id: "users-core-profile-updated-at-schema"
-      },
-      {
-        from: "templates/packages/users/package.json",
-        to: "packages/users/package.json",
-        ownership: "app",
-        preserveOnRemove: true,
-        reason: "Install app-owned users package manifest.",
-        category: "users-core",
-        id: "users-core-users-package-json"
-      },
-      {
-        from: "templates/packages/users/package.descriptor.mjs",
-        to: "packages/users/package.descriptor.mjs",
-        ownership: "app",
-        preserveOnRemove: true,
-        reason: "Install app-owned users package descriptor for non-workspace tenancy.",
-        category: "users-core",
-        id: "users-core-users-package-descriptor-base",
-        when: {
-          config: "tenancyMode",
-          notIn: ["personal", "workspaces"]
-        }
-      },
-      {
-        from: "templates/packages/users-workspace/package.descriptor.mjs",
-        to: "packages/users/package.descriptor.mjs",
-        ownership: "app",
-        preserveOnRemove: true,
-        reason: "Install app-owned users package descriptor for workspace tenancy.",
-        category: "users-core",
-        id: "users-core-users-package-descriptor-workspace",
-        when: {
-          config: "tenancyMode",
-          in: ["personal", "workspaces"]
-        }
-      },
-      {
-        from: "templates/packages/users/src/server/UsersProvider.js",
-        to: "packages/users/src/server/UsersProvider.js",
-        ownership: "app",
-        preserveOnRemove: true,
-        reason: "Install app-owned users CRUD provider for non-workspace tenancy.",
-        category: "users-core",
-        id: "users-core-users-provider-base",
-        when: {
-          config: "tenancyMode",
-          notIn: ["personal", "workspaces"]
-        }
-      },
-      {
-        from: "templates/packages/users-workspace/src/server/UsersProvider.js",
-        to: "packages/users/src/server/UsersProvider.js",
-        ownership: "app",
-        preserveOnRemove: true,
-        reason: "Install app-owned users CRUD provider for workspace tenancy.",
-        category: "users-core",
-        id: "users-core-users-provider-workspace",
-        when: {
-          config: "tenancyMode",
-          in: ["personal", "workspaces"]
-        }
-      },
-      {
-        from: "templates/packages/users/src/server/actions.js",
-        to: "packages/users/src/server/actions.js",
-        ownership: "app",
-        preserveOnRemove: true,
-        reason: "Install app-owned users CRUD actions for non-workspace tenancy.",
-        category: "users-core",
-        id: "users-core-users-actions-base",
-        when: {
-          config: "tenancyMode",
-          notIn: ["personal", "workspaces"]
-        }
-      },
-      {
-        from: "templates/packages/users-workspace/src/server/actions.js",
-        to: "packages/users/src/server/actions.js",
-        ownership: "app",
-        preserveOnRemove: true,
-        reason: "Install app-owned users CRUD actions for workspace tenancy.",
-        category: "users-core",
-        id: "users-core-users-actions-workspace",
-        when: {
-          config: "tenancyMode",
-          in: ["personal", "workspaces"]
-        }
-      },
-      {
-        from: "templates/packages/users/src/server/registerRoutes.js",
-        to: "packages/users/src/server/registerRoutes.js",
-        ownership: "app",
-        preserveOnRemove: true,
-        reason: "Install app-owned users CRUD routes for non-workspace tenancy.",
-        category: "users-core",
-        id: "users-core-users-routes-base",
-        when: {
-          config: "tenancyMode",
-          notIn: ["personal", "workspaces"]
-        }
-      },
-      {
-        from: "templates/packages/users-workspace/src/server/registerRoutes.js",
-        to: "packages/users/src/server/registerRoutes.js",
-        ownership: "app",
-        preserveOnRemove: true,
-        reason: "Install app-owned users CRUD routes for workspace tenancy.",
-        category: "users-core",
-        id: "users-core-users-routes-workspace",
-        when: {
-          config: "tenancyMode",
-          in: ["personal", "workspaces"]
-        }
-      },
-      {
-        from: "templates/packages/users/src/server/repository.js",
-        to: "packages/users/src/server/repository.js",
-        ownership: "app",
-        preserveOnRemove: true,
-        reason: "Install app-owned users CRUD repository.",
-        category: "users-core",
-        id: "users-core-users-repository"
-      },
-      {
-        from: "templates/packages/users/src/server/service.js",
-        to: "packages/users/src/server/service.js",
-        ownership: "app",
-        preserveOnRemove: true,
-        reason: "Install app-owned users CRUD service.",
-        category: "users-core",
-        id: "users-core-users-service"
-      },
-      {
-        from: "templates/packages/users/src/shared/index.js",
-        to: "packages/users/src/shared/index.js",
-        ownership: "app",
-        preserveOnRemove: true,
-        reason: "Install app-owned users shared entrypoint.",
-        category: "users-core",
-        id: "users-core-users-shared-index"
-      },
-      {
-        from: "templates/packages/users/src/shared/userResource.js",
-        to: "packages/users/src/shared/userResource.js",
-        ownership: "app",
-        preserveOnRemove: true,
-        reason: "Install app-owned users shared resource.",
-        category: "users-core",
-        id: "users-core-users-resource"
-      }
-    ],
-    text: [
-      {
-        op: "append-text",
-        file: "config/server.js",
-        position: "bottom",
-        skipIfContains: "config.auth.profileMode = \"users\";",
-        value: "\nconfig.auth ||= {};\nconfig.auth.profileMode = \"users\";\n",
-        reason: "Enable users-backed auth profile sync when users-core is installed.",
-        category: "runtime-config",
-        id: "users-core-auth-profile-mode"
-      },
-    ]
-  }
-});

package/templates/packages/users/package.descriptor.mjs

@@ -1,76 +0,0 @@
-export default Object.freeze({
-  packageVersion: 1,
-  packageId: "@local/users",
-  version: "0.1.0",
-  kind: "runtime",
-  description: "App-local CRUD package (users).",
-  dependsOn: [
-    "@jskit-ai/auth-core",
-    "@jskit-ai/crud-core",
-    "@jskit-ai/database-runtime",
-    "@jskit-ai/http-runtime",
-    "@jskit-ai/json-rest-api-core",
-    "@jskit-ai/resource-crud-core",
-    "@jskit-ai/users-core"
-  ],
-  capabilities: {
-    provides: [
-      "crud.users"
-    ],
-    requires: [
-      "runtime.actions",
-      "runtime.database",
-      "auth.policy",
-      "json-rest-api.core"
-    ]
-  },
-  runtime: {
-    server: {
-      providers: [
-        {
-          entrypoint: "src/server/UsersProvider.js",
-          export: "UsersProvider"
-        }
-      ]
-    }
-  },
-  metadata: {
-    jskit: {
-      scaffoldShape: "users-core-crud-v1",
-      tableOwnership: {
-        tables: [
-          {
-            tableName: "users",
-            provenance: "users-core-template",
-            ownerKind: "baseline-crud"
-          }
-        ]
-      }
-    },
-    apiSummary: {
-      surfaces: [
-        {
-          subpath: "./shared",
-          summary: "App-local CRUD shared resource."
-        }
-      ],
-      containerTokens: {
-        server: [
-          "repository.users",
-          "crud.users"
-        ]
-      }
-    }
-  },
-  mutations: {
-    dependencies: {
-      runtime: {},
-      dev: {}
-    },
-    packageJson: {
-      scripts: {}
-    },
-    procfile: {},
-    files: []
-  }
-});

package/templates/packages/users-workspace/package.descriptor.mjs

@@ -1,77 +0,0 @@
-export default Object.freeze({
-  packageVersion: 1,
-  packageId: "@local/users",
-  version: "0.1.0",
-  kind: "runtime",
-  description: "App-local CRUD package (users).",
-  dependsOn: [
-    "@jskit-ai/auth-core",
-    "@jskit-ai/crud-core",
-    "@jskit-ai/database-runtime",
-    "@jskit-ai/http-runtime",
-    "@jskit-ai/json-rest-api-core",
-    "@jskit-ai/resource-crud-core",
-    "@jskit-ai/users-core",
-    "@jskit-ai/workspaces-core"
-  ],
-  capabilities: {
-    provides: [
-      "crud.users"
-    ],
-    requires: [
-      "runtime.actions",
-      "runtime.database",
-      "auth.policy",
-      "json-rest-api.core"
-    ]
-  },
-  runtime: {
-    server: {
-      providers: [
-        {
-          entrypoint: "src/server/UsersProvider.js",
-          export: "UsersProvider"
-        }
-      ]
-    }
-  },
-  metadata: {
-    jskit: {
-      scaffoldShape: "users-core-crud-v1",
-      tableOwnership: {
-        tables: [
-          {
-            tableName: "users",
-            provenance: "users-core-template",
-            ownerKind: "baseline-crud"
-          }
-        ]
-      }
-    },
-    apiSummary: {
-      surfaces: [
-        {
-          subpath: "./shared",
-          summary: "App-local CRUD shared resource."
-        }
-      ],
-      containerTokens: {
-        server: [
-          "repository.users",
-          "crud.users"
-        ]
-      }
-    }
-  },
-  mutations: {
-    dependencies: {
-      runtime: {},
-      dev: {}
-    },
-    packageJson: {
-      scripts: {}
-    },
-    procfile: {},
-    files: []
-  }
-});