@protobase/server 0.33.2 → 0.33.3

package/dist/check-owners.js

@@ -1,14 +1,20 @@
 //#region src/check-owners.ts
+const holds = (field, id) => field === "text" || field === id || field === "bigint" && id === "integer";
 /**
-* Stops startup on an `.owner()` field that cannot hold the ids of the auth instance's users: Better Auth's own ids
-* are random text, so the field must be text unless `generateUserId` makes the ids. Without an auth instance the
-* ids come from the app's own authenticator, which this cannot see.
+* Stops startup on an `.owner()` field that cannot hold the ids of the signed-in users. The authenticator's
+* `userIdType` declares their type; without it, the auth instance's users have Better Auth's own ids, random text,
+* unless `generateUserId` makes the ids. Without either, the ids come from the app's own authenticator, which this
+* cannot see.
 */
-const checkOwnerFields = (registry, auth) => {
+const checkOwnerFields = (registry, userIdType, auth) => {
+	if (userIdType) return checkAgainst(registry, userIdType, (ownerType) => `the authenticator's users have ${userIdType} ids: make it a ${userIdType} or text column, or declare the authenticator's userIdType`);
 	if (!auth || auth.generatesUserIds) return;
+	checkAgainst(registry, "text", (ownerType) => `Better Auth's user ids are random text: make it a text column, or give createAuth a generateUserId that makes ${ownerType} ids`);
+};
+const checkAgainst = (registry, userIdType, fix) => {
 	for (const entry of registry.entries) {
-		if (entry.ownerType === void 0 || entry.ownerType === "text") continue;
-		throw new Error(`${entry.name}.${entry.model.owner} is the owner of its records, so it holds the signed-in user's id, but it holds ${entry.ownerType} values and Better Auth's user ids are random text: make it a text column, or give createAuth a generateUserId that makes ${entry.ownerType} ids`);
+		if (entry.ownerType === void 0 || holds(entry.ownerType, userIdType)) continue;
+		throw new Error(`${entry.name}.${entry.model.owner} is the owner of its records, so it holds the signed-in user's id, but it holds ${entry.ownerType} values and ${fix(entry.ownerType)}`);
 	}
 };
 //#endregion

package/dist/create-admin.js

@@ -115,7 +115,7 @@ const createAdmin = ({ resources: appResources, views: appViews = [], pages = []
 	checkBottomBars(registry, bottomBarModels, pageModels.map((entry) => entry.name), declaredRoles(auth, options.roles));
 	checkViews(registry, viewModels, pageModels.map((entry) => entry.name), fieldTypes);
 	checkRoleLimits(registry, options.roles?.limits ?? []);
-	checkOwnerFields(registry, auth);
+	checkOwnerFields(registry, authenticate.userIdType, auth);
 	checkPositionAfter(registry);
 	checkParents(registry);
 	checkPages(pageModels, {

package/dist/registry.d.ts

@@ -1,2 +1,2 @@
 import "./resource-source.js";
-import { ResourceModel } from "@protobase/schema";
+import { KeyType, ResourceModel } from "@protobase/schema";

package/dist/types.d.ts

@@ -1,7 +1,7 @@
 import { JobDefinition } from "./jobs/job-types.js";
 import { Hono } from "hono";
 import { PageModel } from "@protobase/layout";
-import { ResourceModel, ViewModel } from "@protobase/schema";
+import { KeyType, ResourceModel, ViewModel } from "@protobase/schema";
 import { Db } from "@protobase/query";
 //#region src/types.d.ts
 export type TenantValue = string | number;
@@ -20,8 +20,14 @@ export type Session = {
   organization?: SessionOrganization;
   anonymous?: true;
 };
-/** Resolves the caller of a request, or throws a 401 problem (see `unauthorized`). */
-export type Authenticator = (request: Request) => Promise<Session> | Session;
+/**
+ * Resolves the caller of a request, or throws a 401 problem (see `unauthorized`). `userIdType` declares the type of
+ * the ids of the users it returns, which `.owner()` fields are checked against at startup, such as `'uuid'` for an
+ * authenticator that maps the signed-in account to the app's own user row.
+ */
+export type Authenticator = ((request: Request) => Promise<Session> | Session) & {
+  userIdType?: KeyType;
+};
 export type AdminEnv = {
   Variables: {
     session: Session;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@protobase/server",
-  "version": "0.33.2",
+  "version": "0.33.3",
   "description": "The Protobase REST API as a Hono app, with Better Auth sign-in.",
   "license": "Apache-2.0",
   "repository": {
@@ -32,9 +32,9 @@
   "dependencies": {
     "@better-auth/passkey": "^1.7.7",
     "@better-auth/sso": "^1.7.7",
-    "@protobase/layout": "0.33.2",
-    "@protobase/query": "0.33.2",
-    "@protobase/schema": "0.33.2",
+    "@protobase/layout": "0.33.3",
+    "@protobase/query": "0.33.3",
+    "@protobase/schema": "0.33.3",
     "@react-email/render": "^2.1.0",
     "@scalar/hono-api-reference": "^0.12.10",
     "@sentry/core": "^11.7.0",